diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..75ec3f0a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.vscode/*
\ No newline at end of file
diff --git a/.nojekyll b/.nojekyll
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/.nojekyll
@@ -0,0 +1 @@
+
diff --git a/CNAME b/CNAME
new file mode 100644
index 00000000..03038c86
--- /dev/null
+++ b/CNAME
@@ -0,0 +1 @@
+theme-park.dev
\ No newline at end of file
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..3784db69
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+contact@theme-park.dev.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
diff --git a/CSS/base/bitwarden/bitwarden-base.css b/CSS/base/bitwarden/bitwarden-base.css
index 09f1fd48..2ac17f69 100644
--- a/CSS/base/bitwarden/bitwarden-base.css
+++ b/CSS/base/bitwarden/bitwarden-base.css
@@ -19,7 +19,9 @@ img.logo {
 }
 
 body.layout_frontend,
-body {
+html[class*="theme_"] body,
+html[class*="theme_"] body.layout_frontend,
+html {
     background: var(--main-bg-color);
     background-repeat: repeat, no-repeat;
     background-attachment: fixed, fixed;
@@ -39,17 +41,22 @@ app-org-vault-groupings .card .card-body a,
     color: var(--link-color);
 }
 
-a:hover,
+a:hover:not(.btn-secondary):not(.btn-outline-primary),
 app-vault-groupings .card li.active>a:first-of-type,
 app-vault-groupings .card li.active>div a:first-of-type,
 app-org-vault-groupings .card li.active>a:first-of-type,
 app-org-vault-groupings .card li.active>div a:first-of-type,
 .groupings .card li.active>a:first-of-type,
-.groupings .card li.active>div a:first-of-type {
+.groupings .card li.active>div a:first-of-type,
+html[class*="theme_"] a {
     color: var(--link-color-hover) !important;
 }
+html[class*="theme_"] #totpImage {
+    background: lightgray;
+}
 
 /* TEXT */
+html[class*="theme_"] .text-muted,
 .text-muted,
 .form-check-block .form-check-label>small,
 .modal-header small,
@@ -75,10 +82,10 @@ h6,
 .h4,
 .h5,
 .h6,
-label,
-label:not(.form-check-label):not(.btn),
+label:not(#g_advanced > div:nth-child(13) > label):not(#g_advanced > div:nth-child(12) > div.col-sm-8 > div > label),
+label:not(.form-check-label):not(.btn):not(#g_advanced > div:nth-child(13) > label),
 label.bold .card-header:first-child,
-.card-header,
+html[class*="theme_"] .card-header,
 .modal-header {
     color: var(--text-hover) !important;
 }
@@ -96,8 +103,21 @@ label.bold .card-header:first-child,
 }
 
 /* CARDS */
+
+html[class*="theme_"] .card-header {
+    background-color: rgb(0 0 0 / 45%);
+    color: #fff;
+}
+
 .card {
-    background-color: rgba(255, 255, 255, 0.07);
+    background-color: rgba(255, 255, 255, 0.07) !important;
+    border-color: rgba(255, 255, 255, 0.1) !important;
+    color: var(--text) !important;
+}
+
+html[class*="theme_"] .card-body:not(.bg-light>.card-body) {
+    background-color: transparent;
+    color: var(--text);
 }
 
 app-vault-groupings .card li.active>a:first-of-type,
@@ -106,17 +126,31 @@ app-vault-groupings .card li.active>div>.fa {
     color: rgb(var(--accent-color));
 }
 
-body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator>div.card.card-password.bg-light.my-4 {
+body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator>div.card.card-password.bg-light.my-4,
+body > app-root > app-user-layout > app-tools > div > div > div.col-9 > app-password-generator > div.card.card-password.bg-light.my-4 > div {
     background-color: rgb(0 0 0 / 15%) !important;
 }
 
-.password-number {
+html[class*="theme_"] .password-number {
     color: rgb(var(--accent-color));
 }
+html[class*="theme_"] .password-letter {
+    color: white;
+}
 
 /* MODALS */
-.modal-content,
-.modal-footer {
+html[class*="theme_"] .modal-header {
+    border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+    background: var(--modal-header-color);
+    background-repeat: repeat, no-repeat;
+    background-attachment: fixed, fixed;
+    background-position: center center, center center;
+    background-size: auto, cover;
+    -webkit-background-size: auto, cover;
+    -moz-background-size: auto, cover;
+    -o-background-size: auto, cover;
+}
+html[class*="theme_"] .modal-body {
     background: var(--modal-bg-color);
     background-repeat: repeat, no-repeat;
     background-attachment: fixed, fixed;
@@ -126,6 +160,17 @@ body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator
     -moz-background-size: auto, cover;
     -o-background-size: auto, cover;
 }
+html[class*="theme_"] .modal-footer {
+    border-top: 1px solid rgba(255, 255, 255, 0.1);
+    background: var(--modal-footer-color);
+    background-repeat: repeat, no-repeat;
+    background-attachment: fixed, fixed;
+    background-position: center center, center center;
+    background-size: auto, cover;
+    -webkit-background-size: auto, cover;
+    -moz-background-size: auto, cover;
+    -o-background-size: auto, cover;
+}
 
 .close,
 .close:hover {
@@ -183,26 +228,35 @@ body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator
 }
 
 /* FORMS */
-.form-control:focus {
-    box-shadow: none;
-    border-color: transparent;
+html[class*="theme_"] label.form-check-label, html[class*="theme_"] .form-control-file {
+    color: var(--text);
 }
 
-.form-control {
+html[class*="theme_"] .form-control:focus {
+    box-shadow: none;
+    border-color: transparent;
+    background: rgb(253 253 253 / 15%);
+}
+
+html[class*="theme_"] .form-control {
     color: var(--text);
     background-color: rgb(0 0 0 / 0.25);
     border: 1px solid transparent;
 
 }
 
-.form-control:disabled,
+html[class*="theme_"] .form-control:disabled,
 .form-control[readonly] {
     background-color: rgb(255 255 255 / 25%);
     opacity: 1;
 }
 
+select:focus {
+    background: #1f1f1f !important;
+}
+
 /* DROPDOWN MENU */
-.dropdown-menu {
+/* html[class*="theme_"] .dropdown-menu {
     background: var(--modal-bg-color);
     background-repeat: repeat, no-repeat;
     background-attachment: fixed, fixed;
@@ -213,15 +267,20 @@ body>app-root>app-user-layout>app-tools>div>div>div.col-9>app-password-generator
     -o-background-size: auto, cover;
     border: 1px solid transparent;
     box-shadow: 3px 3px 10px rgba(0, 0, 0, .2);
+} */
+
+html[class*="theme_"] .dropdown-menu, html[class*="theme_"] .dropdown-item {
+    background: #1f1f1f;
+    color: #fff;
 }
 
-.dropdown-item,
-.dropdown-item-text {
+html[class*="theme_"] .dropdown-item,
+html[class*="theme_"] .dropdown-item-text {
     color: var(--text);
 }
 
-.dropdown-item:hover,
-.dropdown-item:focus {
+html[class*="theme_"] .dropdown-item:hover,
+html[class*="theme_"] .dropdown-item:focus {
     color: var(--text-hover);
     text-decoration: none;
     background-color: rgb(255 255 255 / 0.08);
@@ -239,19 +298,32 @@ a.text-danger:focus {
 }
 
 /* SETTINGS */
-.list-group-item.active {
+
+html[class*="theme_"] .page-header, html[class*="theme_"] .secondary-header {
+    border-bottom: 1px solid rgb(255 255 255 / 30%);
+}
+
+html[class*="theme_"] .list-group-item.active {
     color: var(--text);
     background-color: rgb(255 255 255 / 10%);
     border-left: 3px solid rgb(var(--accent-color));
+    border-color: rgba(255, 255, 255, 0.1);
 }
 
-.callout {
+html[class*="theme_"] .callout {
     background-color: rgb(255 255 255 / 15%);
+    border: 1px solid rgba(255, 255, 255, 0.1);
+    color: var(--text);
 }
 
-.list-group-item {
+html[class*="theme_"] .list-group-item {
     background-color: rgb(0 0 0 / 25%);
     border: 1px solid rgb(255 255 255 / 8%);
+    color: var(--text);
+}
+
+html[class*="theme_"] .progress {
+    background-color: rgba(0, 0, 0, 0.25);
 }
 
 /* BUTTONS */
@@ -295,17 +367,21 @@ a.text-danger:focus {
 
 .btn[class*="btn-outline-"]:not(:hover),
 .swal2-popup .swal2-actions button[class*="btn-outline-"]:not(:hover),
-.swal2-popup .swal2-actions button.swal2-cancel {
-    border-color: var(--button-color);
-    background-color: var(--button-color);
-    color: var(--button-text);
+.swal2-popup .swal2-actions button.swal2-cancel,
+html[class*="theme_"] .btn-primary,
+html[class*="theme_"] .swal2-confirm {
+    border-color: var(--button-color) !important;
+    background-color: var(--button-color) !important;
+    color: var(--button-text) !important;
 }
 
 .btn-outline-secondary:hover,
-.swal2-popup .swal2-actions button.swal2-cancel:hover {
-    color: var(--button-text-hover);
-    background-color: var(--button-color-hover);
-    border-color: var(--button-color-hover);
+.swal2-popup .swal2-actions button.swal2-cancel:hover,
+html[class*="theme_"] .btn-primary,
+html[class*="theme_"] .swal2-confirm {
+    color: var(--button-text-hover) !important;
+    background-color: var(--button-color-hover) !important;
+    border-color: var(--button-color-hover) !important;
 }
 
 .btn-outline-secondary:hover:not(:disabled),
@@ -315,8 +391,8 @@ a.text-danger:focus {
 
 .btn-outline-primary:hover {
     color: var(--button-text-hover) !important;
-    background-color: var(--button-color-hover);
-    border-color: var(--button-color-hover);
+    background-color: var(--button-color-hover) !important;
+    border-color: var(--button-color-hover) !important;
 }
 
 .btn-outline-primary:not(:disabled):not(.disabled):active,
@@ -335,7 +411,9 @@ a.text-danger:focus {
 .btn-outline-secondary.focus,
 .swal2-popup .swal2-actions button.focus.swal2-cancel,
 .btn-outline-primary:focus,
-.btn-outline-primary.focus {
+.btn-outline-primary.focus,
+.btn-check:focus+.btn,
+.btn:focus {
     box-shadow: 0 0 0 0.2rem rgb(var(--accent-color), .5);
 }
 
@@ -344,12 +422,15 @@ a.text-danger:focus {
 .btn-outline-secondary:not(:disabled):not(.disabled).active,
 .swal2-popup .swal2-actions button.swal2-cancel:not(:disabled):not(.disabled).active,
 .show>.btn-outline-secondary.dropdown-toggle,
-.swal2-popup .swal2-actions .show>button.dropdown-toggle.swal2-cancel {
-    color: var(--button-text-hover);
-    background-color: var(--button-color-hover);
-    border-color: var(--button-color-hover);
+.swal2-popup .swal2-actions .show>button.dropdown-toggle.swal2-cancel,
+html[class*="theme_"] .btn-outline-secondary:hover:not(:disabled),
+html[class*="theme_"] .btn-outline-secondary:active {
+    color: var(--button-text-hover) !important;
+    background-color: var(--button-color-hover) !important;
+    border-color: var(--button-color-hover) !important;
 }
 
+
 .btn-outline-secondary:not(:disabled):not(.disabled):active:focus,
 .swal2-popup .swal2-actions button.swal2-cancel:not(:disabled):not(.disabled):active:focus,
 .btn-outline-secondary:not(:disabled):not(.disabled).active:focus,
@@ -499,4 +580,13 @@ input:focus:-ms-input-placeholder {
 .card-header small,
 .modal-header small {
     color: var(--text-muted) !important;
+}
+
+/* Table */
+.table-striped>tbody>tr:nth-of-type(odd)>* {
+    --bs-table-accent-bg: var(--bs-table-striped-bg);
+    color: var(--text-hover);
+}
+html[class*="theme_"] .table td {
+    color: var(--text);
 }
\ No newline at end of file
diff --git a/CSS/base/duplicati/duplicati-base.css b/CSS/base/duplicati/duplicati-base.css
index bbb6c574..ec153a43 100644
--- a/CSS/base/duplicati/duplicati-base.css
+++ b/CSS/base/duplicati/duplicati-base.css
@@ -53,12 +53,12 @@ body .container .footer {
 
 body .container .header .action-icons>.pause,
 body .container .header .action-icons-small>.pause {
-    background: url(https://theme-park.dev/resources/duplicati/pause.png);
+    background: url(https://assets.deathbybandaid.net/theme.park/resources/duplicati/pause.png);
 }
 
 body .container .header .action-icons>.throttle,
 body .container .header .action-icons-small>.throttle {
-    background: url(https://theme-park.dev/resources/duplicati/throttle.png);
+    background: url(https://assets.deathbybandaid.net/theme.park/resources/duplicati/throttle.png);
 }
 
 body .container .body .content div.add .steps .step.active span,
@@ -209,27 +209,27 @@ body .container .body .contextmenu li a:hover {
 }
 
 body .container .body .mainmenu>ul>li>a.home {
-    background: url(https://theme-park.dev/resources/duplicati/home.png) no-repeat 8px 7px;
+    background: url(https://assets.deathbybandaid.net/theme.park/resources/duplicati/home.png) no-repeat 8px 7px;
 }
 
 body .container .body .mainmenu>ul>li>a.add {
-    background: url(https://theme-park.dev/resources/duplicati/add.png) no-repeat 8px 7px;
+    background: url(https://assets.deathbybandaid.net/theme.park/resources/duplicati/add.png) no-repeat 8px 7px;
 }
 
 body .container .body .mainmenu>ul>li>a.restore {
-    background: url(https://theme-park.dev/resources/duplicati/restore.png) no-repeat 8px 7px;
+    background: url(https://assets.deathbybandaid.net/theme.park/resources/duplicati/restore.png) no-repeat 8px 7px;
 }
 
 body .container .body .mainmenu>ul>li>a.settings {
-    background: url(https://theme-park.dev/resources/duplicati/settings.png) no-repeat 8px 7px;
+    background: url(https://assets.deathbybandaid.net/theme.park/resources/duplicati/settings.png) no-repeat 8px 7px;
 }
 
 body .container .body .mainmenu>ul>li>a.about {
-    background: url(https://theme-park.dev/resources/duplicati/about.png) no-repeat 8px 7px;
+    background: url(https://assets.deathbybandaid.net/theme.park/resources/duplicati/about.png) no-repeat 8px 7px;
 }
 
 body .container .body .mainmenu>ul>li>a.logout {
-    background: url(https://theme-park.dev/resources/duplicati/logout.png) no-repeat 8px 7px;
+    background: url(https://assets.deathbybandaid.net/theme.park/resources/duplicati/logout.png) no-repeat 8px 7px;
 }
 
 #threedotmenu_add_destination>ul>li>a>span {
@@ -347,4 +347,4 @@ body .container .header .state .progress-bar {
 #login fieldset input[type="password"] {
     background: rgba(0, 0, 0, .25);
     color: var(--text);
-}
\ No newline at end of file
+}
diff --git a/CSS/base/emby/emby-base.css b/CSS/base/emby/emby-base.css
index 04648d6e..437bd1bb 100644
--- a/CSS/base/emby/emby-base.css
+++ b/CSS/base/emby/emby-base.css
@@ -157,7 +157,7 @@ html {
 }
 
 .pageTitleWithDefaultLogo {
-    background-image: url(https://theme-park.dev/resources/emby/logowhite.png)
+    background-image: url(https://assets.deathbybandaid.net/theme.park/resources/emby/logowhite.png)
 }
 
 .backgroundContainer,
@@ -697,7 +697,7 @@ html {
 }
 
 .drawerLogo {
-    background-image: url(https://theme-park.dev/resources/emby/logowhite.png);
+    background-image: url(https://assets.deathbybandaid.net/theme.park/resources/emby/logowhite.png);
     border-bottom-color: var(--line-background)
 }
 
diff --git a/CSS/base/lidarr/lidarr-base.css b/CSS/base/lidarr/lidarr-base.css
index 9d094e00..339cbcd8 100644
--- a/CSS/base/lidarr/lidarr-base.css
+++ b/CSS/base/lidarr/lidarr-base.css
@@ -251,8 +251,10 @@ a:hover {
 }
 
 /* ADD NEW */
-[class*="EnhancedSelectInput-options-"] {
-    border: 1px solid rgba(255, 255, 255, 0.2);
+[class*="EnhancedSelectInput-options-"],
+[class*="EnhancedSelectInputOption-option-"],
+[class*="EnhancedSelectInput-optionsContainer-"] {
+    border: 0px solid rgba(255, 255, 255, 0.2);
     border-radius: 4px;
     background: var(--drop-down-menu-bg);
     background-repeat: repeat, no-repeat;
@@ -275,11 +277,37 @@ a:hover {
     background-color: rgba(255, 255, 255, 0.08);
 }
 
-[class*="HintedSelectInputOption-hintText-"],
-[class*="RootFolderSelectInputOption-freeSpace-"] {
+[class*="HintedSelectInputOption-hintText-"] {
     color: var(--text);
 }
 
+[class*="EnhancedSelectInput-optionsModalScroller-"] {
+    border: 1px solid var(--drop-down-menu-bg);
+    border-radius: 4px;
+    background: var(--drop-down-menu-bg);
+    background-repeat: repeat, no-repeat;
+    background-attachment: fixed, fixed;
+    background-position: center center, center center;
+    background-size: auto, cover;
+    -webkit-background-size: auto, cover;
+    -moz-background-size: auto, cover;
+    -o-background-size: auto, cover;
+    color: var(--text);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButton-"] {
+    color: var(--button-text);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButton-"]:hover {
+    color: var(--button-text-hover);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButtonContainer-"] {
+    
+    border-bottom: 1px solid rgba(255, 255, 255, 0.25);
+}
+
 /* SIDE MENU */
 [class*="PageSidebar-sidebarContainer-"] {
     background-color: rgba(0, 0, 0, .25);
@@ -447,22 +475,34 @@ a:hover {
     color: #fff;
 }
 
+[class*="Tooltip-tooltip-"][class*="Tooltip-inverse-"],
 [class*="Popover-title-"],
 [class*="SeasonInfo-title-"],
 [class*="Popover-body-"],
-[class*="Tooltip-body-"] {
-    background: var(--modal-bg-color) !important;
-    background-repeat: repeat, no-repeat !important;
-    background-attachment: fixed, fixed !important;
-    background-position: center center, center center !important;
-    background-size: auto, cover !important;
-    -webkit-background-size: auto, cover !important;
-    -moz-background-size: auto, cover !important;
-    -o-background-size: auto, cover !important;
+[class*="Tooltip-body-"],
+[class*="Tooltip-tooltipContainer-"],
+[class*="Tooltip-tooltip-"][class*="Tooltip-default-"] {
+    background: #1f1f1f;
+    color: #eee;
 }
 
-[class*="Tooltip-tooltipContainer-"] {
-    color: #fff;
+@supports (backdrop-filter: blur(1em)) or (-webkit-backdrop-filter:blur(1em)) {
+    [class*="Tooltip-tooltip-"][class*="Tooltip-inverse-"],
+    [class*="Popover-title-"],
+    [class*="SeasonInfo-title-"],
+    [class*="Popover-body-"],
+    [class*="Tooltip-body-"],
+    [class*="Tooltip-tooltipContainer-"],
+    [class*="Tooltip-tooltip-"][class*="Tooltip-default-"] {
+        -webkit-backdrop-filter: saturate(1) blur(1.5em);
+        backdrop-filter: saturate(1) blur(1.5em);
+        background: rgb(var(--accent-color),0.05);
+        color: white;
+    }
+}
+
+[class*="Tooltip-top-"][class*="Tooltip-inverse-"] {
+    border-top-color: var(--text);
 }
 
 [class*="Tooltip-bottom-"][class*="Tooltip-default-"] {
@@ -954,6 +994,11 @@ input:focus:-ms-input-placeholder {
     color: var(--text);
 }
 
+
+[class*="-cloneButton-"][class*="IconButton-button-"]:hover {
+    color: white;
+}
+
 [class*="Card-card-"]:hover {
     color: var(--text-hover);
 }
diff --git a/CSS/base/nzbget/nzbget-base.css b/CSS/base/nzbget/nzbget-base.css
index 06bc3d4a..577d1f39 100644
--- a/CSS/base/nzbget/nzbget-base.css
+++ b/CSS/base/nzbget/nzbget-base.css
@@ -661,4 +661,4 @@ hr {
     border: 0;
     border-top: 1px solid gb(var(--accent-color));
     border-bottom: 1px solid gb(var(--accent-color));
-}
+}
\ No newline at end of file
diff --git a/CSS/base/ombi/ombi-base.css b/CSS/base/ombi/ombi-base.css
index bca65d8f..200d94fe 100644
--- a/CSS/base/ombi/ombi-base.css
+++ b/CSS/base/ombi/ombi-base.css
@@ -36,6 +36,12 @@ html, body, .wizard-background, .content-container, #main-container\ dark > mat-
     background: transparent !important;
 }
 
+.container-alert {
+    color: #fff;
+    background-color: rgb(0 0 0 / 50%) !important;
+    border-color: rgb(var(--accent-color)) !important;
+}
+
 .h1,
 .h2,
 .h3,
@@ -549,8 +555,26 @@ button.admin-cog {
     color: rgb(var(--accent-color)) !important;
 }
 
+.mat-toolbar .mat-form-field-underline,.mat-toolbar .mat-form-field-ripple,.mat-toolbar .mat-focused .mat-form-field-ripple {
+background-color: rgb(var(--accent-color));
+}
+
+.mat-input-element,.login-card .mat-input-element {
+    caret-color: rgb(var(--accent-color)) !important;
+}
+
+input:-internal-autofill-selected {
+    appearance: menulist-button;
+    background-image: none !important;
+    background-color: -internal-light-dark(rgba(232, 240, 254, 0), rgba(70, 90, 126, 0.4)) !important;
+    color: -internal-light-dark(black, white) !important;
+}
+
+.mat-form-field.mat-focused .mat-form-field-ripple,
 .mat-checkbox-checked.mat-accent .mat-checkbox-background,
-.mat-checkbox-indeterminate.mat-accent .mat-checkbox-background {
+.mat-checkbox-indeterminate.mat-accent .mat-checkbox-background,
+.mat-toolbar .mat-form-field-underline,.mat-toolbar .mat-form-field-ripple,
+.mat-toolbar .mat-focused .mat-form-field-ripple {
     background-color: rgb(var(--accent-color));
 }
 
@@ -599,6 +623,10 @@ button.admin-cog {
 
 /* TABLES */
 
+.table {
+    color: var(--text);
+}
+
 .mat-table-sticky,
 .mat-table tbody,
 .mat-table tfoot,
diff --git a/CSS/base/organizr/organizr-base.css b/CSS/base/organizr/organizr-base.css
index 30ed88d1..3244e5ec 100644
--- a/CSS/base/organizr/organizr-base.css
+++ b/CSS/base/organizr/organizr-base.css
@@ -644,7 +644,7 @@ th.fc-day-header.fc-widget-header.fc-today {
 
 /* logo */
 .white-box .visible-xs {
-    display: block !important;
+    display: block;
 }
 
 .loginLogo {
@@ -1154,7 +1154,7 @@ label[for="checkbox-login"]:hover {
 .nav-tabs>li.active>a:hover {
     cursor: pointer;
     opacity: 1;
-    background: rgba(0, 0, 0, 0.25) !important;
+    background: rgb(var(--accent-color) , .15) !important;
 }
 
 #homepageOrderdownloader .nav-tabs>li.active>a,
@@ -1164,12 +1164,6 @@ label[for="checkbox-login"]:hover {
     padding: 10px 12.5px;
 }
 
-#homepageOrderdownloader .nav-tabs>li.active>a,
-.nav-tabs>li.active .nav>li>a .customtab,
-#homepageOrderdownloader .nav-tabs {
-    padding: 10px 12.5px;
-}
-
 #homepageOrderdownloader ul.nav.customtab.nav-tabs.m-t-5.nav-tabs>li.active>a,
 #homepageOrderdownloader ul.nav.customtab.nav-tabs.m-t-5.nav-tabs>li>a {
     padding: 10px 11.5px !important;
diff --git a/CSS/base/plex/plex-base.css b/CSS/base/plex/plex-base.css
index c9ebc1a5..a279bf2d 100644
--- a/CSS/base/plex/plex-base.css
+++ b/CSS/base/plex/plex-base.css
@@ -236,7 +236,8 @@ html body,
 
 /* ACCENTS */
 
-[class*="Badge-primary-"] {
+[class*="Badge-primary-"],
+.nav-header>li>a.selected .badge {
   background-color: rgb(var(--accent-color));
   color: var(--label-text-color);
 }
diff --git a/CSS/base/portainer/portainer-base.css b/CSS/base/portainer/portainer-base.css
index af56f013..819644ce 100644
--- a/CSS/base/portainer/portainer-base.css
+++ b/CSS/base/portainer/portainer-base.css
@@ -12,6 +12,11 @@
 
 @import url("https://assets.deathbybandaid.net/theme.park/CSS/defaults/placeholders.css");
 
+:root {
+    --text-json-tree-branch-preview-color: #eee;
+    --text-json-tree-leaf-color: #eee;
+    }
+
 /* Scrollbar */
 @media only screen and (min-width: 768px) {
     html {
diff --git a/CSS/base/prowlarr/prowlarr-base.css b/CSS/base/prowlarr/prowlarr-base.css
index 7f16433e..27858a34 100644
--- a/CSS/base/prowlarr/prowlarr-base.css
+++ b/CSS/base/prowlarr/prowlarr-base.css
@@ -192,6 +192,7 @@ a:hover {
 
 [class*="CheckInput-input-"][class*="CheckInput-isNotChecked-"] {
     background: #fff;
+    border: 1px solid #ccc;
 }
 
 /* HEADER */
@@ -385,22 +386,34 @@ a:hover {
     color: #fff;
 }
 
+[class*="Tooltip-tooltip-"][class*="Tooltip-inverse-"],
 [class*="Popover-title-"],
 [class*="SeasonInfo-title-"],
 [class*="Popover-body-"],
-[class*="Tooltip-body-"] {
-    background: var(--modal-bg-color) !important;
-    background-repeat: repeat, no-repeat !important;
-    background-attachment: fixed, fixed !important;
-    background-position: center center, center center !important;
-    background-size: auto, cover !important;
-    -webkit-background-size: auto, cover !important;
-    -moz-background-size: auto, cover !important;
-    -o-background-size: auto, cover !important;
+[class*="Tooltip-body-"],
+[class*="Tooltip-tooltipContainer-"],
+[class*="Tooltip-tooltip-"][class*="Tooltip-default-"] {
+    background: #1f1f1f;
+    color: #eee;
 }
 
-[class*="Tooltip-tooltipContainer-"] {
-    color: #fff;
+@supports (backdrop-filter: blur(1em)) or (-webkit-backdrop-filter:blur(1em)) {
+    [class*="Tooltip-tooltip-"][class*="Tooltip-inverse-"],
+    [class*="Popover-title-"],
+    [class*="SeasonInfo-title-"],
+    [class*="Popover-body-"],
+    [class*="Tooltip-body-"],
+    [class*="Tooltip-tooltipContainer-"],
+    [class*="Tooltip-tooltip-"][class*="Tooltip-default-"] {
+        -webkit-backdrop-filter: saturate(1) blur(1.5em);
+        backdrop-filter: saturate(1) blur(1.5em);
+        background: rgb(var(--accent-color),0.05);
+        color: white;
+    }
+}
+
+[class*="Tooltip-top-"][class*="Tooltip-inverse-"] {
+    border-top-color: var(--text);
 }
 
 [class*="Tooltip-bottom-"][class*="Tooltip-default-"] {
@@ -458,6 +471,10 @@ a:hover {
     color: #000;
 }
 
+[class*="Label-disabled-"][class*="Label-outline-"] {
+    color: #000;
+}
+
 [class*="PageSidebarItem-status-"][class*="Label-info-"] {
     border-color: var(--arr-queue-color);
     background-color: var(--arr-queue-color);
@@ -585,8 +602,10 @@ a:hover {
 
 /* ADD NEW */
 
-[class*="EnhancedSelectInput-options-"] {
-    border: 1px solid rgba(255, 255, 255, 0.2);
+[class*="EnhancedSelectInput-options-"],
+[class*="EnhancedSelectInputOption-option-"],
+[class*="EnhancedSelectInput-optionsContainer-"] {
+    border: 0px solid rgba(255, 255, 255, 0.2);
     border-radius: 4px;
     background: var(--drop-down-menu-bg);
     background-repeat: repeat, no-repeat;
@@ -613,6 +632,32 @@ a:hover {
     color: var(--text);
 }
 
+[class*="EnhancedSelectInput-optionsModalScroller-"] {
+    border: 1px solid var(--drop-down-menu-bg);
+    border-radius: 4px;
+    background: var(--drop-down-menu-bg);
+    background-repeat: repeat, no-repeat;
+    background-attachment: fixed, fixed;
+    background-position: center center, center center;
+    background-size: auto, cover;
+    -webkit-background-size: auto, cover;
+    -moz-background-size: auto, cover;
+    -o-background-size: auto, cover;
+    color: var(--text);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButton-"] {
+    color: var(--button-text);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButton-"]:hover {
+    color: var(--button-text-hover);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButtonContainer-"] {
+    
+    border-bottom: 1px solid rgba(255, 255, 255, 0.25);
+}
 /* SEARCH BAR */
 [class*="Input-input-"],
 [class*="AddNewMovie-searchIconContainer-"],
@@ -968,6 +1013,11 @@ input:focus:-ms-input-placeholder {
     color: var(--text);
 }
 
+
+[class*="-cloneButton-"][class*="IconButton-button-"]:hover {
+    color: white;
+}
+
 [class*="Card-card-"]:hover,
 [class*="Applications-center-"]:hover {
     color: var(--text-hover);
@@ -1135,4 +1185,26 @@ input[type=password] {
 
 canvas {
     filter: invert(1)
+}
+
+/* QUERY OPTIONS */
+[class*="QueryParameterOption-option-"] {
+    border: 1px solid transparent;
+}
+
+[class*="QueryParameterOption-token-"] {
+    background-color: rgba(255, 255, 255, 0.15);
+}
+
+[class*="QueryParameterOption-example-"] {
+    background-color: rgba(255, 255, 255, 0.25);
+}
+
+
+[class*="QueryParameterOption-option-"]:hover [class*="QueryParameterOption-token-"] {
+    background-color: rgba(255, 255, 2550, 0.25);
+}
+
+[class*="QueryParameterOption-option-"]:hover [class*="QueryParameterOption-example-"] {
+    background-color: rgba(255, 255, 2550, 0.35);
 }
\ No newline at end of file
diff --git a/CSS/base/qbittorrent/qbittorrent-base.css b/CSS/base/qbittorrent/qbittorrent-base.css
index 41c88587..6c245f3c 100644
--- a/CSS/base/qbittorrent/qbittorrent-base.css
+++ b/CSS/base/qbittorrent/qbittorrent-base.css
@@ -1604,7 +1604,7 @@ ul.filterList a {
 }
 
 img[src="icons/inode-directory.svg"] {
-  background: url(https://theme-park.dev/resources/qbittorrent/folder-open-solid.svg);
+  background: url(https://assets.deathbybandaid.net/theme.park/resources/qbittorrent/folder-open-solid.svg);
   background-size: contain;
   background-repeat: no-repeat;
   background-origin: content-box;
@@ -1612,7 +1612,7 @@ img[src="icons/inode-directory.svg"] {
 }
 
 img[src="icons/network-server.svg"] {
-  background: url(https://theme-park.dev/resources/qbittorrent/network-wired-solid.svg);
+  background: url(https://assets.deathbybandaid.net/theme.park/resources/qbittorrent/network-wired-solid.svg);
   background-size: contain;
   background-repeat: no-repeat;
   background-origin: content-box;
@@ -1620,7 +1620,7 @@ img[src="icons/network-server.svg"] {
 }
 
 img[src="icons/mail-folder-inbox.svg"] {
-  background: url(https://theme-park.dev/resources/qbittorrent/inbox-solid.svg);
+  background: url(https://assets.deathbybandaid.net/theme.park/resources/qbittorrent/inbox-solid.svg);
   background-size: contain;
   background-repeat: no-repeat;
   background-origin: content-box;
diff --git a/CSS/base/radarr/radarr-base.css b/CSS/base/radarr/radarr-base.css
index c67727a1..9848a293 100644
--- a/CSS/base/radarr/radarr-base.css
+++ b/CSS/base/radarr/radarr-base.css
@@ -10,11 +10,12 @@
 /*		   		        Made by @gilbN					 */
 /* 			      https://assets.deathbybandaid.net/theme.park			 */
 :root {
-    --calendar-in-cinemas: 53, 197, 244;
+    --calendar-in-cinemas: 53 197 244;
     --calendar-downloading: 122 67 182; 
     --calendar-unmonitored: 173 173 173;
     --calendar-unaired: 93 156 236;  
     --calendar-missing: 240 80 80;
+    --calendar-missing-unmonitored: 255 165 0;
     --calendar-available: 39 194 76;
   }
 
@@ -41,7 +42,7 @@ body {
 }
 
 /* LINKS */
-[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):not([class*="Button-"]) {
+[class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):not([class*="Button-"]):not([class*="AgendaEvent"]) {
     color: var(--link-color);   
    }
    
@@ -342,6 +343,10 @@ a:hover {
     color: var(--text) !important;
 }
 
+[class*="MovieFileStatus-missing"].colorImpaired {
+    background: transparent;
+}
+
 .fa-search:hover {
     color: var(--text-hover) !important;
 }
@@ -386,22 +391,34 @@ a:hover {
     background-color: rgba(0, 0, 0, .25);
 }
 
+[class*="Tooltip-tooltip-"][class*="Tooltip-inverse-"],
 [class*="Popover-title-"],
 [class*="SeasonInfo-title-"],
 [class*="Popover-body-"],
-[class*="Tooltip-body-"] {
-    background: var(--modal-bg-color) !important;
-    background-repeat: repeat, no-repeat !important;
-    background-attachment: fixed, fixed !important;
-    background-position: center center, center center !important;
-    background-size: auto, cover !important;
-    -webkit-background-size: auto, cover !important;
-    -moz-background-size: auto, cover !important;
-    -o-background-size: auto, cover !important;
+[class*="Tooltip-body-"],
+[class*="Tooltip-tooltipContainer-"],
+[class*="Tooltip-tooltip-"][class*="Tooltip-default-"] {
+    background: #1f1f1f;
+    color: #eee;
 }
 
-[class*="Tooltip-tooltipContainer-"] {
-    color: #fff;
+@supports (backdrop-filter: blur(1em)) or (-webkit-backdrop-filter:blur(1em)) {
+    [class*="Tooltip-tooltip-"][class*="Tooltip-inverse-"],
+    [class*="Popover-title-"],
+    [class*="SeasonInfo-title-"],
+    [class*="Popover-body-"],
+    [class*="Tooltip-body-"],
+    [class*="Tooltip-tooltipContainer-"],
+    [class*="Tooltip-tooltip-"][class*="Tooltip-default-"] {
+        -webkit-backdrop-filter: saturate(1) blur(1.5em);
+        backdrop-filter: saturate(1) blur(1.5em);
+        background: rgb(var(--accent-color),0.05);
+        color: white;
+    }
+}
+
+[class*="Tooltip-top-"][class*="Tooltip-inverse-"] {
+    border-top-color: var(--text);
 }
 
 [class*="Tooltip-bottom-"][class*="Tooltip-default-"] {
@@ -595,8 +612,10 @@ a:hover {
 
 /* ADD NEW */
 
-[class*="EnhancedSelectInput-options-"] {
-    border: 1px solid rgba(255, 255, 255, 0.2);
+[class*="EnhancedSelectInput-options-"],
+[class*="EnhancedSelectInputOption-option-"],
+[class*="EnhancedSelectInput-optionsContainer-"] {
+    border: 0px solid rgba(255, 255, 255, 0.2);
     border-radius: 4px;
     background: var(--drop-down-menu-bg);
     background-repeat: repeat, no-repeat;
@@ -623,6 +642,33 @@ a:hover {
     color: var(--text);
 }
 
+[class*="EnhancedSelectInput-optionsModalScroller-"] {
+    border: 1px solid var(--drop-down-menu-bg);
+    border-radius: 4px;
+    background: var(--drop-down-menu-bg);
+    background-repeat: repeat, no-repeat;
+    background-attachment: fixed, fixed;
+    background-position: center center, center center;
+    background-size: auto, cover;
+    -webkit-background-size: auto, cover;
+    -moz-background-size: auto, cover;
+    -o-background-size: auto, cover;
+    color: var(--text);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButton-"] {
+    color: var(--button-text);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButton-"]:hover {
+    color: var(--button-text-hover);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButtonContainer-"] {
+    
+    border-bottom: 1px solid rgba(255, 255, 255, 0.25);
+}
+
 /* SEARCH BAR */
 [class*="Input-input-"],
 [class*="AddNewMovie-searchIconContainer-"],
@@ -831,16 +877,28 @@ input:focus:-ms-input-placeholder {
     border-left-color: transparent !important;
 }
 
-[class*="CalendarEvent-missing-"] {
+[class*="CalendarEvent-missing-"],
+[class*="CalendarEvent-missingMonitored"] {
     background: rgb(var(--calendar-missing) / .7) !important;
     border-left-color: transparent !important;
 }
 
-[class*="Calendar-calendar-"] [class*="CalendarEvent-missing-"]:hover {
+[class*="Calendar-calendar-"] [class*="CalendarEvent-missing-"]:hover,
+[class*="Calendar-calendar-"] [class*="CalendarEvent-missingMonitored"]:hover {
     background: rgba(var(--calendar-missing) / .5) !important;
     border-left-color: transparent !important;
 }
 
+[class*="CalendarEvent-missingUnmonitored-"] {
+    background: rgb(var(--calendar-missing-unmonitored) / .7) !important;
+    border-left-color: transparent !important;
+}
+
+[class*="CalendarEvent-missingUnmonitored-"]:hover {
+    background: rgb(var(--calendar-missing-unmonitored) / .5) !important;
+    border-left-color: transparent !important;
+}
+
 [class*="CalendarEvent-unreleased-"] {
     background: rgb(var(--calendar-unaired) / .7) !important;
     border-left-color: transparent !important;
@@ -851,6 +909,16 @@ input:focus:-ms-input-placeholder {
     border-left-color: transparent !important;
 }
 
+[class*="CalendarEvent-event-"] {
+    background: rgb(var(--calendar-unmonitored) / .7);
+    border-left-color: transparent;
+}
+
+[class*="Calendar-calendar-"] [class*="CalendarEvent-event-"]:hover {
+    background: rgb(var(--calendar-unmonitored) / .5);
+    border-left-color: transparent;
+}
+
 [class*="CalendarEvent-unmonitored-"] {
     background: rgb(var(--calendar-unmonitored) / .7) !important;
     border-left-color: transparent !important;
@@ -900,7 +968,8 @@ input:focus:-ms-input-placeholder {
 [class*="CalendarEvent-movieTitle-"],
 [class*="CalendarEvent-movieInfo-"],
 [class*="CalendarEvent-episodeInfo-"],
-[class*="CalendarEvent-airTime-"] {
+[class*="CalendarEvent-airTime-"],
+[class*="CalendarEvent-link-"] {
     color: #fff !important;
 }
 
@@ -924,6 +993,11 @@ input:focus:-ms-input-placeholder {
     color: var(--text);
 }
 
+[class*="LegendItem-missingMonitoredColorImpaired-"],
+[class*="LegendItem-missingUnmonitoredColorImpaired-"] {
+    background: transparent;
+}
+
 /* calendar agenda */
 [class*="AgendaEvent-event-"]:hover {
     background-color: hsla(0, 0%, 100%, .08) !important;
@@ -984,6 +1058,11 @@ input:focus:-ms-input-placeholder {
     color: var(--text);
 }
 
+
+[class*="-cloneButton-"][class*="IconButton-button-"]:hover {
+    color: white;
+}
+
 [class*="Card-card-"]:hover {
     color: var(--text-hover);
 }
diff --git a/CSS/base/readarr/readarr-base.css b/CSS/base/readarr/readarr-base.css
index 5ea635fb..c6d92cb0 100644
--- a/CSS/base/readarr/readarr-base.css
+++ b/CSS/base/readarr/readarr-base.css
@@ -11,12 +11,11 @@
 /* 			      https://assets.deathbybandaid.net/theme.park			 */
 
 :root {
-    --calendar-downloading: 122 67 182;
     --calendar-downloaded: 39 194 76;
-    --calendar-unreleased: 93 156 236;
-    --calendar-partial: 255, 165, 0;  
+    --calendar-downloading: 122 67 182;
     --calendar-unmonitored: 173 173 173;
-    --calendar-missing: 240 80 80; 
+    --calendar-missing: 240 80 80;
+    --calendar-unreleased: 93 156 236; 
   }
 
 body {
@@ -251,8 +250,10 @@ a:hover {
 }
 
 /* ADD NEW */
-[class*="EnhancedSelectInput-options-"] {
-    border: 1px solid rgba(255, 255, 255, 0.2);
+[class*="EnhancedSelectInput-options-"],
+[class*="EnhancedSelectInputOption-option-"],
+[class*="EnhancedSelectInput-optionsContainer-"] {
+    border: 0px solid rgba(255, 255, 255, 0.2);
     border-radius: 4px;
     background: var(--drop-down-menu-bg);
     background-repeat: repeat, no-repeat;
@@ -275,11 +276,37 @@ a:hover {
     background-color: rgba(255, 255, 255, 0.08);
 }
 
-[class*="HintedSelectInputOption-hintText-"],
-[class*="RootFolderSelectInputOption-freeSpace-"] {
+[class*="HintedSelectInputOption-hintText-"] {
     color: var(--text);
 }
 
+[class*="EnhancedSelectInput-optionsModalScroller-"] {
+    border: 1px solid var(--drop-down-menu-bg);
+    border-radius: 4px;
+    background: var(--drop-down-menu-bg);
+    background-repeat: repeat, no-repeat;
+    background-attachment: fixed, fixed;
+    background-position: center center, center center;
+    background-size: auto, cover;
+    -webkit-background-size: auto, cover;
+    -moz-background-size: auto, cover;
+    -o-background-size: auto, cover;
+    color: var(--text);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButton-"] {
+    color: var(--button-text);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButton-"]:hover {
+    color: var(--button-text-hover);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButtonContainer-"] {
+    
+    border-bottom: 1px solid rgba(255, 255, 255, 0.25);
+}
+
 /* SIDE MENU */
 [class*="PageSidebar-sidebarContainer-"] {
     background-color: rgba(0, 0, 0, .25);
@@ -443,22 +470,34 @@ a:hover {
     color: #fff;
 }
 
+[class*="Tooltip-tooltip-"][class*="Tooltip-inverse-"],
 [class*="Popover-title-"],
 [class*="SeasonInfo-title-"],
 [class*="Popover-body-"],
-[class*="Tooltip-body-"] {
-    background: var(--modal-bg-color) !important;
-    background-repeat: repeat, no-repeat !important;
-    background-attachment: fixed, fixed !important;
-    background-position: center center, center center !important;
-    background-size: auto, cover !important;
-    -webkit-background-size: auto, cover !important;
-    -moz-background-size: auto, cover !important;
-    -o-background-size: auto, cover !important;
+[class*="Tooltip-body-"],
+[class*="Tooltip-tooltipContainer-"],
+[class*="Tooltip-tooltip-"][class*="Tooltip-default-"] {
+    background: #1f1f1f;
+    color: #eee;
 }
 
-[class*="Tooltip-tooltipContainer-"] {
-    color: #fff;
+@supports (backdrop-filter: blur(1em)) or (-webkit-backdrop-filter:blur(1em)) {
+    [class*="Tooltip-tooltip-"][class*="Tooltip-inverse-"],
+    [class*="Popover-title-"],
+    [class*="SeasonInfo-title-"],
+    [class*="Popover-body-"],
+    [class*="Tooltip-body-"],
+    [class*="Tooltip-tooltipContainer-"],
+    [class*="Tooltip-tooltip-"][class*="Tooltip-default-"] {
+        -webkit-backdrop-filter: saturate(1) blur(1.5em);
+        backdrop-filter: saturate(1) blur(1.5em);
+        background: rgb(var(--accent-color),0.05);
+        color: white;
+    }
+}
+
+[class*="Tooltip-top-"][class*="Tooltip-inverse-"] {
+    border-top-color: var(--text);
 }
 
 [class*="Tooltip-bottom-"][class*="Tooltip-default-"] {
@@ -592,7 +631,9 @@ a:hover {
 
 /* POSTERS */
 [class*="AuthorIndexPoster-title-"],
-[class*="AuthorIndexPosterInfo-info-"] {
+[class*="AuthorIndexPosterInfo-info-"],
+[class*="BookIndexPoster-title-"],
+[class*="BookIndexPosterInfo-info-"] {
     background-color: rgba(255, 255, 255, 0.08);
     color: var(--text-hover);
 }
@@ -812,58 +853,59 @@ input:focus:-ms-input-placeholder {
 }
 
 /* CALENDAR */
-[class*="CalendarEvent-downloaded-"] {
-    background: rgb(var(--calendar-available) / .7) !important;
+[class*="CalendarEvent-downloaded-"]:not([class*="AgendaEvent-"]) {
+    background: rgb(var(--calendar-downloaded) / .7) !important;
     border-left-color: transparent !important;
 }
 
-[class*="Calendar-calendar-"] [class*="CalendarEvent-downloaded-"]:hover {
-    background: rgb(var(--calendar-available) / .5) !important;
+[class*="Calendar-calendar-"] [class*="CalendarEvent-downloaded-"]:hover:not([class*="AgendaEvent-"]) {
+    background: rgb(var(--calendar-downloaded) / .5) !important;
     border-left-color: transparent !important;
 }
 
-[class*="CalendarEvent-missing-"] {
+[class*="CalendarEvent-missing-"]:not([class*="AgendaEvent-"]) {
     background: rgb(var(--calendar-missing) / .7) !important;
     border-left-color: transparent !important;
 }
 
-[class*="Calendar-calendar-"] [class*="CalendarEvent-missing-"]:hover {
+[class*="Calendar-calendar-"] [class*="CalendarEvent-missing-"]:hover:not([class*="AgendaEvent-"]) {
     background: rgba(var(--calendar-missing) / .5) !important;
     border-left-color: transparent !important;
 }
 
-[class*="CalendarEvent-unreleased-"] {
-    background: rgb(var(--calendar-unaired) / .7) !important;
+[class*="CalendarEvent-unreleased-"]:not([class*="AgendaEvent-"]) {
+    background: rgb(var(--calendar-unreleased) / .7) !important;
     border-left-color: transparent !important;
 }
 
-[class*="Calendar-calendar-"] [class*="CalendarEvent-unreleased-"]:hover {
-    background: rgb(var(--calendar-unaired) / .5) !important;
+[class*="Calendar-calendar-"] [class*="CalendarEvent-unreleased-"]:hover:not([class*="AgendaEvent-"]) {
+    background: rgb(var(--calendar-unreleased) / .5) !important;
     border-left-color: transparent !important;
 }
 
-[class*="CalendarEvent-unmonitored-"] {
+[class*="CalendarEvent-unmonitored-"]:not([class*="AgendaEvent-"]) {
     background: rgb(var(--calendar-unmonitored) / .7) !important;
     border-left-color: transparent !important;
 }
 
-[class*="Calendar-calendar-"] [class*="CalendarEvent-unmonitored-"]:hover {
+[class*="Calendar-calendar-"] [class*="CalendarEvent-unmonitored-"]:hover:not([class*="AgendaEvent-"]) {
     background: rgb(var(--calendar-unmonitored) / .5) !important;
     border-left-color: transparent !important;
 }
 
-[class*="CalendarEvent-downloading-"] {
+[class*="CalendarEvent-downloading-"]:not([class*="AgendaEvent-"]) {
     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:not([class*="AgendaEvent-"]) {
     background: rgb(var(--calendar-downloading) / .5) !important;
     border-left-color: transparent !important;
 }
 
 [class*="DayOfWeek-dayOfWeek-"] {
     background-color: hsla(0, 0%, 100%, .08);
+    color: #fff;
 }
 
 [class*="CalendarDay-dayOfMonth-"] {
@@ -874,6 +916,23 @@ input:focus:-ms-input-placeholder {
 [class*="CalendarDay-isToday-"],
 [class*="DayOfWeek-isToday-"] {
     background-color: hsla(0, 0%, 100%, .25) !important;
+    color: #fff;
+}
+
+[class*="CalendarEvent-authorName-"] a,
+[class*="CalendarEvent-authorName-"],
+[class*="CalendarEvent-bookTitle-"] a,
+[class*="CalendarEvent-bookTitle-"]{
+color: #eee !important;
+}
+
+[class*="CalendarEvent-authorName-"] a:hover,
+[class*="CalendarEvent-bookTitle-"]  a:hover{
+color: #fff !important;
+}
+
+[class*="CalendarEvent-event-"] {
+    border-left: 4px solid var(--text);
 }
 
 [class*="CalendarDay-day-"],
@@ -956,6 +1015,11 @@ input:focus:-ms-input-placeholder {
     color: var(--text);
 }
 
+
+[class*="-cloneButton-"][class*="IconButton-button-"]:hover {
+    color: white;
+}
+
 [class*="Card-card-"]:hover {
     color: var(--text-hover);
 }
@@ -1237,4 +1301,4 @@ input[type=password] {
 /*Specific Book Page*/
 [class*="BookDetails-tab-"] {
     color: #FFF;
-}
\ No newline at end of file
+}
diff --git a/CSS/base/sonarr/sonarr-base.css b/CSS/base/sonarr/sonarr-base.css
index 7a82f172..b9b18d99 100644
--- a/CSS/base/sonarr/sonarr-base.css
+++ b/CSS/base/sonarr/sonarr-base.css
@@ -12,13 +12,13 @@
 
 :root {
     --calendar-tv-unaired-premiere: 53 197 244;
-    --calendar-tv-downloading: 122 67 182; 
+    --calendar-tv-downloading: 122 67 182;
     --calendar-tv-unmonitored: 173 173 173;
-    --calendar-tv-unaired: 93 156 236;  
+    --calendar-tv-unaired: 93 156 236;
     --calendar-tv-missing: 240 80 80;
-    --calendar-tv-on-air: 255 165 0; 
+    --calendar-tv-on-air: 255 165 0;
     --calendar-tv-available: 39 194 76;
-  }
+}
 
 body {
     background: var(--main-bg-color);
@@ -44,11 +44,11 @@ body {
 
 /* LINKS */
 [class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):not([class*="Button-"]) {
-    color: var(--link-color);   
-   }
-   
+    color: var(--link-color);
+}
+
 [class*="Link-to-"]:not([class*="PageSidebarItem-link-"]):hover:not([class*="Button-"]):hover {
-color: var(--link-color-hover);   
+    color: var(--link-color-hover);
 }
 
 a {
@@ -290,6 +290,7 @@ a:hover {
 #sidebar-toggle-button {
     color: var(--text);
 }
+
 #sidebar-toggle-button:hover,
 #sidebar-toggle-button:focus,
 #sidebar-toggle-button:active {
@@ -392,46 +393,48 @@ a:hover {
     background-color: rgba(0, 0, 0, .25) !important;
 }
 
+[class*="Tooltip-tooltip-"][class*="Tooltip-inverse-"],
 [class*="Popover-title-"],
 [class*="SeasonInfo-title-"],
 [class*="Popover-body-"],
-[class*="Tooltip-bod-"] {
-    background: var(--modal-bg-color) !important;
-    background-repeat: repeat, no-repeat !important;
-    background-attachment: fixed, fixed !important;
-    background-position: center center, center center !important;
-    background-size: auto, cover !important;
-    -webkit-background-size: auto, cover !important;
-    -moz-background-size: auto, cover !important;
-    -o-background-size: auto, cover !important;
+[class*="Tooltip-body-"],
+[class*="Tooltip-tooltipContainer-"],
+[class*="Tooltip-tooltip-"][class*="Tooltip-default-"] {
+    background: #1f1f1f;
+    color: #eee;
 }
 
-[class*="Tooltip-tooltipContainer-"] {
-    color: #fff;
+@supports (backdrop-filter: blur(1em)) or (-webkit-backdrop-filter:blur(1em)) {
+    [class*="Tooltip-tooltip-"][class*="Tooltip-inverse-"],
+    [class*="Popover-title-"],
+    [class*="Popover-body-"],
+    [class*="Tooltip-body-"],
+    [class*="Tooltip-tooltipContainer-"],
+    [class*="Tooltip-tooltip-"][class*="Tooltip-default-"] {
+        -webkit-backdrop-filter: saturate(1) blur(1.5em);
+        backdrop-filter: saturate(1) blur(1.5em);
+        background: rgb(var(--accent-color),0.05);
+        color: white;
+    }
+    [class*="SeasonInfo-title-"] {
+        background: transparent;
+    }
 }
 
-[class*="Tooltip-tooltip-"][class*=Tooltip-inverse-] {
-    background: var(--modal-bg-color);
-    background-repeat: repeat, no-repeat;
-    background-attachment: fixed, fixed;
-    background-position: center center, center center;
-    background-size: auto, cover;
-    -webkit-background-size: auto, cover;
-    -moz-background-size: auto, cover;
-    -o-background-size: auto, cover;
-    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+[class*="Tooltip-top-"][class*="Tooltip-inverse-"] {
+    border-top-color: var(--text);
 }
 
 [class*="Tooltip-bottom-"][class*="Tooltip-inverse-"] {
-    border-bottom-color: #fff;
+    border-bottom-color: var(--text);
 }
 
 [class*="Tooltip-bottom-"][class*="Tooltip-default-"] {
-    border-bottom-color: #fff !important;
+    border-bottom-color: var(--text) !important;
 }
 
 [class*="Tooltip-right-"][class*="Tooltip-default-"] {
-    border-right-color: #fff !important;
+    border-right-color: var(--text) !important;
 }
 
 [class*="EpisodeTitleLink-link-"]:hover {
@@ -608,8 +611,10 @@ a:hover {
 }
 
 /* ADD NEW */
-[class*="EnhancedSelectInput-options-"] {
-    border: 1px solid rgba(255, 255, 255, 0.2);
+[class*="EnhancedSelectInput-options-"],
+[class*="EnhancedSelectInputOption-option-"],
+[class*="EnhancedSelectInput-optionsContainer-"] {
+    border: 0px solid rgba(255, 255, 255, 0.2);
     border-radius: 4px;
     background: var(--drop-down-menu-bg);
     background-repeat: repeat, no-repeat;
@@ -632,11 +637,37 @@ a:hover {
     background-color: rgba(255, 255, 255, 0.08);
 }
 
-[class*="HintedSelectInputOption-hintText-"],
-[class*="RootFolderSelectInputOption-freeSpace-"] {
+[class*="HintedSelectInputOption-hintText-"] {
     color: var(--text);
 }
 
+[class*="EnhancedSelectInput-optionsModalScroller-"] {
+    border: 1px solid var(--drop-down-menu-bg);
+    border-radius: 4px;
+    background: var(--drop-down-menu-bg);
+    background-repeat: repeat, no-repeat;
+    background-attachment: fixed, fixed;
+    background-position: center center, center center;
+    background-size: auto, cover;
+    -webkit-background-size: auto, cover;
+    -moz-background-size: auto, cover;
+    -o-background-size: auto, cover;
+    color: var(--text);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButton-"] {
+    color: var(--button-text);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButton-"]:hover {
+    color: var(--button-text-hover);
+}
+
+[class*="EnhancedSelectInput-mobileCloseButtonContainer-"] {
+    
+    border-bottom: 1px solid rgba(255, 255, 255, 0.25);
+}
+
 /* SEARCH BAR */
 [class*="Input-input-"],
 [class*="AddNewSeries-searchIconContainer-"],
@@ -975,6 +1006,10 @@ input:focus:-ms-input-placeholder {
     color: var(--text);
 }
 
+[class*="-cloneButton-"][class*="IconButton-button-"]:hover {
+    color: white;
+}
+
 [class*="Card-card-"]:hover {
     color: var(--text-hover);
 }
diff --git a/CSS/community-theme-options/blackberry-carol.css b/CSS/community-theme-options/blackberry-carol.css
index dd9bf7f2..a1c50eee 100644
--- a/CSS/community-theme-options/blackberry-carol.css
+++ b/CSS/community-theme-options/blackberry-carol.css
@@ -1,5 +1,5 @@
 :root {
-  --main-bg-color: url("https://theme-park.dev/resources/blur-noise.png"),
+  --main-bg-color: url("https://assets.deathbybandaid.net/theme.park/resources/blur-noise.png"),
   radial-gradient(at center center, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.9) 120%) center center/cover no-repeat fixed, 
   radial-gradient(at bottom center, rgba(0, 0, 0, 0.15), hsla(0, 14%, 18%, 0.45), hsla(0, 18%, 5%, 0.6)) center center/cover no-repeat fixed, 
   radial-gradient(at bottom center, rgba(167, 6, 6, 0.15), hsla(0, 14%, 18%, 0), hsla(0, 18%, 5%, 0)) center center/cover no-repeat fixed, 
diff --git a/CSS/community-theme-options/mind.css b/CSS/community-theme-options/mind.css
index 9e8ed6db..2958ef84 100644
--- a/CSS/community-theme-options/mind.css
+++ b/CSS/community-theme-options/mind.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(255, 242, 0, .7) 0%, #0d0400 80%, rgba(0, 0, 0, 1) 100%) center center/cover no-repeat fixed,
-    url("https://theme-park.dev/resources/mind.jpg") center center/cover no-repeat fixed;
+    url("https://assets.deathbybandaid.net/theme.park/resources/mind.jpg") center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(51, 49, 0, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(51, 49, 0, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(51, 49, 0, 1) 0%, #000 100%) center center/cover no-repeat fixed;
diff --git a/CSS/community-theme-options/power.css b/CSS/community-theme-options/power.css
index 1f5331a1..cdb2f12b 100644
--- a/CSS/community-theme-options/power.css
+++ b/CSS/community-theme-options/power.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(166, 40, 140, .7) 0%, rgba(11,8,51,1) 80%, rgba(0,0,0,1) 100%) center center/cover no-repeat fixed,
-    url("https://theme-park.dev/resources/power.jpg") center center/cover no-repeat fixed;
+    url("https://assets.deathbybandaid.net/theme.park/resources/power.jpg") center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(35, 0, 57, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(35, 0, 57, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(35, 0, 57, 1) 0%, #000 100%) center center/cover no-repeat fixed;
diff --git a/CSS/community-theme-options/reality.css b/CSS/community-theme-options/reality.css
index 970d67b5..b365bdb3 100644
--- a/CSS/community-theme-options/reality.css
+++ b/CSS/community-theme-options/reality.css
@@ -1,6 +1,6 @@
     :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(232, 11, 11, 0.7) 0%, #08000d 80%, rgba(0,0,0,1) 100%) center center/cover no-repeat fixed,
-  url("https://theme-park.dev/resources/reality.jpg") center center/cover no-repeat fixed;
+  url("https://assets.deathbybandaid.net/theme.park/resources/reality.jpg") center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(102, 5, 5, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(102, 5, 5, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(102, 5, 5, 1) 0%, #000 100%) center center/cover no-repeat fixed;
diff --git a/CSS/community-theme-options/soul.css b/CSS/community-theme-options/soul.css
index 40e909b2..e64d7bd8 100644
--- a/CSS/community-theme-options/soul.css
+++ b/CSS/community-theme-options/soul.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(255, 153, 0, .7) 0%, #3c0015 80%, rgba(0, 0, 0, 1) 100%) center center/cover no-repeat fixed,
-    url("https://theme-park.dev/resources/soul.jpg") center center/cover no-repeat fixed;
+    url("https://assets.deathbybandaid.net/theme.park/resources/soul.jpg") center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(140, 64, 2, 1) 0%, #3c0015 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(140, 64, 2, 1) 0%, #3c0015 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(140, 64, 2, 1) 0%, #3c0015 100%) center center/cover no-repeat fixed;
diff --git a/CSS/community-theme-options/space.css b/CSS/community-theme-options/space.css
index dcf87908..45c33c04 100644
--- a/CSS/community-theme-options/space.css
+++ b/CSS/community-theme-options/space.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(0, 98, 255, .7) 0%, #020013 80%, rgb(0, 0, 0) 100%) center center/cover no-repeat fixed,
-    url("https://theme-park.dev/resources/space.jpg") center center/cover no-repeat fixed;
+    url("https://assets.deathbybandaid.net/theme.park/resources/space.jpg") center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgb(0, 57, 148) 0%, #10003c 100%) center center/cover no-repeat fixed;
   --modal-headercolor: linear-gradient(180deg, rgb(0, 57, 148) 0%, #10003c 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgb(0, 57, 148) 0%, #10003c 100%) center center/cover no-repeat fixed;
diff --git a/CSS/community-theme-options/time.css b/CSS/community-theme-options/time.css
index 36821587..856f6f53 100644
--- a/CSS/community-theme-options/time.css
+++ b/CSS/community-theme-options/time.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(109, 247, 81, .7) 0%, #00130c 80%, rgb(0, 0, 0) 100%) center center/cover no-repeat fixed,
-    url("https://theme-park.dev/resources/time.jpg") center center/cover no-repeat fixed;
+    url("https://assets.deathbybandaid.net/theme.park/resources/time.jpg") center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(2, 77, 0, 1) 0%, #00130c 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(2, 77, 0, 1) 0%, #00130c 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(2, 77, 0, 1) 0%, #00130c 100%) center center/cover no-repeat fixed;
diff --git a/CSS/theme-options/aquamarine.css b/CSS/theme-options/aquamarine.css
index 88dd6fe6..6b9184fc 100644
--- a/CSS/theme-options/aquamarine.css
+++ b/CSS/theme-options/aquamarine.css
@@ -20,7 +20,7 @@
 
   --text:#ddd;
   --text-hover: #fff;
-  --text-muted: #999;
+  --text-muted: #8dcfc9;
 
   /*Specials*/
   --arr-queue-color: #009688; /* Servarr apps + Bazarr*/
diff --git a/CSS/themes/emby/emby-base.css b/CSS/themes/emby/emby-base.css
index c6aa6b74..437bd1bb 100644
--- a/CSS/themes/emby/emby-base.css
+++ b/CSS/themes/emby/emby-base.css
@@ -157,7 +157,7 @@ html {
 }
 
 .pageTitleWithDefaultLogo {
-    background-image: url(https://theme-park.dev/Resources/emby/logowhite.png)
+    background-image: url(https://assets.deathbybandaid.net/theme.park/resources/emby/logowhite.png)
 }
 
 .backgroundContainer,
@@ -697,7 +697,7 @@ html {
 }
 
 .drawerLogo {
-    background-image: url(https://theme-park.dev/Resources/emby/logowhite.png);
+    background-image: url(https://assets.deathbybandaid.net/theme.park/resources/emby/logowhite.png);
     border-bottom-color: var(--line-background)
 }
 
diff --git a/CSS/themes/qbittorrent/qbittorrent-base.css b/CSS/themes/qbittorrent/qbittorrent-base.css
index 39d6a457..549dbe7c 100644
--- a/CSS/themes/qbittorrent/qbittorrent-base.css
+++ b/CSS/themes/qbittorrent/qbittorrent-base.css
@@ -1604,7 +1604,7 @@ ul.filterList a {
 }
 
 img[src="icons/inode-directory.svg"] {
-  background: url(https://theme-park.dev/Resources/qbittorrent/folder-open-solid.svg);
+  background: url(https://assets.deathbybandaid.net/theme.park/resources/qbittorrent/folder-open-solid.svg);
   background-size: contain;
   background-repeat: no-repeat;
   background-origin: content-box;
@@ -1612,7 +1612,7 @@ img[src="icons/inode-directory.svg"] {
 }
 
 img[src="icons/network-server.svg"] {
-  background: url(https://theme-park.dev/Resources/qbittorrent/network-wired-solid.svg);
+  background: url(https://assets.deathbybandaid.net/theme.park/resources/qbittorrent/network-wired-solid.svg);
   background-size: contain;
   background-repeat: no-repeat;
   background-origin: content-box;
@@ -1620,7 +1620,7 @@ img[src="icons/network-server.svg"] {
 }
 
 img[src="icons/mail-folder-inbox.svg"] {
-  background: url(https://theme-park.dev/Resources/qbittorrent/inbox-solid.svg);
+  background: url(https://assets.deathbybandaid.net/theme.park/resources/qbittorrent/inbox-solid.svg);
   background-size: contain;
   background-repeat: no-repeat;
   background-origin: content-box;
diff --git a/CSS/themes/sonarr/mind.css b/CSS/themes/sonarr/mind.css
index 72359be9..a94096e7 100644
--- a/CSS/themes/sonarr/mind.css
+++ b/CSS/themes/sonarr/mind.css
@@ -11,7 +11,7 @@
 /*			      https://assets.deathbybandaid.net/theme.park			 */
 
 /* SONARR MIND STONE THEME */
-@import url(https://gilbn.github.io/theme.park/CSS/themes/sonarr/sonarr-base.css);
+@import url(https://assets.deathbybandaid.net/theme.park/CSS//themes/sonarr/sonarr-base.css);
 
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(255, 242, 0, .7) 0%, #0d0400 80%, rgba(0, 0, 0, 1) 100%) center center/cover no-repeat fixed,
diff --git a/CSS/themes/sonarr/power.css b/CSS/themes/sonarr/power.css
index 75235b46..cc551e61 100644
--- a/CSS/themes/sonarr/power.css
+++ b/CSS/themes/sonarr/power.css
@@ -11,7 +11,7 @@
 /*			      https://assets.deathbybandaid.net/theme.park			 */
 
 /* SONARR POWER STONE THEME */
-@import url(https://gilbn.github.io/theme.park/CSS/themes/sonarr/sonarr-base.css);
+@import url(https://assets.deathbybandaid.net/theme.park/CSS//themes/sonarr/sonarr-base.css);
 :root {
     --main-bg-color: radial-gradient(ellipse at center bottom, rgba(166, 40, 140, .7) 0%, rgba(11,8,51,1) 80%, rgba(0,0,0,1) 100%) center center/cover no-repeat fixed,
         url("https://themepark-develop.netlify.app/Resources/power.jpg") center center/cover no-repeat fixed;
diff --git a/CSS/themes/sonarr/reality.css b/CSS/themes/sonarr/reality.css
index 91856670..c6a7e01f 100644
--- a/CSS/themes/sonarr/reality.css
+++ b/CSS/themes/sonarr/reality.css
@@ -11,7 +11,7 @@
 /*			      https://assets.deathbybandaid.net/theme.park			 */
 
 /* SONARR REALITY STONE THEME */
-@import url(https://gilbn.github.io/theme.park/CSS/themes/sonarr/sonarr-base.css);
+@import url(https://assets.deathbybandaid.net/theme.park/CSS//themes/sonarr/sonarr-base.css);
     :root {
       --main-bg-color: radial-gradient(ellipse at center bottom, rgba(232, 11, 11, 0.7) 0%, #08000d 80%, rgba(0,0,0,1) 100%) center center/cover no-repeat fixed,
       url("https://themepark-develop.netlify.app/Resources/reality.jpg") center center/cover no-repeat fixed;
diff --git a/CSS/themes/sonarr/soul.css b/CSS/themes/sonarr/soul.css
index 45f446e5..164260a9 100644
--- a/CSS/themes/sonarr/soul.css
+++ b/CSS/themes/sonarr/soul.css
@@ -11,7 +11,7 @@
 /*			      https://assets.deathbybandaid.net/theme.park			 */
 
 /* SONARR SOUL STONE THEME */
-@import url(https://gilbn.github.io/theme.park/CSS/themes/sonarr/sonarr-base.css);
+@import url(https://assets.deathbybandaid.net/theme.park/CSS//themes/sonarr/sonarr-base.css);
 
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(255, 153, 0, .7) 0%, #3c0015 80%, rgba(0, 0, 0, 1) 100%) center center/cover no-repeat fixed,
@@ -32,4 +32,4 @@
   --accent-color: #f90c;
   --accent-color-hover: #f90c;
   --queue-color: #204c80cc;
-}
\ No newline at end of file
+}
diff --git a/CSS/themes/sonarr/space.css b/CSS/themes/sonarr/space.css
index 039598f0..4ad88c30 100644
--- a/CSS/themes/sonarr/space.css
+++ b/CSS/themes/sonarr/space.css
@@ -11,7 +11,7 @@
 /*			      https://assets.deathbybandaid.net/theme.park			 */
 
 /* SONARR SPACE STONE THEME */
-@import url(https://gilbn.github.io/theme.park/CSS/themes/sonarr/sonarr-base.css);
+@import url(https://assets.deathbybandaid.net/theme.park/CSS//themes/sonarr/sonarr-base.css);
 
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(0, 98, 255, .7) 0%, #020013 80%, rgb(0, 0, 0) 100%) center center/cover no-repeat fixed,
diff --git a/CSS/themes/sonarr/time.css b/CSS/themes/sonarr/time.css
index f65fddb5..165d3b5d 100644
--- a/CSS/themes/sonarr/time.css
+++ b/CSS/themes/sonarr/time.css
@@ -11,7 +11,7 @@
 /*			      https://assets.deathbybandaid.net/theme.park			 */
 
 /* SONARR TIME STONE THEME */
-@import url(https://gilbn.github.io/theme.park/CSS/themes/sonarr/sonarr-base.css);
+@import url(https://assets.deathbybandaid.net/theme.park/CSS//themes/sonarr/sonarr-base.css);
 
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(109, 247, 81, .7) 0%, #00130c 80%, rgb(0, 0, 0) 100%) center center/cover no-repeat fixed,
diff --git a/CSS/themes/xbackbone/hotline.css b/CSS/themes/xbackbone/hotline.css
index cde0368f..e474dd95 100644
--- a/CSS/themes/xbackbone/hotline.css
+++ b/CSS/themes/xbackbone/hotline.css
@@ -12,4 +12,4 @@
 
 /* XBACKBONE HOTLINE THEME */
 @import url(https://assets.deathbybandaid.net/theme.park/CSS/themes/xbackbone/xbackbone-base.css);
-@import url(https://assets.deathbybandaid.net/theme.park/CSS/variables/hotline.css);
\ No newline at end of file
+@import url(https://assets.deathbybandaid.net/theme.park/CSS/variables/hotline.css);
diff --git a/CSS/variables/aquamarine.css b/CSS/variables/aquamarine.css
index 88dd6fe6..6b9184fc 100644
--- a/CSS/variables/aquamarine.css
+++ b/CSS/variables/aquamarine.css
@@ -20,7 +20,7 @@
 
   --text:#ddd;
   --text-hover: #fff;
-  --text-muted: #999;
+  --text-muted: #8dcfc9;
 
   /*Specials*/
   --arr-queue-color: #009688; /* Servarr apps + Bazarr*/
diff --git a/CSS/variables/hotpink.css b/CSS/variables/hotpink.css
index d52be3ee..864dc7f6 100644
--- a/CSS/variables/hotpink.css
+++ b/CSS/variables/hotpink.css
@@ -8,7 +8,7 @@
   --drop-down-menu-bg: #204c80;
 
   --button-color: #fb3f62;
-  --button-color-hover: rgba(251, 63, 98, .8);
+  --button-color-hover: #cd4164;
   --button-text: #eee;
   --button-text-hover: #FFF;
 
diff --git a/CSS/variables/mind.css b/CSS/variables/mind.css
index 6d4fc8ad..2958ef84 100644
--- a/CSS/variables/mind.css
+++ b/CSS/variables/mind.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(255, 242, 0, .7) 0%, #0d0400 80%, rgba(0, 0, 0, 1) 100%) center center/cover no-repeat fixed,
-    url("https://theme-park.dev/Resources/mind.jpg") center center/cover no-repeat fixed;
+    url("https://assets.deathbybandaid.net/theme.park/resources/mind.jpg") center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(51, 49, 0, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(51, 49, 0, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(51, 49, 0, 1) 0%, #000 100%) center center/cover no-repeat fixed;
diff --git a/CSS/variables/nord.css b/CSS/variables/nord.css
index 7fbfea25..2de36393 100644
--- a/CSS/variables/nord.css
+++ b/CSS/variables/nord.css
@@ -8,7 +8,7 @@
   --drop-down-menu-bg: #3B4252;
 
   --button-color: #79b8ca;
-  --button-color-hover: #79b8cacc ;
+  --button-color-hover: #6a9daf;
   --button-text: #2E3440;
   --button-text-hover: #D8DEE9;
 
@@ -25,6 +25,6 @@
   /*Specials*/
   --arr-queue-color: #A3BE8C; /* Servarr apps + Bazarr*/
   --plex-poster-unwatched: #D08770;
-  --petio-spinner: invert(62%) sepia(8%) saturate(998%) hue-rotate(259deg) brightness(97%) contrast(87%); /* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
+  --petio-spinner: invert(83%) sepia(9%) saturate(1787%) hue-rotate(156deg) brightness(85%) contrast(83%); /* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
   --gitea-color-primary-dark-4: 121, 184, 202;
   }
\ No newline at end of file
diff --git a/CSS/variables/organizr.css b/CSS/variables/organizr.css
new file mode 100644
index 00000000..279336e2
--- /dev/null
+++ b/CSS/variables/organizr.css
@@ -0,0 +1,30 @@
+:root {
+  --main-bg-color: #1f1f1f;
+
+  --modal-bg-color: #333;
+  --modal-header-color: #232323;
+  --modal-footer-color: #232323;
+
+  --drop-down-menu-bg: #1b1b1b;
+
+  --button-color: #2cabe3;
+  --button-color-hover: #298fbc;
+  --button-text: #eee;
+  --button-text-hover: #fff;
+
+  --accent-color:  44, 171, 227;
+  --accent-color-hover: rgb(var(--accent-color),.8);
+  --link-color: #2cabe3;
+  --link-color-hover: #3cc5ff;
+  --label-text-color: #fff;
+    
+  --text:#96a2b4;
+  --text-hover: #fff;
+  --text-muted: #999;
+
+  /*Specials*/
+  --arr-queue-color: #2cabe3; /* Servarr apps + Bazarr*/
+  --plex-poster-unwatched: #2cabe3;
+  --petio-spinner: invert(65%) sepia(83%) saturate(2026%) hue-rotate(167deg) brightness(90%) contrast(97%);/* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
+  --gitea-color-primary-dark-4: 44, 171, 227;
+}
\ No newline at end of file
diff --git a/CSS/variables/plex.css b/CSS/variables/plex.css
index a66e4325..ee559a41 100644
--- a/CSS/variables/plex.css
+++ b/CSS/variables/plex.css
@@ -1,8 +1,8 @@
  :root {
-   /* --main-bg-color: url("https://assets.deathbybandaid.net/theme.park/Resources/blur-noise.png"), url("https://assets.deathbybandaid.net/theme.park/Resources/preset-light2.png") center center/cover no-repeat fixed;
-     --modal-bg-color: url("https://assets.deathbybandaid.net/theme.park/Resources/blur-noise.png"), url("https://assets.deathbybandaid.net/theme.park/Resources/preset-dark2.png") center center/cover no-repeat fixed;
+   /* --main-bg-color: url("https://assets.deathbybandaid.net/theme.park/resources/blur-noise.png"), url("https://assets.deathbybandaid.net/theme.park/resources/preset-light2.png") center center/cover no-repeat fixed;
+     --modal-bg-color: url("https://assets.deathbybandaid.net/theme.park/resources/blur-noise.png"), url("https://assets.deathbybandaid.net/theme.park/resources/preset-dark2.png") center center/cover no-repeat fixed;
    */
-   --main-bg-color: url("https://assets.deathbybandaid.net/theme.park/Resources/blur-noise.png") repeat scroll 0% 0%, radial-gradient(circle at 0% 100%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 100% 100%, rgba(113, 135, 153, 0.55) 0%, rgba(113, 135, 153, 0.043) 70%, rgba(113, 135, 153, 0) 80%), radial-gradient(circle at 100% 0%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 0% 0%, rgba(91, 114, 135, 0.55) 0%, rgba(91, 114, 135, 0.043) 70%, rgba(91, 114, 135, 0) 80%), rgb(0, 0, 0) center center/cover no-repeat fixed;
+   --main-bg-color: url("https://assets.deathbybandaid.net/theme.park/resources/blur-noise.png") repeat scroll 0% 0%, radial-gradient(circle at 0% 100%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 100% 100%, rgba(113, 135, 153, 0.55) 0%, rgba(113, 135, 153, 0.043) 70%, rgba(113, 135, 153, 0) 80%), radial-gradient(circle at 100% 0%, rgba(54, 66, 84, 0.55) 0%, rgba(54, 66, 84, 0.043) 70%, rgba(54, 66, 84, 0) 80%), radial-gradient(circle at 0% 0%, rgba(91, 114, 135, 0.55) 0%, rgba(91, 114, 135, 0.043) 70%, rgba(91, 114, 135, 0) 80%), rgb(0, 0, 0) center center/cover no-repeat fixed;
 
    --modal-bg-color: #1f2326;
    --modal-header-color: #1f2326;
diff --git a/CSS/variables/power.css b/CSS/variables/power.css
index ab8fd878..cdb2f12b 100644
--- a/CSS/variables/power.css
+++ b/CSS/variables/power.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(166, 40, 140, .7) 0%, rgba(11,8,51,1) 80%, rgba(0,0,0,1) 100%) center center/cover no-repeat fixed,
-    url("https://theme-park.dev/Resources/power.jpg") center center/cover no-repeat fixed;
+    url("https://assets.deathbybandaid.net/theme.park/resources/power.jpg") center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(35, 0, 57, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(35, 0, 57, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(35, 0, 57, 1) 0%, #000 100%) center center/cover no-repeat fixed;
diff --git a/CSS/variables/reality.css b/CSS/variables/reality.css
index a91e00a9..b365bdb3 100644
--- a/CSS/variables/reality.css
+++ b/CSS/variables/reality.css
@@ -1,6 +1,6 @@
     :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(232, 11, 11, 0.7) 0%, #08000d 80%, rgba(0,0,0,1) 100%) center center/cover no-repeat fixed,
-  url("https://theme-park.dev/Resources/reality.jpg") center center/cover no-repeat fixed;
+  url("https://assets.deathbybandaid.net/theme.park/resources/reality.jpg") center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(102, 5, 5, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(102, 5, 5, 1) 0%, #000 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(102, 5, 5, 1) 0%, #000 100%) center center/cover no-repeat fixed;
diff --git a/CSS/variables/soul.css b/CSS/variables/soul.css
index 2066470c..e64d7bd8 100644
--- a/CSS/variables/soul.css
+++ b/CSS/variables/soul.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(255, 153, 0, .7) 0%, #3c0015 80%, rgba(0, 0, 0, 1) 100%) center center/cover no-repeat fixed,
-    url("https://theme-park.dev/Resources/soul.jpg") center center/cover no-repeat fixed;
+    url("https://assets.deathbybandaid.net/theme.park/resources/soul.jpg") center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(140, 64, 2, 1) 0%, #3c0015 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(140, 64, 2, 1) 0%, #3c0015 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(140, 64, 2, 1) 0%, #3c0015 100%) center center/cover no-repeat fixed;
diff --git a/CSS/variables/space.css b/CSS/variables/space.css
index ad50e45e..45c33c04 100644
--- a/CSS/variables/space.css
+++ b/CSS/variables/space.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(0, 98, 255, .7) 0%, #020013 80%, rgb(0, 0, 0) 100%) center center/cover no-repeat fixed,
-    url("https://theme-park.dev/Resources/space.jpg") center center/cover no-repeat fixed;
+    url("https://assets.deathbybandaid.net/theme.park/resources/space.jpg") center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgb(0, 57, 148) 0%, #10003c 100%) center center/cover no-repeat fixed;
   --modal-headercolor: linear-gradient(180deg, rgb(0, 57, 148) 0%, #10003c 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgb(0, 57, 148) 0%, #10003c 100%) center center/cover no-repeat fixed;
diff --git a/CSS/variables/time.css b/CSS/variables/time.css
index cbbdeb0b..856f6f53 100644
--- a/CSS/variables/time.css
+++ b/CSS/variables/time.css
@@ -1,6 +1,6 @@
 :root {
   --main-bg-color: radial-gradient(ellipse at center bottom, rgba(109, 247, 81, .7) 0%, #00130c 80%, rgb(0, 0, 0) 100%) center center/cover no-repeat fixed,
-    url("https://theme-park.dev/Resources/time.jpg") center center/cover no-repeat fixed;
+    url("https://assets.deathbybandaid.net/theme.park/resources/time.jpg") center center/cover no-repeat fixed;
   --modal-bg-color: linear-gradient(180deg, rgba(2, 77, 0, 1) 0%, #00130c 100%) center center/cover no-repeat fixed;
   --modal-header-color: linear-gradient(180deg, rgba(2, 77, 0, 1) 0%, #00130c 100%) center center/cover no-repeat fixed;
   --modal-footer-color: linear-gradient(180deg, rgba(2, 77, 0, 1) 0%, #00130c 100%) center center/cover no-repeat fixed;
diff --git a/LICENSE b/LICENSE
index ca9c873a..5252fa7b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -19,3 +19,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+ 
diff --git a/README.md b/README.md
index f7765ccb..85cb7a3a 100644
--- a/README.md
+++ b/README.md
@@ -1,240 +1,290 @@
-<img src="/banners/tp_banner.png"/>
+<img src="banners/tp_banner.png"/>
 
 [![Docs](https://img.shields.io/static/v1.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=theme-park.dev&message=Docs)](https://docs.theme-park.dev "Documentation for all the themes in this repository.")
 [![Discord](https://img.shields.io/discord/591352397830553601.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/HM5uUKU "Discord for theme installation support")
 [![GitHub Stars](https://img.shields.io/github/stars/gilbn/theme.park.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://assets.deathbybandaid.net/theme.park)
 [![Support](https://img.shields.io/static/v1.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=&message=sponsor&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABN0lEQVQ4T2NkoBAwIuv/HxDggMT/wLhhwwUQ/39AgAEDA4MATI5xw4YDcDaaAf+R+AcZN2wAG/g/IACkwR7JALjFYAbU5v0k+sYR5BLG/wEBCQwMDAUMDAz6DM3NDAxz5zIwPHhAjFkXGRgYJoAMaGBgYKgH6wgPZ2DYt4+B4fVrYgwAqWlENYBYbQwMDO8+sjH8+cvUSbYB6w9Kv/vwlW0aWYE4Z5MCAwfrf7fYnxN3wwwAxTEorvHGBMjZBy+Ivvv6jSXi20+OU+kMnR/RExIoQEGxIo8eHM/fcDA8fc114/J9/jVJv/prsSYkaJqYwMDAEIBsCMjme894bl6+w7s76e/EXGTDUVwAk0CJWgYGBliAIduM0wVIhoCS8X7kAMMWy1hdAPUKOGCXbJdnhQUYSQYQm6YAtdh8zhSGm1AAAAAASUVORK5CYII=)](https://github.com/sponsors/GilbN "Donate!")
-[![GitHub](https://img.shields.io/github/license/gilbn/theme.park.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://assets.deathbybandaid.net/theme.park/LICENSE)
+[![GitHub](https://img.shields.io/github/license/gilbn/theme.park.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://assets.deathbybandaid.net/theme.park/blob/master/LICENSE)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=theme-park.dev&message=Packages&logo=github)](https://github.com/users/GilbN/packages/container/package/theme.park)
 [![Docker Pulls](https://img.shields.io/docker/pulls/gilbn/theme.park.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/gilbn/theme.park)
 [![Blog](https://img.shields.io/static/v1.svg?color=009688&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=technicalramblings&message=Blog)](https://technicalramblings.com/ "A blog with different guides :)")
 
 <p align="center">A collection of themes/skins for your favorite apps!</p>
 <div align="center">
-    <a href="https://docs.theme-park.dev/site_assets/sonarr/aquamarine.png" rel="noopener"><img src="https://docs.theme-park.dev/site_assets/sonarr/aquamarine.png" alt="Screen Shot 1" width="49.15%" /></a>
-    <a href="https://docs.theme-park.dev/site_assets/radarr/organizr-dark.png" rel="noopener"><img src="https://docs.theme-park.dev/site_assets/radarr/organizr-dark.png" alt="Screen Shot 2" width="49.15%" /></a>
-    <a href="https://docs.theme-park.dev/site_assets/qbittorrent/hotline.png" rel="noopener"><img src="https://docs.theme-park.dev/site_assets/qbittorrent/hotline.png" alt="Screen Shot 3" width="49.15%" /></a>
-    <a href="https://docs.theme-park.dev/site_assets/tautulli/plex.png" rel="noopener"><img src="https://docs.theme-park.dev/site_assets/tautulli/plex.png" alt="Screen Shot 4" width="49.15%" /></a>
+    <a href="https://docs.theme-park.dev/theme-options/aquamarine/" rel="noopener"><img src="https://docs.theme-park.dev/theme-options/screenshots/ombi_aquamarine_small.png" alt="Screen Shot 1" width="49.15%" /></a>
+    <a href="https://docs.theme-park.dev/theme-options/hotpink/" rel="noopener"><img src="https://docs.theme-park.dev/theme-options/screenshots/radarr_hotpink_small.png" alt="Screen Shot 2" width="49.15%" /></a>
+    <a href="https://docs.theme-park.dev/theme-options/overseerr/" rel="noopener"><img src="https://docs.theme-park.dev/theme-options/screenshots/petio_overseerr_small.png" alt="Screen Shot 3" width="49.15%" /></a>
+    <a href="https://docs.theme-park.dev/theme-options/dracula/" rel="noopener"><img src="https://docs.theme-park.dev/theme-options/screenshots/bazarr_dracula_small.png" alt="Screen Shot 4" width="49.15%" /></a>
 </div>
 
 <h1><a href="https://docs.theme-park.dev/themes/">Themes</a></h1>
 
 <p align="center">Click on the banners for screenshots.</p>
 
-<a href="https://docs.theme-park.dev/colors/organizr-dark"><img src="/banners/organizr_dark_banner.png" alt="Organizr-Dark"/></a>
-<a href="https://docs.theme-park.dev/colors/aquamarine"><img src="/banners/aquamarine_banner.png" alt="Aquamarine"/></a>
-<a href="https://docs.theme-park.dev/colors/hotline"><img src="/banners/hotline_banner.png" alt="Hotline"/></a>
-<a href="https://docs.theme-park.dev/colors/space-gray"><img src="/banners/spacegray_banner.png" alt="Space-Gray"/></a>
-<a href="https://docs.theme-park.dev/colors/dark"><img src="/banners/dark_banner.png" alt="Dark"/></a>
-<a href="https://docs.theme-park.dev/colors/plex"><img src="/banners/plex_banner.png" alt="Plex"/></a>
+<a href="https://docs.theme-park.dev/theme-options/dracula"><img src="https://docs.theme-park.dev/theme-options/dracula_banner_small.png" alt="Dracula" width="49.49%"/></a>
+<a href="https://docs.theme-park.dev/theme-options/overseerr"><img src="https://docs.theme-park.dev/theme-options/overseerr_banner_small.png" alt="Overseerr" width="49.49%"/></a>
+<a href="https://docs.theme-park.dev/theme-options/organizr"><img src="https://docs.theme-park.dev/theme-options/organizr_banner_small.png" alt="Organizr"  width="49.49%"/></a>
+<a href="https://docs.theme-park.dev/theme-options/aquamarine"><img src="https://docs.theme-park.dev/theme-options/aquamarine_banner_small.png" alt="Aquamarine"  width="49.49%"/></a>
+<a href="https://docs.theme-park.dev/theme-options/hotline"><img src="https://docs.theme-park.dev/theme-options/hotline_banner_small.png" alt="Hotline"  width="49.49%"/></a>
+<a href="https://docs.theme-park.dev/theme-options/hotpink"><img src="https://docs.theme-park.dev/theme-options/hotpink_banner_small.png" alt="Hotpink"  width="49.49%"/></a>
+<a href="https://docs.theme-park.dev/theme-options/space-gray"><img src="https://docs.theme-park.dev/theme-options/space gray_banner_small.png" alt="Space-Gray"  width="49.49%"/></a>
+<a href="https://docs.theme-park.dev/theme-options/dark"><img src="https://docs.theme-park.dev/theme-options/dark_banner_small.png" alt="Dark"  width="49.49%"/></a>
+<a href="https://docs.theme-park.dev/theme-options/plex"><img src="https://docs.theme-park.dev/theme-options/plex_banner_small.png" alt="Plex"  width="49.49%"/></a>
+<a href="https://docs.theme-park.dev/theme-options/nord"><img src="https://docs.theme-park.dev/theme-options/nord_banner_small.png" alt="Nord"  width="49.49%"/></a>
 
 <h2><a href="https://docs.theme-park.dev/setup">Installation</a></h2>
 
-<h2><a href="https://docs.theme-park.dev/themes/addons/sonarr">Addons</a></h2>
+<h2><a href="https://docs.theme-park.dev/themes/addons">Addons</a></h2>
 
-<h2><a href="https://docs.theme-park.dev/custom/">Adding your own theme colors</a></h2>
+<h2><a href="https://docs.theme-park.dev/community-themes/">Community Themes</a></h2>
+
+<h2><a href="https://docs.theme-park.dev/custom/">Adding your own theme-options</a></h2>
 
 <p align="center">Current themes in the repo</p>
 
 <div align="center">
-<table style="margin-left: auto; margin-right: auto;" cellspacing="10" cellpadding="10">
+<table cellspacing="10" cellpadding="10">
 <tbody>
-<tr style="height: 98px;">
-<td style="width: 110px; height: 98px; text-align: center;">
-<p><a href="https://docs.theme-park.dev/themes/sonarr"><img style="display: block; margin-left: auto; margin-right: auto;" src="https://docs.theme-park.dev/site_assets/sonarr/logo.png" alt="" width="48" height="48" /></a></p>
+<tr>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/sonarr"><img src="https://docs.theme-park.dev/site_assets/sonarr/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/sonarr">Sonarr</a></p>
 </td>
-<td style="width: 160px; height: 98px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/radarr"><img src="https://docs.theme-park.dev/site_assets/radarr/logo.png" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/radarr">Radarr</a></p>
 </td>
-<td style="width: 10px; height: 98px; text-align: center;">
-<p style="text-align: center;"><a href="https://docs.theme-park.dev/themes/lidarr"><img src="https://docs.theme-park.dev/site_assets/lidarr/logo.png" width="48" height="48" /></a></p>
-<p style="text-align: center;"><a href="https://docs.theme-park.dev/themes/lidarr">Lidarr</a></p>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/lidarr"><img src="https://docs.theme-park.dev/site_assets/lidarr/logo.png" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/lidarr">Lidarr</a></p>
 </td>
-<td style="width: 90px; height: 98px; text-align: center;">
-<p><a href="https://docs.theme-park.dev/themes/bazarr"><img src="https://docs.theme-park.dev/site_assets/bazarr/logo.png" alt="" width="48" height="48" /></a></p>
-<p><a href="https://docs.theme-park.dev/themes/bazarr">Bazarr</a></p>
-</td>
-<td style="width: 136px; height: 98px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/readarr"><img src="https://docs.theme-park.dev/site_assets/readarr/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/readarr">Readarr</a></p>
 </td>
-<td style="width: 140px; height: 98px; text-align: center;">
+<td>
+<p><a href="https://docs.theme-park.dev/themes/prowlarr"><img src="https://docs.theme-park.dev/site_assets/prowlarr/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/prowlarr">Prowlarr</a></p>
+</td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/bazarr"><img src="https://docs.theme-park.dev/site_assets/bazarr/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/bazarr">Bazarr</a></p>
+</td>
+<td>
 <p><a href="https://docs.theme-park.dev/themes/plex"><img src="https://docs.theme-park.dev/site_assets/plex/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/plex">Plex</a></p>
 </td>
-<td style="width: 110px; height: 26px; text-align: center;">
-<p><a href="https://docs.theme-park.dev/themes/calibre-Web"><img src="https://docs.theme-park.dev/site_assets/calibreweb/logo.png" alt="" width="48" height="48" /></a></p>
-<p><a href="https://docs.theme-park.dev/themes/calibre-Web">Calibre-web</a></p>
-</td>
 </tr>
-<tr style="height: 26px;">
-<td style="width: 109px; height: 98px; text-align: center;">
+<tr>
+<td>
 <p><a href="https://docs.theme-park.dev/themes/jellyfin"><img src="https://docs.theme-park.dev/site_assets/jellyfin/logo.png" alt="" width="48" height="48" /></a></p>
-<p><a href="https://docs.theme-park.dev/themes/jellyfin">Jellyfin/Emby</a></p>
+<p><a href="https://docs.theme-park.dev/themes/jellyfin">Jellyfin</a></p>
 </td>
-<td style="width: 160px; height: 26px; text-align: center;">
-<p><a href="https://docs.theme-park.dev/themes/tautulli"><img src="https://docs.theme-park.dev/site_assets/tautulli/logo.png" alt="" width="48" height="48" /></a></p>
-<p><a href="https://docs.theme-park.dev/themes/tautulli">Tautulli</a></p>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/emby"><img src="https://docs.theme-park.dev/site_assets/emby/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/emby">Emby</a></p>
 </td>
-<td style="width: 10px; height: 26px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/ombi"><img src="https://docs.theme-park.dev/site_assets/ombi/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/ombi">Ombi</a></p>
 </td>
-<td style="width: 90px; height: 26px; text-align: center;">
-<p><a href="https://docs.theme-park.dev/themes/requestrr"><img src="https://docs.theme-park.dev/site_assets/requestrr/logo.png" alt="" width="48" height="45" /></a></p>
-<p><a href="https://docs.theme-park.dev/themes/requestrr">Requestrr</a></p>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/tautulli"><img src="https://docs.theme-park.dev/site_assets/tautulli/logo.png" alt="" width="48" height="45" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/tautulli">Tautulli</a></p>
 </td>
-<td style="width: 136px; height: 26px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/organizr"><img src="https://docs.theme-park.dev/site_assets/organizr/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/organizr">Organizr</a></p>
 </td>
-<td style="width: 140px; height: 26px; text-align: center;">
-<p><a href="https://docs.theme-park.dev/themes/synclounge"><img src="https://docs.theme-park.dev/site_assets/synclounge/logo.png" alt="" width="48" height="48" /></a></p>
-<p><a href="https://docs.theme-park.dev/themes/synclounge">Synclounge</a></p>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/overseerr"><img src="https://docs.theme-park.dev/site_assets/overseerr/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/overseerr">Overseerr</a></p>
 </td>
-<td style="width: 109px; height: 26px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/deluge"><img src="https://docs.theme-park.dev/site_assets/deluge/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/deluge">Deluge</a></p>
 </td>
 </tr>
-<tr style="height: 73px;">
-<td style="width: 110px; height: 73px; text-align: center;">
+<tr>
+<td>
 <p><a href="https://docs.theme-park.dev/themes/qbittorrent"><img src="https://docs.theme-park.dev/site_assets/qbittorrent/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/qbittorrent">qBittorrent</a></p>
 </td>
-<td style="width: 160px; height: 73px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/rutorrent"><img src="https://docs.theme-park.dev/site_assets/rutorrent/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/rutorrent">ruTorrent</a></p>
 </td>
-<td style="width: 10px; height: 73px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/transmission"><img src="https://docs.theme-park.dev/site_assets/transmission/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/transmission">Transmission</a></p>
 </td>
-<td style="width: 90px; height: 73px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/sabnzbd"><img src="https://docs.theme-park.dev/site_assets/sabnzbd/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/sabnzbd">SABnzbd</a></p>
 </td>
-<td style="width: 136px; height: 73px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/nzbget"><img src="https://docs.theme-park.dev/site_assets/nzbget/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/nzbget">NZBGet</a></p>
 </td>
-<td style="width: 140px; height: 73px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/nzbhydra2"><img src="https://docs.theme-park.dev/site_assets/nzbhydra2/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/nzbhydra2">NZBHydra 2</a></p>
 </td>
-<td style="width: 109px; height: 73px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/jackett"><img src="https://docs.theme-park.dev/site_assets/jackett/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/jackett">Jackett</a></p>
 </td>
 </tr>
-<tr style="height: 56px;">
-<td style="width: 110px; height: 56px; text-align: center;">
-<p><a href="https://docs.theme-park.dev/themes/grafana"><img src="https://docs.theme-park.dev/site_assets/grafana/logo.png" alt="" width="48" height="48" /></a></p>
-<p><a href="https://docs.theme-park.dev/themes/grafana">Grafana</a></p>
-</td>
-<td style="width: 160px; height: 56px; text-align: center;">
+<tr>
+<td>
 <p><a href="https://docs.theme-park.dev/themes/netdata"><img src="https://docs.theme-park.dev/site_assets/netdata/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/netdata">Netdata</a></p>
 </td>
-<td style="width: 10px; height: 56px; text-align: center;">
-<p><a href="https://docs.theme-park.dev/themes/monitorr"><img src="https://docs.theme-park.dev/site_assets/monitorr/logo.png" alt="" width="48" height="48" /></a></p>
-<p><a href="https://docs.theme-park.dev/themes/monitorr">Monitorr</a></p>
-</td>
-<td style="width: 90px; height: 56px; text-align: center;">
-<p><a href="https://docs.theme-park.dev/themes/logarr"><img src="https://docs.theme-park.dev/site_assets/logarr/logo.png" alt="" width="48" height="48" /></a></p>
-<p><a href="https://docs.theme-park.dev/themes/logarr">Logarr</a></p>
-</td>
-<td style="width: 136px; height: 56px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/portainer"><img src="https://docs.theme-park.dev/site_assets/portainer/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/portainer">Portainer</a></p>
 </td>
-<td style="width: 140px; height: 56px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/pihole"><img src="https://docs.theme-park.dev/site_assets/pihole/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/pihole">Pi-hole</a></p>
 </td>
-<td style="width: 109px; height: 56px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/guacamole"><img src="https://docs.theme-park.dev/site_assets/guacamole/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/guacamole">Guacamole</a></p>
 </td>
+</td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/dozzle"><img src="https://docs.theme-park.dev/site_assets/dozzle/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/dozzle">Dozzle</a></p>
+</td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/calibreweb"><img src="https://docs.theme-park.dev/site_assets/calibreweb/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/calibreweb">Calibre-web</a></p>
+</td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/xbackbone"><img src="https://docs.theme-park.dev/site_assets/xbackbone/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/xbackbone">Xbackbone</a></p>
+</td>
 </tr>
-<tr style="height: 40px; text-align: center;">
-<td style="width: 110px; height: 40px; text-align: center;">
+<tr>
+<td>
 <p><a href="https://docs.theme-park.dev/themes/filebrowser"><img src="https://docs.theme-park.dev/site_assets/filebrowser/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/filebrowser">Filebrowser</a></p>
-</td>
-<td style="width: 160px; height: 40px; text-align: center;">
-<p><a href="https://docs.theme-park.dev/themes/plpp"><img src="https://docs.theme-park.dev/site_assets/plpp/logo.png" alt="" width="48" height="48" /></a></p>
-<p><a href="https://docs.theme-park.dev/themes/plpp">PLPP</a></p>
-</td>
-<td style="width: 10px; height: 40px; text-align: center;">
+
+<td>
 <p><a href="https://docs.theme-park.dev/themes/librespeed"><img src="https://docs.theme-park.dev/site_assets/librespeed/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/librespeed">librespeed</a></p>
 </td>
-<td style="width: 90px; height: 40px; text-align: center;">
-<p><a href="https://docs.theme-park.dev/themes/thelounge"><img src="https://docs.theme-park.dev/site_assets/thelounge/logo.png" alt="" width="48" height="48" /></a></p>
-<p><a href="https://docs.theme-park.dev/themes/thelounge">The Lounge</a></p>
-</td>
-<td style="width: 90px; height: 40px; text-align: center;">
+
+<td>
 <p><a href="https://docs.theme-park.dev/themes/lazylibrarian"><img src="https://docs.theme-park.dev/site_assets/lazylibrarian/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/lazylibrarian">Lazylibrarian</a></p>
 </td>
-<td style="width: 90px; height: 40px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/adguard"><img src="https://docs.theme-park.dev/site_assets/adguard/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/adguard">Adguard</a></p>
 </td>
-<td style="width: 90px; height: 40px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/gaps"><img src="https://docs.theme-park.dev/site_assets/gaps/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/gaps">Gaps</a></p>
 </td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/uptime-kuma"><img src="https://docs.theme-park.dev/site_assets/uptime-kuma/logo.png" alt="" width="48" height="45" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/uptime-kuma">Uptime Kuma</a></p>
+</td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/mylar3"><img src="https://docs.theme-park.dev/site_assets/mylar3/logo.png" alt="" width="48" height="45" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/mylar3">Mylar 3</a></p>
+</td>
 </tr>
 <tr>
-<td style="width: 90px; height: 40px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/bitwarden"><img src="https://docs.theme-park.dev/site_assets/bitwarden/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/bitwarden">Bitwarden</a></p>
 </td>
-<td style="width: 90px; height: 40px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/duplicacy"><img src="https://docs.theme-park.dev/site_assets/duplicacy/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/duplicacy">Duplicacy</a></p>
 </td>
-<td style="width: 90px; height: 40px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/kitana"><img src="https://docs.theme-park.dev/site_assets/kitana/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/kitana">Kitana</a></p>
 </td>
-<td style="width: 90px; height: 40px; text-align: center;">
-<p><a href="https://docs.theme-park.dev/themes/webtools"><img src="https://docs.theme-park.dev/site_assets/webtools/logo.png" alt="" width="48" height="48" /></a></p>
-<p><a href="https://docs.theme-park.dev/themes/webtools">Webtools</a></p>
-</td>
-<td style="width: 90px; height: 40px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/resilio-sync"><img src="https://docs.theme-park.dev/site_assets/resilio-sync/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/resilio-sync">Resilio-Sync</a></p>
 </td>
-<td style="width: 90px; height: 40px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/gitea"><img src="https://docs.theme-park.dev/site_assets/gitea/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/gitea">Gitea</a></p>
 </td>
-<td style="width: 90px; height: 40px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/unraid"><img src="https://docs.theme-park.dev/site_assets/unraid/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/unraid">Unraid</a></p>
 </td>
-</tr>
-<tr>
-<td style="width: 90px; height: 40px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/moviematch"><img src="https://docs.theme-park.dev/site_assets/moviematch/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/moviematch">Moviematch</a></p>
 </td>
-<td style="width: 90px; height: 40px; text-align: center;">
+</tr>
+<tr>
+<td>
 <p><a href="https://docs.theme-park.dev/themes/petio"><img src="https://docs.theme-park.dev/site_assets/petio/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/petio">Petio</a></p>
 </td>
-<td style="width: 90px; height: 40px; text-align: center;">
+<td>
 <p><a href="https://docs.theme-park.dev/themes/flood"><img src="https://docs.theme-park.dev/site_assets/flood/logo.png" alt="" width="48" height="48" /></a></p>
 <p><a href="https://docs.theme-park.dev/themes/flood">Flood</a></p>
 </td>
-<td style="width: 90px; height: 40px; text-align: center;">
-<p><a href="https://docs.theme-park.dev/themes/dozzle"><img src="https://docs.theme-park.dev/site_assets/dozzle/logo.png" alt="" width="48" height="48" /></a></p>
-<p><a href="https://docs.theme-park.dev/themes/dozzle">Dozzle</a></p>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/vuetorrent"><img src="https://docs.theme-park.dev/site_assets/vuetorrent/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/vuetorrent">VueTorrent</a></p>
+</td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/requestrr"><img src="https://docs.theme-park.dev/site_assets/requestrr/logo.png" alt="" width="48" height="45" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/requestrr">Requestrr</a></p>
+</td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/duplicati"><img src="https://docs.theme-park.dev/site_assets/duplicati/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/duplicati">Duplicati</a></p>
+</td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/synclounge"><img src="https://docs.theme-park.dev/site_assets/synclounge/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/synclounge">Synclounge</a></p>
+</td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/thelounge"><img src="https://docs.theme-park.dev/site_assets/thelounge/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/thelounge">The Lounge (Deprecated)</a></p>
+</td>
+</tr>
+<tr>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/grafana"><img src="https://docs.theme-park.dev/site_assets/grafana/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/grafana">Grafana (Deprecated)</a></p>
+</td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/monitorr"><img src="https://docs.theme-park.dev/site_assets/monitorr/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/monitorr">Monitorr (Deprecated)</a></p>
+</td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/webtools"><img src="https://docs.theme-park.dev/site_assets/webtools/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/webtools">Webtools (Deprecated)</a></p>
+</td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/logarr"><img src="https://docs.theme-park.dev/site_assets/logarr/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/logarr">Logarr (Deprecated)</a></p>
+</td>
+<td>
+<p><a href="https://docs.theme-park.dev/themes/plpp"><img src="https://docs.theme-park.dev/site_assets/plpp/logo.png" alt="" width="48" height="48" /></a></p>
+<p><a href="https://docs.theme-park.dev/themes/plpp">PLPP (Deprecated)</a></p>
+</td>
+<td>
+<!-- <p><a href=""><img src="" alt="" width="48" height="48" /></a></p>
+<p><a href=""></a></p> -->
+</td>
+<td>
+<!-- <p><a href=""><img src="" alt="" width="48" height="48" /></a></p>
+<p><a href=""></a></p> -->
 </td>
 </tr>
 </tbody>
@@ -243,8 +293,6 @@
 
 <br>
 
-<h3><a href="https://docs.theme-park.dev/custom/">Honourable mentions</a></h3>
+<h3>Honourable mentions</h3>
 
-<p><a href="https://github.com/Archmonger/Blackberry-Themes">Archmonger/Blackberry-Themes</a></p>
-
-<p><a href="https://github.com/leram84/layer.Cake/">leram84/layer.Cake</a></p>
+<p><a href="https://github.com/Archmonger/Blackberry-Themes">Archmonger/Blackberry-Themes</a></p>
\ No newline at end of file
diff --git a/docker-mods/bazarr/Dockerfile b/docker-mods/bazarr/Dockerfile
index adf98959..519bdaaf 100644
--- a/docker-mods/bazarr/Dockerfile
+++ b/docker-mods/bazarr/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN"
 LABEL app="Bazarr"
-#copy local files. 
+#copy local files.
 COPY root/ /
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 65ef2823..8d954e41 100644
--- a/docker-mods/bazarr/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/bazarr/root/etc/cont-init.d/98-themepark
@@ -8,6 +8,7 @@ echo '---------------------------'
 echo -e "Variables set:\\n\
 'TP_DOMAIN'=${TP_DOMAIN}\\n\
 'TP_ADDON'=${TP_ADDON}\\n\
+'TP_COMMUNITY_THEME'=${TP_COMMUNITY_THEME}\\n\
 'TP_THEME'=${TP_THEME}\\n"
 
 APP_FILEPATH='/app/bazarr/bin/frontend/build/index.html'
@@ -22,6 +23,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"
@@ -30,21 +36,21 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}"; then
     echo '---------------------------'
     echo '|  Adding the stylesheet  |'
     echo '---------------------------'
-    sed -i "s/<\/head>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/CSS\/themes\/bazarr\/bazarr-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\/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/Dockerfile b/docker-mods/calibre-web/Dockerfile
index 7eb23cad..0a7e59d9 100644
--- a/docker-mods/calibre-web/Dockerfile
+++ b/docker-mods/calibre-web/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Calibre-Web"
-#copy local files.
+#copy local files. 
 COPY root/ /
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 644fda43..01b64324 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"
@@ -23,17 +29,17 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" /app/calibre-web/cps/templates/layout.html; then
+if ! grep -q "${TP_DOMAIN}/css/base" /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/Dockerfile b/docker-mods/deluge/Dockerfile
index 0660554f..f43312f1 100644
--- a/docker-mods/deluge/Dockerfile
+++ b/docker-mods/deluge/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Deluge"
-#copy local files. 
+#copy local files.
 COPY root/ /
\ No newline at end of file
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 fdfcd212..8ca49502 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"
@@ -23,17 +29,17 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" /usr/lib/python3/dist-packages/deluge/ui/web/index.html; then
+if ! grep -q "${TP_DOMAIN}/css/base" /usr/lib/python3/dist-packages/deluge/ui/web/index.html; then
     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/Dockerfile b/docker-mods/duplicati/Dockerfile
new file mode 100644
index 00000000..2ea95523
--- /dev/null
+++ b/docker-mods/duplicati/Dockerfile
@@ -0,0 +1,7 @@
+FROM scratch
+
+
+LABEL maintainer="GilbN"
+LABEL app="Duplicati"
+#copy local files.
+COPY root/ /
diff --git a/docker-mods/duplicati/root/etc/cont-init.d/98-themepark b/docker-mods/duplicati/root/etc/cont-init.d/98-themepark
new file mode 100644
index 00000000..9a28300e
--- /dev/null
+++ b/docker-mods/duplicati/root/etc/cont-init.d/98-themepark
@@ -0,0 +1,55 @@
+#!/usr/bin/with-contenv bash
+
+echo '----------------------------'
+echo '| Duplicati theme.park Mod |' 
+echo '----------------------------'
+
+APP_FILEPATH='/app/duplicati/webroot'
+
+# Display variables for troubleshooting 
+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
+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"
+    TP_DOMAIN="${TP_DOMAIN}\/theme.park"
+    ;;
+esac
+
+if [[ -z ${TP_THEME} ]]; then
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
+fi
+
+sed_file(){
+	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"
+}
+
+# Adding stylesheets
+echo '---------------------------------------'
+echo '| Adding the stylesheet to html files |'
+echo '---------------------------------------'
+
+if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}/index.html"; then
+    find ${APP_FILEPATH} -type f -iname *.html | while read fname
+	do
+		sed_file $fname
+	done
+fi
diff --git a/docker-mods/emby/Dockerfile b/docker-mods/emby/Dockerfile
index c7ef48c2..daee3dc1 100644
--- a/docker-mods/emby/Dockerfile
+++ b/docker-mods/emby/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Emby"
-#copy local files. 
+#copy local files.
 COPY root/ /
\ No newline at end of file
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 5063f222..ece07fda 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"
@@ -23,17 +29,17 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" /app/emby/dashboard-ui/index.html; then
+if ! grep -q "${TP_DOMAIN}/css/base" /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/Dockerfile b/docker-mods/jackett/Dockerfile
index 6266087b..6cb9150b 100644
--- a/docker-mods/jackett/Dockerfile
+++ b/docker-mods/jackett/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Jackett"
-#copy local files.
+#copy local files. 
 COPY root/ /
\ No newline at end of file
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 707cf4a0..3dd618d4 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"
@@ -29,17 +35,17 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${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/Dockerfile b/docker-mods/jellyfin/Dockerfile
index 4e9e16d2..1abfb02e 100644
--- a/docker-mods/jellyfin/Dockerfile
+++ b/docker-mods/jellyfin/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Jellyfin"
-#copy local files. 
+#copy local files.
 COPY root/ /
\ 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 f8653e22..edfb5e08 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"
@@ -23,17 +29,17 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" /usr/share/jellyfin/web/index.html; then
+if ! grep -q "${TP_DOMAIN}/css/base" /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/Dockerfile b/docker-mods/lazylibrarian/Dockerfile
index 279c50e6..9ffea13d 100644
--- a/docker-mods/lazylibrarian/Dockerfile
+++ b/docker-mods/lazylibrarian/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Lazylibrarian"
-#copy local files. 
+#copy local files.
 COPY root/ /
\ 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 5270d780..5959143b 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"
@@ -23,17 +29,17 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" /app/lazylibrarian/data/interfaces/bookstrap/base.html; then
+if ! grep -q "${TP_DOMAIN}/css/base" /app/lazylibrarian/data/interfaces/bookstrap/base.html; then
     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/Dockerfile b/docker-mods/librespeed/Dockerfile
index 71ad6955..7a6c3c55 100644
--- a/docker-mods/librespeed/Dockerfile
+++ b/docker-mods/librespeed/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Librespeed"
-#copy local files. 
+#copy local files.  
 COPY root/ /
\ 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 d10b338a..1dff5682 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"
@@ -23,17 +29,17 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" /usr/share/webapps/librespeed/index.html; then
+if ! grep -q "${TP_DOMAIN}/css/base" /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/Dockerfile b/docker-mods/lidarr/Dockerfile
index ba048736..85e78850 100644
--- a/docker-mods/lidarr/Dockerfile
+++ b/docker-mods/lidarr/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Lidarr"
-#copy local files. 
+#copy local files.
 COPY root/ /
\ 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 844252a5..d135e134 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"
@@ -32,24 +38,24 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${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/Dockerfile b/docker-mods/mylar3/Dockerfile
new file mode 100644
index 00000000..25bd7925
--- /dev/null
+++ b/docker-mods/mylar3/Dockerfile
@@ -0,0 +1,7 @@
+FROM scratch
+
+
+LABEL maintainer="GilbN"
+LABEL app="Mylar3"
+#copy local files.
+COPY root/ /
\ No newline at end of file
diff --git a/docker-mods/mylar3/root/etc/cont-init.d/98-themepark b/docker-mods/mylar3/root/etc/cont-init.d/98-themepark
new file mode 100644
index 00000000..b737f741
--- /dev/null
+++ b/docker-mods/mylar3/root/etc/cont-init.d/98-themepark
@@ -0,0 +1,60 @@
+#!/usr/bin/with-contenv bash
+
+echo '-------------------------'
+echo '| Mylar3 theme.park Mod |' 
+echo '-------------------------'
+
+APP_FILEPATH='/app/mylar3/data/interfaces/default'
+if [ "${TP_HOTIO}" = true ]; then
+    echo 'Changing to Hotio file path!'
+    APP_FILEPATH='/app/data/interfaces/default'
+fi
+
+# Display variables for troubleshooting 
+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
+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"
+    TP_DOMAIN="${TP_DOMAIN}\/theme.park"
+    ;;
+esac
+
+if [[ -z ${TP_THEME} ]]; then
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
+fi
+
+sed_file(){
+	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"
+}
+
+# Adding stylesheets
+echo '---------------------------------------'
+echo '| Adding the stylesheet to html files |'
+echo '---------------------------------------'
+
+if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}/index.html"; then
+    find ${APP_FILEPATH} -type f -iname *.html | while read fname
+	do
+		sed_file $fname
+	done
+fi
diff --git a/docker-mods/nzbget/Dockerfile b/docker-mods/nzbget/Dockerfile
index dbfbcb47..398c5020 100644
--- a/docker-mods/nzbget/Dockerfile
+++ b/docker-mods/nzbget/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="NZBGet"
-#copy local files. 
+#copy local files.
 COPY root/ /
\ No newline at end of file
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 dc264e44..11627c1b 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"
@@ -28,16 +34,16 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${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/Dockerfile b/docker-mods/plex/Dockerfile
index 8f787f32..98607f37 100644
--- a/docker-mods/plex/Dockerfile
+++ b/docker-mods/plex/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Plex" 
-#copy local files. 
+#copy local files.
 COPY root/ /
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 81e36fd8..f6c4449f 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"
@@ -29,21 +35,21 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets     
-if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${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/Dockerfile b/docker-mods/prowlarr/Dockerfile
index a66c908c..e95447cb 100644
--- a/docker-mods/prowlarr/Dockerfile
+++ b/docker-mods/prowlarr/Dockerfile
@@ -3,5 +3,5 @@ FROM scratch
  LABEL maintainer="GilbN" 
  LABEL app="Prowlarr"
 
-#copy local files.
+#copy local files. 
 COPY root/ /
\ No newline at end of file
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 f44552d2..6ebe7163 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"
@@ -32,24 +38,24 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${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/Dockerfile b/docker-mods/qbittorrent/Dockerfile
index e65aa179..4c3ca04c 100644
--- a/docker-mods/qbittorrent/Dockerfile
+++ b/docker-mods/qbittorrent/Dockerfile
@@ -3,5 +3,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Qbittorrent"
-#copy local files. 
+#copy local files.
 COPY root/ /
\ No newline at end of file
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 48c342bd..99dd3caa 100644
--- a/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
+++ b/docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark
@@ -27,8 +27,13 @@ if ! [[ -x "$(command -v svn)" ]]; then
 echo '--------------------------'
 echo '| Installing svn package |'
 echo '--------------------------'
- apt-get update && \
- apt-get install -y subversion
+    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 
@@ -37,6 +42,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 +51,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"
@@ -53,8 +64,8 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Downloading fresh webui files from source.
@@ -74,8 +85,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/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/base\/qbittorrent\/qbittorrent-base.css'><\/body> /g" $1
+    sed -i "s/<\/body>/<link rel='stylesheet' href='https:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/body> /g" $1
 	printf 'Stylesheet set to %s on %s\n\n' "${TP_THEME}" "$1"
 }
 
@@ -83,11 +94,11 @@ sed_file(){
 echo '---------------------------------------'
 echo '| Adding the stylesheet to html files |'
 echo '---------------------------------------'
-if ! grep -q "${TP_DOMAIN}" /themepark/public/index.html; then
+if ! grep -q "${TP_DOMAIN}/css/base" /themepark/public/index.html; then
     sed_file /themepark/public/index.html
 fi
 
-if ! grep -q "${TP_DOMAIN}" /themepark/private/index.html; then
+if ! grep -q "${TP_DOMAIN}/css/base" /themepark/private/index.html; then
     find ./themepark/private -type f -iname *.html | while read fname
 	do
 		sed_file $fname
diff --git a/docker-mods/radarr/Dockerfile b/docker-mods/radarr/Dockerfile
index 0d568ce8..4cf8f536 100644
--- a/docker-mods/radarr/Dockerfile
+++ b/docker-mods/radarr/Dockerfile
@@ -3,5 +3,5 @@ FROM scratch
  LABEL maintainer="GilbN" 
  LABEL app="Radarr"
 
-#copy local files. 
+#copy local files.
 COPY root/ /
\ No newline at end of file
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 5982b13b..e35a34f8 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"
@@ -32,24 +38,24 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${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/Dockerfile b/docker-mods/readarr/Dockerfile
index 2d17371a..da2c273f 100644
--- a/docker-mods/readarr/Dockerfile
+++ b/docker-mods/readarr/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
  LABEL maintainer="GilbN" 
  LABEL app="Readarr"
-#copy local files. 
+#copy local files.
 COPY root/ /
\ No newline at end of file
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 8e6bd988..8b2ae8c2 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"
@@ -32,24 +38,24 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${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/Dockerfile b/docker-mods/rutorrent/Dockerfile
index 7c8cad78..fb7ecba0 100644
--- a/docker-mods/rutorrent/Dockerfile
+++ b/docker-mods/rutorrent/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Rutorrent"
-#copy local files.
+#copy local files. 
 COPY root/ /
\ No newline at end of file
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 0567c07a..9cd87d4d 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"
@@ -23,17 +29,17 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" /app/rutorrent/index.html; then
+if ! grep -q "${TP_DOMAIN}/css/base" /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/Dockerfile b/docker-mods/sabnzbd/Dockerfile
index 2db1860c..d17e97c7 100644
--- a/docker-mods/sabnzbd/Dockerfile
+++ b/docker-mods/sabnzbd/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="SABnzbd"
-#copy local files.
+#copy local files. 
 COPY root/ /
\ 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 61871d9b..6e16bb53 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"
@@ -29,22 +35,22 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}/interfaces/Glitter/templates/main.tmpl"; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${APP_FILEPATH}/interfaces/Glitter/templates/main.tmpl"; then
     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/Dockerfile b/docker-mods/sonarr/Dockerfile
index a3547724..77b59e36 100644
--- a/docker-mods/sonarr/Dockerfile
+++ b/docker-mods/sonarr/Dockerfile
@@ -3,5 +3,5 @@ FROM scratch
 LABEL maintainer="GilbN" 
 LABEL app="Sonarr"
 
-#copy local files. 
+#copy local files.
 COPY root/ /
\ 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 59de70a9..d11aa64e 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"
@@ -32,24 +38,24 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${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/Dockerfile b/docker-mods/synclounge/Dockerfile
index dc7ed341..8bc9733f 100644
--- a/docker-mods/synclounge/Dockerfile
+++ b/docker-mods/synclounge/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Synclounge"
-#copy local files.
+#copy local files. 
 COPY root/ /
\ No newline at end of file
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 e373ebc0..f3ea1e80 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"
@@ -23,17 +29,17 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" /usr/lib/node_modules/synclounge/dist/index.html; then
+if ! grep -q "${TP_DOMAIN}/css/base" /usr/lib/node_modules/synclounge/dist/index.html; then
     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/Dockerfile b/docker-mods/tautulli/Dockerfile
index d6d6f560..36910ca5 100644
--- a/docker-mods/tautulli/Dockerfile
+++ b/docker-mods/tautulli/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Tautulli"
-#copy local files.
+#copy local files. 
 COPY root/ /
\ 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 be378f8e..58a7fdfa 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"
@@ -29,16 +35,16 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" "${APP_FILEPATH}"; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${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/Dockerfile b/docker-mods/thelounge/Dockerfile
index c112091b..0dd3aaa4 100644
--- a/docker-mods/thelounge/Dockerfile
+++ b/docker-mods/thelounge/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="The Lounge"
-#copy local files.
+#copy local files.  
 COPY root/ /
\ 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 aeaf101d..c7b85b00 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"
@@ -23,17 +29,17 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" /usr/lib/node_modules/thelounge/client/index.html.tpl; then
+if ! grep -q "${TP_DOMAIN}/css/base" /usr/lib/node_modules/thelounge/client/index.html.tpl; then
     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/Dockerfile b/docker-mods/transmission/Dockerfile
index 175cc581..6c5dea86 100644
--- a/docker-mods/transmission/Dockerfile
+++ b/docker-mods/transmission/Dockerfile
@@ -2,5 +2,5 @@ FROM scratch
 
 LABEL maintainer="GilbN" 
 LABEL app="Transmission"
-#copy local files.
+#copy local files. 
 COPY root/ /
\ 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 2ec8b98a..2dfab788 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"
@@ -23,17 +29,17 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" /usr/share/transmission/web/index.html; then
+if ! grep -q "${TP_DOMAIN}/css/base" /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/Dockerfile b/docker-mods/vuetorrent/Dockerfile
index 32b48e23..7ec0721b 100644
--- a/docker-mods/vuetorrent/Dockerfile
+++ b/docker-mods/vuetorrent/Dockerfile
@@ -1,7 +1,7 @@
 FROM scratch
 
 
-LABEL maintainer="GilbN" 
+LABEL maintainer="GilbN"
 LABEL app="VueTorrent"
-#copy local files. 
-COPY root/ /
\ No newline at end of file
+#copy local files.
+COPY root/ /
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 8ca812cd..28f360a3 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"
@@ -39,8 +45,8 @@ case ${TP_DOMAIN} in
 esac
 
 if [[ -z ${TP_THEME} ]]; then
-    echo 'No theme set, defaulting to organizr-dark'
-    TP_THEME='organizr-dark'
+    echo 'No theme set, defaulting to organizr'
+    TP_THEME='organizr'
 fi
 RELEASE_FILEPATH='/vuetorrent/release.json'
 NEEDS_UPDATE=false
@@ -52,8 +58,13 @@ install_deps() {
         echo '-------------------------'
         echo '| Installing jq package |'
         echo '-------------------------'
-        apt-get update &&
-            apt-get install -y jq
+        if [ -x "$(command -v apk)" ]; then 
+          apk update && \
+          apk add --no-cache jq
+        elif [ -x "$(command -v apt-get)" ]; then
+          apt-get update && \
+          apt-get install -y jq
+        fi
     fi
 }
 check_updates() {
@@ -123,11 +134,11 @@ if [[ -z ${TP_HOTIO} ]]; then
 fi
 
 # Adding stylesheets
-if ! grep -q "${TP_DOMAIN}" "${INDEX_FILEPATH}"; then
+if ! grep -q "${TP_DOMAIN}/css/base" "${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
diff --git a/index.html b/index.html
index 38dab22e..9a5b009b 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
     <meta name="author" content="" />
     <title>theme.park</title>
     <!-- Favicon-->
-    <link rel="icon" type="image/x-icon" href="Resources/landing-page/assets/favicon.ico" />
+    <link rel="icon" type="image/x-icon" href="resources/landing-page/assets/favicon.ico" />
     <!-- Font Awesome icons (free version)-->
     <script src="https://use.fontawesome.com/releases/v5.15.3/js/all.js" crossorigin="anonymous"></script>
     <!-- Google fonts-->
@@ -19,9 +19,9 @@
     <link href="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/magnific-popup.min.css"
         rel="stylesheet" />
     <!-- Core theme CSS (includes Bootstrap)-->
-    <link href="Resources/landing-page/css/styles.css?v=1.1" rel="stylesheet" />
-    <link rel="stylesheet" href="Resources/landing-page/css/jquery-bg-slideshow.css">
-    <link rel="stylesheet" href="Resources/landing-page/css/custom.css?v=1.9">
+    <link href="resources/landing-page/css/styles.css?v=1.1" rel="stylesheet" />
+    <link rel="stylesheet" href="resources/landing-page/css/jquery-bg-slideshow.css">
+    <link rel="stylesheet" href="resources/landing-page/css/custom.css?v=2.4">
 </head>
 
 <body id="page-top">
@@ -29,7 +29,7 @@
     <nav class="navbar navbar-expand-lg navbar-light fixed-top py-3" id="mainNav">
         <div class="container">
             <a class="navbar-brand js-scroll-trigger" href="#page-top"><img class="branding"
-                    src="Resources/landing-page/assets/img/themepark-logo.png" alt=""></a>
+                    src="resources/landing-page/assets/img/themepark-logo.png" alt=""></a>
             <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
                 data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false"
                 aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
@@ -59,8 +59,8 @@
     <!-- Masthead-->
     <!--  -->
     <header class="masthead bg" data-current="0"
-        data-images="Resources/landing-page/assets/img/slides/1.jpg,Resources/landing-page/assets/img/slides/2.jpg,Resources/landing-page/assets/img/slides/3.jpg,Resources/landing-page/assets/img/slides/4.jpg,Resources/landing-page/assets/img/slides/5.jpg,Resources/landing-page/assets/img/slides/6.jpg,Resources/landing-page/assets/img/slides/7.jpg,
-        Resources/landing-page/assets/img/slides/8.jpg,Resources/landing-page/assets/img/slides/9.jpg,Resources/landing-page/assets/img/slides/10.jpg,Resources/landing-page/assets/img/slides/11.jpg,Resources/landing-page/assets/img/slides/12.jpg,Resources/landing-page/assets/img/slides/13.jpg"
+        data-images="resources/landing-page/assets/img/slides/1.jpg,resources/landing-page/assets/img/slides/2.jpg,resources/landing-page/assets/img/slides/3.jpg,resources/landing-page/assets/img/slides/4.jpg,resources/landing-page/assets/img/slides/5.jpg,resources/landing-page/assets/img/slides/6.jpg,resources/landing-page/assets/img/slides/7.jpg,
+        resources/landing-page/assets/img/slides/8.jpg,resources/landing-page/assets/img/slides/9.jpg,resources/landing-page/assets/img/slides/10.jpg,resources/landing-page/assets/img/slides/11.jpg,resources/landing-page/assets/img/slides/12.jpg,resources/landing-page/assets/img/slides/13.jpg"
         data-transitionDelay="1000" data-transitionSpeed="2000" data-transitionEffect="fade-in" data-randomize="false"
         data-initialBackground="4" data-debug="false" data-slidecontrols.enabled="false"
         data-gradient="linear-gradient(0deg, rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0.5) 50%)">
@@ -71,9 +71,7 @@
                     <hr class="divider my-4" />
                 </div>
                 <div class="col-lg-8 align-self-baseline">
-                    <p class="text-white-75 font-weight-light mb-5">A collection of themes/skins for over 40 selfhosted
-                        apps!
-                    </p>
+                    <p id="tag-line" class="text-white-75 font-weight-light mb-5">...</p>
                     <a class="btn btn-primary btn-xl js-scroll-trigger" href="#about">Find Out More</a>
                 </div>
             </div>
@@ -84,298 +82,23 @@
         <div class="container">
             <div class="row justify-content-center">
                 <div class="col-lg-8 text-center">
-                    <h2 class="text-white mt-0">Over 40 themed applications!</h2>
+                    <h2 id="theme-header-text" class="text-white mt-0">...</h2>
                     <hr class="divider light my-4" />
-                    <p class="text-white-50 mb-1">theme.park contains 45 themed applications, with css <a
-                            href="https://docs.theme-park.dev/themes/addons/sonarr/">addons</a> on certain themes. </p>
+                    <p class="text-white-50 mb-1" id=app-count>...</p>
                     <p class="text-white-50 mb-1">Installation methods include custom <a
                             href="https://blog.linuxserver.io/2019/09/14/customizing-our-containers/">docker mods</a>
                         for <a href="https://linuxserver.io">linuxserver.io</a> containers, </p>
                     <p class="text-white-50 mb-5">custom scripts for select <a href="https://hotio.dev/">Hotio</a>
                         containers
                         and multiple examples of subfiltering using webservers like Nginx and Apache</p>
-                    <p class="text-white-50 mb-5">Choose between <a class="js-scroll-trigger" href="#themes">9 different
-                            styles!</a> With the possibility to easily create your own themes using the defined <a
-                            href="https://docs.theme-park.dev/custom/">variables</a>. </p>
+                    <p class="text-white-50 mb-5" id="theme-count">... </p>
                     <a class="btn btn-primary btn-xl js-scroll-trigger" href="#services">Get Started!</a>
                 </div>
 
             </div>
         </div>
         <div class="col justify-content-center pt-5 all-apps container">
-            <div class="row justify-content-center">
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/sonarr">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/sonarr/logo.png" />
-                    </p>
-                    <p>Sonarr</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/radarr">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/radarr/logo.png" />
-                    </p>
-                    <p>Radarr</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/lidarr">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/lidarr/logo.png" />
-                    </p>
-                    <p>Lidarr</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/readarr">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/readarr/logo.png" /></p>
-                    <p>Readarr</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/prowlarr">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/prowlarr/logo.png" />
-                    </p>
-                    <p>Prowlarr</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/bazarr">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/bazarr/logo.png" />
-                    </p>
-                    <p>Bazarr</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/plex">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/plex/logo.png" />
-                    </p>
-                    <p>Plex</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/synclounge">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/synclounge/logo.png" />
-                    </p>
-                    <p>Synclounge</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/calibreweb">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/calibreweb/logo.png" /></p>
-                    <p>Calibre-Web</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/jellyfin">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/jellyfin/logo.png" /></p>
-                    <p>Jellyfin</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/emby">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/emby/logo.png" />
-                    </p>
-                    <p>Emby</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/tautulli">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/tautulli/logo.png" /></p>
-                    <p>Tautulli</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/ombi">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/ombi/logo.png" />
-                    </p>
-                    <p>Ombi</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/requestrr">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/requestrr/logo.png" /></p>
-                    <p>Requestrr</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/organizr">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/organizr/logo.png" /></p>
-                    <p>Organizr</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/deluge">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/deluge/logo.png" />
-                    </p>
-                    <p>deluge</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/qbittorrent">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/qbittorrent/logo.png" /></p>
-                    <p>qBittorrent</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/rutorrent">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/rutorrent/logo.png" /></p>
-                    <p>ruTorrent</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/transmission">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/transmission/logo.png" /></p>
-                    <p>Transmission</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/sabnzbd">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/sabnzbd/logo.png" /></p>
-                    <p>SABnzbd</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/nzbget">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/nzbget/logo.png" />
-                    </p>
-                    <p>NZBGet</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/nzbhydra2">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/nzbhydra2/logo.png" />
-                    </p>
-                    <p>NZBHydra 2</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/jackett">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/jackett/logo.png" />
-                    </p>
-                    <p>Jackett</p>
-                </a>
-                <!-- <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/grafana">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/grafana/logo.png" /></p>
-                    <p>Grafana</p>
-                </a> -->
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/netdata">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/netdata/logo.png" /></p>
-                    <p>Netdata</p>
-                </a>
-                <!-- <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/monitorr">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/monitorr/logo.png" /></p>
-                    <p>Monitorr</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/logarr">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/logarr/logo.png" />
-                    </p>
-                    <p>Logarr</p>
-                </a> -->
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/portainer">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/portainer/logo.png" /></p>
-                    <p>Portainer</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/pihole">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/pihole/logo.png" />
-                    </p>
-                    <p>Pi-hole</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/guacamole">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/guacamole/logo.png" /></p>
-                    <p>Guacamole</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/filebrowser">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/filebrowser/logo.png" /></p>
-                    <p>Filebrowser</p>
-                </a>
-                <!-- <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/plpp">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/plpp/logo.png" />
-                    </p>
-                    <p>PLPP</p>
-                </a> -->
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/librespeed">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/librespeed/logo.png" /></p>
-                    <p>Librespeed</p>
-                </a>
-                <!-- <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/thelounge">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/thelounge/logo.png" /></p>
-                    <p>The Lounge</p>
-                </a> -->
-                <a class="col app-container text-center p-2 m-1"
-                    href="https://docs.theme-park.dev/themes/lazylibrarian">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/lazylibrarian/logo.png" /></p>
-                    <p>Lazylibrarian</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/adguard">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/adguard/logo.png" /></p>
-                    <p>Adguard</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/gaps">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/gaps/logo.png" />
-                    </p>
-                    <p>Gaps</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/bitwarden">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/bitwarden/logo.png" /></p>
-                    <p>Bitwarden</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/duplicacy">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/duplicacy/logo.png" /></p>
-                    <p>Duplicacy</p>
-                </a>
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/kitana">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/kitana/logo.png" />
-                    </p>
-                    <p>Kitana</p>
-                </a>
-                <!-- <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/webtools">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/webtools/logo.png" /></p>
-                    <p>Webtools</p>
-                </a> -->
-                <a class="col app-container text-center p-2 m-1" href="https://docs.theme-park.dev/themes/resilio-sync">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/resilio-sync/logo.png" /></p>
-                    <p>Resilio-Sync</p>
-                </a>
-                <a class="col align-self-center app-container text-center p-2 m-1"
-                    href="https://docs.theme-park.dev/themes/gitea">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/gitea/logo.png" />
-                    </p>
-                    <p>Gitea</p>
-                </a>
-                <a class="col align-self-center app-container text-center p-2 m-1"
-                    href="https://docs.theme-park.dev/themes/unraid">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/unraid/logo.png" />
-                    </p>
-                    <p>Unraid</p>
-                </a>
-                <a class="col align-self-center app-container text-center p-2 m-1"
-                    href="https://docs.theme-park.dev/themes/moviematch">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/moviematch/logo.png" /></p>
-                    <p>Moviematch</p>
-                </a>
-                <a class="col align-self-center app-container text-center p-2 m-1"
-                    href="https://docs.theme-park.dev/themes/petio">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/petio/logo.png" />
-                    </p>
-                    <p>Petio</p>
-                </a>
-                <a class="col align-self-center app-container text-center p-2 m-1"
-                    href="https://docs.theme-park.dev/themes/flood">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/flood/logo.png" />
-                    </p>
-                    <p>Flood</p>
-                </a>
-                <a class="col align-self-center app-container text-center p-2 m-1"
-                    href="https://docs.theme-park.dev/themes/vuetorrent">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/vuetorrent/logo.png" />
-                    </p>
-                    <p>VueTorrent</p>
-                </a>
-                <a class="col align-self-center app-container text-center p-2 m-1"
-                    href="https://docs.theme-park.dev/themes/dozzle">
-                    <p><img class="app-container-image" src="https://docs.theme-park.dev/site_assets/dozzle/logo.png" />
-                    </p>
-                    <p>Dozzle</p>
-                </a>
-                <a class="col align-self-center app-container text-center p-2 m-1"
-                    href="https://docs.theme-park.dev/themes/xbackbone">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/xbackbone/logo.png" />
-                    </p>
-                    <p>Xbackbone</p>
-                </a>
-                <a class="col align-self-center app-container text-center p-2 m-1"
-                    href="https://docs.theme-park.dev/themes/uptime-kuma">
-                    <p><img class="app-container-image"
-                            src="https://docs.theme-park.dev/site_assets/uptime-kuma/logo.png" />
-                    </p>
-                    <p>Uptime Kuma</p>
-                </a>
+            <div id="all-apps" class="row justify-content-center">
             </div>
         </div>
     </section>
@@ -428,97 +151,29 @@
         </div>
     </section>
     <!-- Portfolio-->
+    <section class="page-section pt-0">
+    <div class="container pb-3">
+        <div class="row h-100 align-items-center justify-content-center text-center">
+            <div class="col-lg-10 align-self-end">
+            </div>
+            <div class="col-lg-8 align-self-baseline">
+                <button id="switch-theme" class="btn btn-primary btn-xl click-me-btn">Click Me!</button>
+            </div>
+        </div>
+    </div>
+</section>
     <section class="page-section pb-1" id="themes">
         <div class="container">
-            <h2 class="text-center mt-0">Available theme options</h2>
+            <h2 class="text-center mt-0">Official theme options</h2>
+            <h6 class="text-center mt-0">Click here for the <a href="https://docs.theme-park.dev/community-themes/">community themes</a></h6>
+            
+
             <hr class="divider my-4" />
         </div>
     </section>
     <div id="portfolio" class="theme-overview">
         <div class="container-fluid p-0">
-            <div class="row no-gutters d-flex justify-content-center">
-                <div class="col-lg-4 col-sm-6 p-1">
-                    <a class="portfolio-box" href="Resources/landing-page/assets/img/hotpink.png">
-                        <img class="img-fluid" src="Resources/landing-page/assets/img/hotpink-small.jpg" alt="..." />
-                        <div class="portfolio-box-caption p-3 hotpink-hover">
-                            <div class="project-category text-white-50">Theme</div>
-                            <div class="project-name">Hotpink</div>
-                        </div>
-                    </a>
-                </div>
-                <div class="col-lg-4 col-sm-6 p-1">
-                    <a class="portfolio-box" href="Resources/landing-page/assets/img/dracula.png">
-                        <img class="img-fluid" src="Resources/landing-page/assets/img/dracula-small.jpg" alt="..." />
-                        <div class="portfolio-box-caption p-3 dracula-hover">
-                            <div class="project-category text-white-50">Theme</div>
-                            <div class="project-name">Dracula</div>
-                        </div>
-                    </a>
-                </div>
-                <div class="col-lg-4 col-sm-6 p-1">
-                    <a class="portfolio-box" href="Resources/landing-page/assets/img/overseer.png">
-                        <img class="img-fluid" src="Resources/landing-page/assets/img/overseer-small.jpg" alt="..." />
-                        <div class="portfolio-box-caption p-3 overseer-hover">
-                            <div class="project-category text-white-50">Theme</div>
-                            <div class="project-name">Overseer</div>
-                        </div>
-                    </a>
-                </div>
-                <div class="col-lg-4 col-sm-6 p-1">
-                    <a class="portfolio-box" href="Resources/landing-page/assets/img/aquamarine.png">
-                        <img class="img-fluid" src="Resources/landing-page/assets/img/aquamarine-small.jpg" alt="..." />
-                        <div class="portfolio-box-caption aquamarine-hover">
-                            <div class="project-category text-white-50">Theme</div>
-                            <div class="project-name">Aquamarine</div>
-                        </div>
-                    </a>
-                </div>
-                <div class="col-lg-4 col-sm-6 p-1">
-                    <a class="portfolio-box" href="Resources/landing-page/assets/img/hotline.png">
-                        <img class="img-fluid" src="Resources/landing-page/assets/img/hotline-small.jpg" alt="..." />
-                        <div class="portfolio-box-caption hotline-hover">
-                            <div class="project-category text-white-50">Theme</div>
-                            <div class="project-name">Hotline</div>
-                        </div>
-                    </a>
-                </div>
-                <div class="col-lg-4 col-sm-6 p-1">
-                    <a class="portfolio-box" href="Resources/landing-page/assets/img/space-gray.png">
-                        <img class="img-fluid" src="Resources/landing-page/assets/img/space-gray-small.jpg" alt="..." />
-                        <div class="portfolio-box-caption space-gray-hover">
-                            <div class="project-category text-white-50">Theme</div>
-                            <div class="project-name">Space Gray</div>
-                        </div>
-                    </a>
-                </div>
-                <div class="col-lg-4 col-sm-6 p-1">
-                    <a class="portfolio-box" href="Resources/landing-page/assets/img/organizr-dark.png">
-                        <img class="img-fluid" src="Resources/landing-page/assets/img/organizr-dark-small.jpg"
-                            alt="..." />
-                        <div class="portfolio-box-caption organizr-dark-hover">
-                            <div class="project-category text-white-50">Theme</div>
-                            <div class="project-name">Organizr Dark</div>
-                        </div>
-                    </a>
-                </div>
-                <div class="col-lg-4 col-sm-6 p-1">
-                    <a class="portfolio-box" href="Resources/landing-page/assets/img/dark.png">
-                        <img class="img-fluid" src="Resources/landing-page/assets/img/dark-small.jpg" alt="..." />
-                        <div class="portfolio-box-caption dark-hover">
-                            <div class="project-category text-white-50">Theme</div>
-                            <div class="project-name">Dark</div>
-                        </div>
-                    </a>
-                </div>
-                <div class="col-lg-4 col-sm-6 p-1">
-                    <a class="portfolio-box" href="Resources/landing-page/assets/img/plex.png">
-                        <img class="img-fluid" src="Resources/landing-page/assets/img/plex-small.jpg" alt="..." />
-                        <div class="portfolio-box-caption p-3 plex-hover">
-                            <div class="project-category text-white-50">Theme</div>
-                            <div class="project-name">Plex</div>
-                        </div>
-                    </a>
-                </div>
+            <div class="row no-gutters d-flex justify-content-center" id="all-themes">
             </div>
         </div>
     </div>
@@ -543,8 +198,8 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/animejs/3.2.1/anime.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/jquery.magnific-popup.min.js"></script>
     <!-- Core theme JS-->
-    <script src="Resources/landing-page/js/scripts.js?v=1.1"></script>
-    <script src="Resources/landing-page/js/jquery-bg-slideshow.js?v=1"></script>
+    <script src="resources/landing-page/js/scripts.js?v=1.6"></script>
+    <script src="resources/landing-page/js/jquery-bg-slideshow.js?v=1"></script>
     <script type="text/javascript">
         $(function () {
             $(".bg").bgSlideShow();
@@ -553,4 +208,4 @@
     <script async defer src="https://buttons.github.io/buttons.js"></script>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/themes.py b/themes.py
index 32d4a207..4b369a2e 100644
--- a/themes.py
+++ b/themes.py
@@ -1,27 +1,27 @@
 from os import listdir
 from os.path import isdir, isfile, join
-from json import dump, dumps, loads
+from json import dump, dumps, loads, load
 import subprocess
-
+import shutil
 
 def get_shas(output):
     """Returns a dict of CSS files and SHAs"""
     output_lines = output.splitlines()
     sha_dict = {}
     for line in output_lines:
-        line = line.decode('utf-8').replace("\t", "").split(" ")
+        line = line.decode('utf-8').replace("0\t", "").split(" ")
         sha = line[1]
-        css_file = [file for file in line[2].split("/") if "css" in file][0]
+        css_file = [file for file in line[2].split("/") if "css" in file][-1]
         sha_dict.update({css_file: sha})
     return(sha_dict)
 
 
 def create_addons_json():
     addon_shas = subprocess.check_output(
-        ["git", "ls-files", "-s", "./CSS/addons/*.css"])
+        ["git", "ls-files", "-s", "./css/addons/*.css"])
     SHAS = get_shas(addon_shas)
     ADDONS = {"addons": {}}
-    addon_root = './CSS/addons'
+    addon_root = './css/addons'
     addon_folders = [name for name in listdir(
         addon_root) if isdir(join(addon_root, name))]
     for app in addon_folders:
@@ -36,12 +36,12 @@ def create_addons_json():
                 f"{addon_root}/{app}/{addon}") if isfile(join(f"{addon_root}/{app}/{addon}", file))]
             if len([f for f in files if f.endswith('.css')]) > 1:
                 ADDONS["addons"][app][addon].update({
-                    "css":  [f"https://{DOMAIN}/CSS/addons/{app}/{addon}/{file}?sha={SHAS.get(file)}" for file in files if file.split(".")[1] == "css"]
+                    "css":  [f"https://{DOMAIN}/css/addons/{app}/{addon}/{file}?sha={SHAS.get(file)}" for file in files if file.split(".")[1] == "css"]
                 }
                 )
             else:
                 ADDONS["addons"][app].update({
-                    addon:  f"https://{DOMAIN}/CSS/addons/{app}/{addon}/{file}?sha={SHAS.get(file)}" for file in files if file.split(".")[1] == "css"
+                    addon:  f"https://{DOMAIN}/css/addons/{app}/{addon}/{file}?sha={SHAS.get(file)}" for file in files if file.split(".")[1] == "css"
                 }
                 )
             extra_dirs = [dir for dir in listdir(
@@ -52,57 +52,112 @@ def create_addons_json():
                         f"{addon_root}/{app}/{addon}/{dir}") if isfile(join(f"{addon_root}/{app}/{addon}/{dir}", file))]
                     ADDONS["addons"][app][addon].update({
                         dir: {
-                            "css": [f"https://{DOMAIN}/CSS/addons/{app}/{addon}/{dir}/{extra_file}?sha={SHAS.get(extra_file)}" for extra_file in extra_dir_files if extra_file.split(".")[1] == "css"]
+                            "css": [f"https://{DOMAIN}/css/addons/{app}/{addon}/{dir}/{extra_file}?sha={SHAS.get(extra_file)}" for extra_file in extra_dir_files if extra_file.split(".")[1] == "css"]
                         }
                     }
                     )
-    return dumps(ADDONS)
+    return dumps(ADDONS, sort_keys=True)
 
 
-def create_json(app_folders: list = None, themes: list = None, no_sub_folders=False):
+def create_json(app_folders: list = None, themes: list = None, community_themes: list = None, no_sub_folders=False):
     if no_sub_folders:
-        THEMES = {}
-        theme_shas = subprocess.check_output(
-            ["git", "ls-files", "-s", "./CSS/variables/*.css"])
-        SHAS = get_shas(theme_shas)
-        for theme in themes:
-            THEMES.update({
-                "themes": {
-                    theme.split(".")[0].capitalize(): {
-                        "url": f"https://{DOMAIN}/CSS/variables/{theme}?sha={SHAS.get(theme)}"
-                    }for theme in themes
+        THEMES_DICT = {}
+        theme_shas = subprocess.check_output(["git", "ls-files", "-s", "./css/theme-options/*.css"])
+        community_theme_shas = subprocess.check_output(["git", "ls-files", "-s", "./css/community-theme-options/*.css"])
+        THEME_SHAS = get_shas(theme_shas)
+        COMMUNITY_THEME_SHAS = get_shas(community_theme_shas)
+        THEMES = {
+                theme.split(".")[0].capitalize(): {
+                    "url": f"https://{DOMAIN}/css/theme-options/{theme}?sha={THEME_SHAS.get(theme)}"
+                }for theme in themes
+            }
+        COMMUNITY_THEMES = {
+                theme.split(".")[0].capitalize(): {
+                    "url": f"https://{DOMAIN}/css/community-theme-options/{theme}?sha={COMMUNITY_THEME_SHAS.get(theme)}"
+                }for theme in community_themes
+            }
+        THEMES_DICT.update(dict(sorted({
+            "themes": {
+                **THEMES
+                },
+            "community-themes": {
+                **COMMUNITY_THEMES
+                },
+            "all-themes": {
+                **THEMES, **COMMUNITY_THEMES
                 }
-            })
-        return dumps(THEMES)
+            }.items())))
+        return dumps(THEMES_DICT)
     else:
         ADDONS = loads(create_addons_json())
-        APPS = {"applications": {}}
-        app_shas = subprocess.check_output(
-            ["git", "ls-files", "-s", "./CSS/themes/*base.css"])
+        APPS = {}
+        app_shas = subprocess.check_output(["git", "ls-files", "-s", "./css/base/*base.css"])
         SHAS = get_shas(app_shas)
-        for app in app_folders:
-            APPS.update({
-                "applications": {
-                    app: {
-                        "base_css": f"https://{DOMAIN}/CSS/themes/{app}/{app}-base.css?sha={SHAS.get(f'{app}-base.css')}",
-                        "addons": ADDONS["addons"][app] if app in ADDONS["addons"] else {}
-                    } for app in app_folders
-                }
+        APPS.update(dict(sorted({
+            "applications": {
+                app: {
+                    "base_css": f"https://{DOMAIN}/css/base/{app}/{app}-base.css?sha={SHAS.get(f'{app}-base.css')}",
+                    "addons": ADDONS["addons"][app] if app in ADDONS["addons"] else {}
+                } for app in app_folders if not isfile(f'./css/base/{app}/.deprecated')
             }
-            )
-        THEMES = loads(create_json(themes=themes, no_sub_folders=True))
+        }.items())))
+        APPS.update(dict(sorted({
+            "deprecated": {
+                app: {
+                    "base_css": f"https://{DOMAIN}/css/base/{app}/{app}-base.css?sha={SHAS.get(f'{app}-base.css')}",
+                    "addons": ADDONS["addons"][app] if app in ADDONS["addons"] else {}
+                } for app in app_folders if isfile(f'./css/base/{app}/.deprecated')
+            }
+        }.items())))
+        THEMES = loads(create_json(themes=themes, community_themes=community_themes, no_sub_folders=True))
         APPS.update(ADDONS)
         APPS.update(THEMES)
         return dumps(APPS)
 
+# def temporary_copy_files():
+#     shutil.rmtree("./CSS", ignore_errors=True)
+#     shutil.rmtree("./Resources", ignore_errors=True)
+#     src_dst = {
+#         "./css/base/": "./CSS/themes",
+#         "./css/theme-options": "./CSS/variables",
+#         "./css/community-theme-options": "./CSS/variables",
+#         "./resources/": "./Resources/",
+#         "./css/addons/": "./CSS/addons",
+#         "./css/defaults/": "./CSS/defaults",
+#         "./css/theme-options/organizr.css": "./CSS/variables/organizr-dark.css",
+#         "./css/theme-options/organizr.css": "./css/theme-options/organizr-dark.css"
+#         }
+#     for src in src_dst:
+#         if ".css" in src:
+#             shutil.copy(src,src_dst[src])
+#             continue
+#         shutil.copytree(src,src_dst[src],dirs_exist_ok=True)
+
+def create_theme_options():
+    def create_css(folder):
+        with open(f"{folder}/{app}/{theme.lower()}.css", "w") as create_app:
+            content = f'@import url("{applications[app]["base_css"]}");\n@import url("{themes[theme]["url"]}");'
+            create_app.write(content)
+    with open("themes.json") as themes:
+        data = load(themes)
+        themes = data["all-themes"]
+        applications = data["applications"]
+    for app in applications:
+        for theme in themes:
+            folders = ["./css/base"]
+            for folder in folders:
+                create_css(folder)
+
 
 if __name__ == "__main__":
-    app_folders = [name for name in listdir(
-        './CSS/themes') if isdir(join('./CSS/themes', name))]
-    themes = [name for name in listdir(
-        './CSS/variables') if isfile(join('./CSS/variables', name))]
-    DOMAIN = open("CNAME", "rt", closefd=True).readline()
-    apps = loads(create_json(app_folders, themes))
-
+    app_folders = [name for name in listdir('./css/base') if isdir(join('./css/base', name))]
+    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))]
+    with open("CNAME", "rt", closefd=True) as cname:
+        CNAME = cname.readline()
+    develop = True if subprocess.check_output(["git", "symbolic-ref", "--short", "HEAD"]).decode('ascii').strip() == "develop" else False
+    DOMAIN = CNAME if not develop else f"develop.{CNAME}"
+    apps = loads(create_json(app_folders=app_folders, themes=themes, community_themes=community_themes))
     with open("themes.json", "w") as outfile:
-        dump(apps, outfile, indent=2)
+        dump(apps, outfile, indent=2, sort_keys=True)
+    create_theme_options()
\ No newline at end of file