diff --git a/CSS/themes/adguard/adguard-base.css b/CSS/base/adguard/adguard-base.css
similarity index 100%
rename from CSS/themes/adguard/adguard-base.css
rename to CSS/base/adguard/adguard-base.css
diff --git a/CSS/themes/adguard/aquamarine.css b/CSS/base/adguard/aquamarine.css
similarity index 100%
rename from CSS/themes/adguard/aquamarine.css
rename to CSS/base/adguard/aquamarine.css
diff --git a/CSS/themes/adguard/dark.css b/CSS/base/adguard/dark.css
similarity index 100%
rename from CSS/themes/adguard/dark.css
rename to CSS/base/adguard/dark.css
diff --git a/CSS/themes/adguard/dracula.css b/CSS/base/adguard/dracula.css
similarity index 100%
rename from CSS/themes/adguard/dracula.css
rename to CSS/base/adguard/dracula.css
diff --git a/CSS/themes/adguard/hotline.css b/CSS/base/adguard/hotline.css
similarity index 100%
rename from CSS/themes/adguard/hotline.css
rename to CSS/base/adguard/hotline.css
diff --git a/CSS/themes/adguard/organizr-dark.css b/CSS/base/adguard/organizr-dark.css
similarity index 100%
rename from CSS/themes/adguard/organizr-dark.css
rename to CSS/base/adguard/organizr-dark.css
diff --git a/CSS/themes/adguard/plex.css b/CSS/base/adguard/plex.css
similarity index 100%
rename from CSS/themes/adguard/plex.css
rename to CSS/base/adguard/plex.css
diff --git a/CSS/themes/adguard/space-gray.css b/CSS/base/adguard/space-gray.css
similarity index 100%
rename from CSS/themes/adguard/space-gray.css
rename to CSS/base/adguard/space-gray.css
diff --git a/CSS/themes/bazarr/aquamarine.css b/CSS/base/bazarr/aquamarine.css
similarity index 100%
rename from CSS/themes/bazarr/aquamarine.css
rename to CSS/base/bazarr/aquamarine.css
diff --git a/CSS/themes/bazarr/bazarr-base.css b/CSS/base/bazarr/bazarr-base.css
similarity index 100%
rename from CSS/themes/bazarr/bazarr-base.css
rename to CSS/base/bazarr/bazarr-base.css
diff --git a/CSS/themes/bazarr/dark.css b/CSS/base/bazarr/dark.css
similarity index 100%
rename from CSS/themes/bazarr/dark.css
rename to CSS/base/bazarr/dark.css
diff --git a/CSS/themes/bazarr/dracula.css b/CSS/base/bazarr/dracula.css
similarity index 100%
rename from CSS/themes/bazarr/dracula.css
rename to CSS/base/bazarr/dracula.css
diff --git a/CSS/themes/bazarr/hotline.css b/CSS/base/bazarr/hotline.css
similarity index 100%
rename from CSS/themes/bazarr/hotline.css
rename to CSS/base/bazarr/hotline.css
diff --git a/CSS/themes/bazarr/organizr-dark.css b/CSS/base/bazarr/organizr-dark.css
similarity index 100%
rename from CSS/themes/bazarr/organizr-dark.css
rename to CSS/base/bazarr/organizr-dark.css
diff --git a/CSS/themes/bazarr/plex.css b/CSS/base/bazarr/plex.css
similarity index 100%
rename from CSS/themes/bazarr/plex.css
rename to CSS/base/bazarr/plex.css
diff --git a/CSS/themes/bazarr/space-gray.css b/CSS/base/bazarr/space-gray.css
similarity index 100%
rename from CSS/themes/bazarr/space-gray.css
rename to CSS/base/bazarr/space-gray.css
diff --git a/CSS/themes/bitwarden/aquamarine.css b/CSS/base/bitwarden/aquamarine.css
similarity index 100%
rename from CSS/themes/bitwarden/aquamarine.css
rename to CSS/base/bitwarden/aquamarine.css
diff --git a/CSS/themes/bitwarden/bitwarden-base.css b/CSS/base/bitwarden/bitwarden-base.css
similarity index 100%
rename from CSS/themes/bitwarden/bitwarden-base.css
rename to CSS/base/bitwarden/bitwarden-base.css
diff --git a/CSS/themes/bitwarden/dark.css b/CSS/base/bitwarden/dark.css
similarity index 100%
rename from CSS/themes/bitwarden/dark.css
rename to CSS/base/bitwarden/dark.css
diff --git a/CSS/themes/bitwarden/dracula.css b/CSS/base/bitwarden/dracula.css
similarity index 100%
rename from CSS/themes/bitwarden/dracula.css
rename to CSS/base/bitwarden/dracula.css
diff --git a/CSS/themes/bitwarden/hotline.css b/CSS/base/bitwarden/hotline.css
similarity index 100%
rename from CSS/themes/bitwarden/hotline.css
rename to CSS/base/bitwarden/hotline.css
diff --git a/CSS/themes/bitwarden/organizr-dark.css b/CSS/base/bitwarden/organizr-dark.css
similarity index 100%
rename from CSS/themes/bitwarden/organizr-dark.css
rename to CSS/base/bitwarden/organizr-dark.css
diff --git a/CSS/themes/bitwarden/plex.css b/CSS/base/bitwarden/plex.css
similarity index 100%
rename from CSS/themes/bitwarden/plex.css
rename to CSS/base/bitwarden/plex.css
diff --git a/CSS/themes/bitwarden/space-gray.css b/CSS/base/bitwarden/space-gray.css
similarity index 100%
rename from CSS/themes/bitwarden/space-gray.css
rename to CSS/base/bitwarden/space-gray.css
diff --git a/CSS/themes/calibreweb/aquamarine.css b/CSS/base/calibreweb/aquamarine.css
similarity index 100%
rename from CSS/themes/calibreweb/aquamarine.css
rename to CSS/base/calibreweb/aquamarine.css
diff --git a/CSS/themes/calibreweb/calibreweb-base.css b/CSS/base/calibreweb/calibreweb-base.css
similarity index 100%
rename from CSS/themes/calibreweb/calibreweb-base.css
rename to CSS/base/calibreweb/calibreweb-base.css
diff --git a/CSS/themes/calibreweb/dark.css b/CSS/base/calibreweb/dark.css
similarity index 100%
rename from CSS/themes/calibreweb/dark.css
rename to CSS/base/calibreweb/dark.css
diff --git a/CSS/themes/calibreweb/dracula.css b/CSS/base/calibreweb/dracula.css
similarity index 100%
rename from CSS/themes/calibreweb/dracula.css
rename to CSS/base/calibreweb/dracula.css
diff --git a/CSS/themes/calibreweb/hotline.css b/CSS/base/calibreweb/hotline.css
similarity index 100%
rename from CSS/themes/calibreweb/hotline.css
rename to CSS/base/calibreweb/hotline.css
diff --git a/CSS/themes/calibreweb/organizr-dark.css b/CSS/base/calibreweb/organizr-dark.css
similarity index 100%
rename from CSS/themes/calibreweb/organizr-dark.css
rename to CSS/base/calibreweb/organizr-dark.css
diff --git a/CSS/themes/calibreweb/space-gray.css b/CSS/base/calibreweb/space-gray.css
similarity index 100%
rename from CSS/themes/calibreweb/space-gray.css
rename to CSS/base/calibreweb/space-gray.css
diff --git a/CSS/themes/deluge/aquamarine.css b/CSS/base/deluge/aquamarine.css
similarity index 100%
rename from CSS/themes/deluge/aquamarine.css
rename to CSS/base/deluge/aquamarine.css
diff --git a/CSS/themes/deluge/dark.css b/CSS/base/deluge/dark.css
similarity index 100%
rename from CSS/themes/deluge/dark.css
rename to CSS/base/deluge/dark.css
diff --git a/CSS/themes/deluge/deluge-base.css b/CSS/base/deluge/deluge-base.css
similarity index 100%
rename from CSS/themes/deluge/deluge-base.css
rename to CSS/base/deluge/deluge-base.css
diff --git a/CSS/themes/deluge/dracula.css b/CSS/base/deluge/dracula.css
similarity index 100%
rename from CSS/themes/deluge/dracula.css
rename to CSS/base/deluge/dracula.css
diff --git a/CSS/themes/deluge/hotline.css b/CSS/base/deluge/hotline.css
similarity index 100%
rename from CSS/themes/deluge/hotline.css
rename to CSS/base/deluge/hotline.css
diff --git a/CSS/themes/deluge/organizr-dark.css b/CSS/base/deluge/organizr-dark.css
similarity index 100%
rename from CSS/themes/deluge/organizr-dark.css
rename to CSS/base/deluge/organizr-dark.css
diff --git a/CSS/themes/deluge/plex.css b/CSS/base/deluge/plex.css
similarity index 100%
rename from CSS/themes/deluge/plex.css
rename to CSS/base/deluge/plex.css
diff --git a/CSS/themes/deluge/space-gray.css b/CSS/base/deluge/space-gray.css
similarity index 100%
rename from CSS/themes/deluge/space-gray.css
rename to CSS/base/deluge/space-gray.css
diff --git a/CSS/themes/dozzle/aquamarine.css b/CSS/base/dozzle/aquamarine.css
similarity index 100%
rename from CSS/themes/dozzle/aquamarine.css
rename to CSS/base/dozzle/aquamarine.css
diff --git a/CSS/themes/dozzle/dark.css b/CSS/base/dozzle/dark.css
similarity index 100%
rename from CSS/themes/dozzle/dark.css
rename to CSS/base/dozzle/dark.css
diff --git a/CSS/themes/dozzle/dozzle-base.css b/CSS/base/dozzle/dozzle-base.css
similarity index 100%
rename from CSS/themes/dozzle/dozzle-base.css
rename to CSS/base/dozzle/dozzle-base.css
diff --git a/CSS/themes/dozzle/dracula.css b/CSS/base/dozzle/dracula.css
similarity index 100%
rename from CSS/themes/dozzle/dracula.css
rename to CSS/base/dozzle/dracula.css
diff --git a/CSS/themes/dozzle/hotline.css b/CSS/base/dozzle/hotline.css
similarity index 100%
rename from CSS/themes/dozzle/hotline.css
rename to CSS/base/dozzle/hotline.css
diff --git a/CSS/themes/dozzle/organizr-dark.css b/CSS/base/dozzle/organizr-dark.css
similarity index 100%
rename from CSS/themes/dozzle/organizr-dark.css
rename to CSS/base/dozzle/organizr-dark.css
diff --git a/CSS/themes/dozzle/plex.css b/CSS/base/dozzle/plex.css
similarity index 100%
rename from CSS/themes/dozzle/plex.css
rename to CSS/base/dozzle/plex.css
diff --git a/CSS/themes/dozzle/space-gray.css b/CSS/base/dozzle/space-gray.css
similarity index 100%
rename from CSS/themes/dozzle/space-gray.css
rename to CSS/base/dozzle/space-gray.css
diff --git a/CSS/themes/duplicacy/aquamarine.css b/CSS/base/duplicacy/aquamarine.css
similarity index 100%
rename from CSS/themes/duplicacy/aquamarine.css
rename to CSS/base/duplicacy/aquamarine.css
diff --git a/CSS/themes/duplicacy/dark.css b/CSS/base/duplicacy/dark.css
similarity index 100%
rename from CSS/themes/duplicacy/dark.css
rename to CSS/base/duplicacy/dark.css
diff --git a/CSS/themes/duplicacy/dracula.css b/CSS/base/duplicacy/dracula.css
similarity index 100%
rename from CSS/themes/duplicacy/dracula.css
rename to CSS/base/duplicacy/dracula.css
diff --git a/CSS/themes/duplicacy/duplicacy-base.css b/CSS/base/duplicacy/duplicacy-base.css
similarity index 100%
rename from CSS/themes/duplicacy/duplicacy-base.css
rename to CSS/base/duplicacy/duplicacy-base.css
diff --git a/CSS/themes/duplicacy/hotline.css b/CSS/base/duplicacy/hotline.css
similarity index 100%
rename from CSS/themes/duplicacy/hotline.css
rename to CSS/base/duplicacy/hotline.css
diff --git a/CSS/themes/duplicacy/organizr-dark.css b/CSS/base/duplicacy/organizr-dark.css
similarity index 100%
rename from CSS/themes/duplicacy/organizr-dark.css
rename to CSS/base/duplicacy/organizr-dark.css
diff --git a/CSS/themes/duplicacy/plex.css b/CSS/base/duplicacy/plex.css
similarity index 100%
rename from CSS/themes/duplicacy/plex.css
rename to CSS/base/duplicacy/plex.css
diff --git a/CSS/themes/duplicacy/space-gray.css b/CSS/base/duplicacy/space-gray.css
similarity index 100%
rename from CSS/themes/duplicacy/space-gray.css
rename to CSS/base/duplicacy/space-gray.css
diff --git a/CSS/themes/duplicati/duplicati-base.css b/CSS/base/duplicati/duplicati-base.css
similarity index 100%
rename from CSS/themes/duplicati/duplicati-base.css
rename to CSS/base/duplicati/duplicati-base.css
diff --git a/CSS/themes/emby/aquamarine.css b/CSS/base/emby/aquamarine.css
similarity index 100%
rename from CSS/themes/emby/aquamarine.css
rename to CSS/base/emby/aquamarine.css
diff --git a/CSS/themes/emby/dark.css b/CSS/base/emby/dark.css
similarity index 100%
rename from CSS/themes/emby/dark.css
rename to CSS/base/emby/dark.css
diff --git a/CSS/themes/emby/dracula.css b/CSS/base/emby/dracula.css
similarity index 100%
rename from CSS/themes/emby/dracula.css
rename to CSS/base/emby/dracula.css
diff --git a/CSS/themes/emby/emby-base.css b/CSS/base/emby/emby-base.css
similarity index 100%
rename from CSS/themes/emby/emby-base.css
rename to CSS/base/emby/emby-base.css
diff --git a/CSS/themes/emby/hotline.css b/CSS/base/emby/hotline.css
similarity index 100%
rename from CSS/themes/emby/hotline.css
rename to CSS/base/emby/hotline.css
diff --git a/CSS/themes/emby/organizr-dark.css b/CSS/base/emby/organizr-dark.css
similarity index 100%
rename from CSS/themes/emby/organizr-dark.css
rename to CSS/base/emby/organizr-dark.css
diff --git a/CSS/themes/emby/plex.css b/CSS/base/emby/plex.css
similarity index 100%
rename from CSS/themes/emby/plex.css
rename to CSS/base/emby/plex.css
diff --git a/CSS/themes/emby/space-gray.css b/CSS/base/emby/space-gray.css
similarity index 100%
rename from CSS/themes/emby/space-gray.css
rename to CSS/base/emby/space-gray.css
diff --git a/CSS/themes/filebrowser/aquamarine.css b/CSS/base/filebrowser/aquamarine.css
similarity index 100%
rename from CSS/themes/filebrowser/aquamarine.css
rename to CSS/base/filebrowser/aquamarine.css
diff --git a/CSS/themes/filebrowser/dark.css b/CSS/base/filebrowser/dark.css
similarity index 100%
rename from CSS/themes/filebrowser/dark.css
rename to CSS/base/filebrowser/dark.css
diff --git a/CSS/themes/filebrowser/dracula.css b/CSS/base/filebrowser/dracula.css
similarity index 100%
rename from CSS/themes/filebrowser/dracula.css
rename to CSS/base/filebrowser/dracula.css
diff --git a/CSS/themes/filebrowser/filebrowser-base.css b/CSS/base/filebrowser/filebrowser-base.css
similarity index 100%
rename from CSS/themes/filebrowser/filebrowser-base.css
rename to CSS/base/filebrowser/filebrowser-base.css
diff --git a/CSS/themes/filebrowser/hotline.css b/CSS/base/filebrowser/hotline.css
similarity index 100%
rename from CSS/themes/filebrowser/hotline.css
rename to CSS/base/filebrowser/hotline.css
diff --git a/CSS/themes/filebrowser/organizr-dark.css b/CSS/base/filebrowser/organizr-dark.css
similarity index 100%
rename from CSS/themes/filebrowser/organizr-dark.css
rename to CSS/base/filebrowser/organizr-dark.css
diff --git a/CSS/themes/filebrowser/plex.css b/CSS/base/filebrowser/plex.css
similarity index 100%
rename from CSS/themes/filebrowser/plex.css
rename to CSS/base/filebrowser/plex.css
diff --git a/CSS/themes/filebrowser/space-gray.css b/CSS/base/filebrowser/space-gray.css
similarity index 100%
rename from CSS/themes/filebrowser/space-gray.css
rename to CSS/base/filebrowser/space-gray.css
diff --git a/CSS/themes/flood/aquamarine.css b/CSS/base/flood/aquamarine.css
similarity index 100%
rename from CSS/themes/flood/aquamarine.css
rename to CSS/base/flood/aquamarine.css
diff --git a/CSS/themes/flood/dark.css b/CSS/base/flood/dark.css
similarity index 100%
rename from CSS/themes/flood/dark.css
rename to CSS/base/flood/dark.css
diff --git a/CSS/themes/flood/dracula.css b/CSS/base/flood/dracula.css
similarity index 100%
rename from CSS/themes/flood/dracula.css
rename to CSS/base/flood/dracula.css
diff --git a/CSS/themes/flood/flood-base.css b/CSS/base/flood/flood-base.css
similarity index 100%
rename from CSS/themes/flood/flood-base.css
rename to CSS/base/flood/flood-base.css
diff --git a/CSS/themes/flood/hotline.css b/CSS/base/flood/hotline.css
similarity index 100%
rename from CSS/themes/flood/hotline.css
rename to CSS/base/flood/hotline.css
diff --git a/CSS/themes/flood/organizr-dark.css b/CSS/base/flood/organizr-dark.css
similarity index 100%
rename from CSS/themes/flood/organizr-dark.css
rename to CSS/base/flood/organizr-dark.css
diff --git a/CSS/themes/flood/plex.css b/CSS/base/flood/plex.css
similarity index 100%
rename from CSS/themes/flood/plex.css
rename to CSS/base/flood/plex.css
diff --git a/CSS/themes/flood/space-gray.css b/CSS/base/flood/space-gray.css
similarity index 100%
rename from CSS/themes/flood/space-gray.css
rename to CSS/base/flood/space-gray.css
diff --git a/CSS/themes/gaps/aquamarine.css b/CSS/base/gaps/aquamarine.css
similarity index 100%
rename from CSS/themes/gaps/aquamarine.css
rename to CSS/base/gaps/aquamarine.css
diff --git a/CSS/themes/gaps/dark.css b/CSS/base/gaps/dark.css
similarity index 100%
rename from CSS/themes/gaps/dark.css
rename to CSS/base/gaps/dark.css
diff --git a/CSS/themes/gaps/dracula.css b/CSS/base/gaps/dracula.css
similarity index 100%
rename from CSS/themes/gaps/dracula.css
rename to CSS/base/gaps/dracula.css
diff --git a/CSS/themes/gaps/gaps-base.css b/CSS/base/gaps/gaps-base.css
similarity index 100%
rename from CSS/themes/gaps/gaps-base.css
rename to CSS/base/gaps/gaps-base.css
diff --git a/CSS/themes/gaps/hotline.css b/CSS/base/gaps/hotline.css
similarity index 100%
rename from CSS/themes/gaps/hotline.css
rename to CSS/base/gaps/hotline.css
diff --git a/CSS/themes/gaps/organizr-dark.css b/CSS/base/gaps/organizr-dark.css
similarity index 100%
rename from CSS/themes/gaps/organizr-dark.css
rename to CSS/base/gaps/organizr-dark.css
diff --git a/CSS/themes/gaps/plex.css b/CSS/base/gaps/plex.css
similarity index 100%
rename from CSS/themes/gaps/plex.css
rename to CSS/base/gaps/plex.css
diff --git a/CSS/themes/gaps/space-gray.css b/CSS/base/gaps/space-gray.css
similarity index 100%
rename from CSS/themes/gaps/space-gray.css
rename to CSS/base/gaps/space-gray.css
diff --git a/CSS/themes/gitea/aquamarine.css b/CSS/base/gitea/aquamarine.css
similarity index 100%
rename from CSS/themes/gitea/aquamarine.css
rename to CSS/base/gitea/aquamarine.css
diff --git a/CSS/themes/gitea/chroma.css b/CSS/base/gitea/chroma.css
similarity index 100%
rename from CSS/themes/gitea/chroma.css
rename to CSS/base/gitea/chroma.css
diff --git a/CSS/themes/gitea/dark.css b/CSS/base/gitea/dark.css
similarity index 100%
rename from CSS/themes/gitea/dark.css
rename to CSS/base/gitea/dark.css
diff --git a/CSS/themes/gitea/dracula.css b/CSS/base/gitea/dracula.css
similarity index 100%
rename from CSS/themes/gitea/dracula.css
rename to CSS/base/gitea/dracula.css
diff --git a/CSS/themes/gitea/gitea-base.css b/CSS/base/gitea/gitea-base.css
similarity index 100%
rename from CSS/themes/gitea/gitea-base.css
rename to CSS/base/gitea/gitea-base.css
diff --git a/CSS/themes/gitea/hotline.css b/CSS/base/gitea/hotline.css
similarity index 100%
rename from CSS/themes/gitea/hotline.css
rename to CSS/base/gitea/hotline.css
diff --git a/CSS/themes/gitea/organizr-dark.css b/CSS/base/gitea/organizr-dark.css
similarity index 100%
rename from CSS/themes/gitea/organizr-dark.css
rename to CSS/base/gitea/organizr-dark.css
diff --git a/CSS/themes/gitea/plex.css b/CSS/base/gitea/plex.css
similarity index 100%
rename from CSS/themes/gitea/plex.css
rename to CSS/base/gitea/plex.css
diff --git a/CSS/themes/gitea/space-gray.css b/CSS/base/gitea/space-gray.css
similarity index 100%
rename from CSS/themes/gitea/space-gray.css
rename to CSS/base/gitea/space-gray.css
diff --git a/CSS/themes/grafana/.deprecated b/CSS/base/grafana/.deprecated
similarity index 100%
rename from CSS/themes/grafana/.deprecated
rename to CSS/base/grafana/.deprecated
diff --git a/CSS/themes/grafana/aquamarine.css b/CSS/base/grafana/aquamarine.css
similarity index 100%
rename from CSS/themes/grafana/aquamarine.css
rename to CSS/base/grafana/aquamarine.css
diff --git a/CSS/themes/grafana/dark.css b/CSS/base/grafana/dark.css
similarity index 100%
rename from CSS/themes/grafana/dark.css
rename to CSS/base/grafana/dark.css
diff --git a/CSS/themes/grafana/dracula.css b/CSS/base/grafana/dracula.css
similarity index 100%
rename from CSS/themes/grafana/dracula.css
rename to CSS/base/grafana/dracula.css
diff --git a/CSS/themes/grafana/grafana-base.css b/CSS/base/grafana/grafana-base.css
similarity index 100%
rename from CSS/themes/grafana/grafana-base.css
rename to CSS/base/grafana/grafana-base.css
diff --git a/CSS/themes/grafana/hotline.css b/CSS/base/grafana/hotline.css
similarity index 100%
rename from CSS/themes/grafana/hotline.css
rename to CSS/base/grafana/hotline.css
diff --git a/CSS/themes/grafana/organizr-dark.css b/CSS/base/grafana/organizr-dark.css
similarity index 100%
rename from CSS/themes/grafana/organizr-dark.css
rename to CSS/base/grafana/organizr-dark.css
diff --git a/CSS/themes/grafana/organizr-dashboard.css b/CSS/base/grafana/organizr-dashboard.css
similarity index 100%
rename from CSS/themes/grafana/organizr-dashboard.css
rename to CSS/base/grafana/organizr-dashboard.css
diff --git a/CSS/themes/grafana/plex.css b/CSS/base/grafana/plex.css
similarity index 100%
rename from CSS/themes/grafana/plex.css
rename to CSS/base/grafana/plex.css
diff --git a/CSS/themes/grafana/space-gray.css b/CSS/base/grafana/space-gray.css
similarity index 100%
rename from CSS/themes/grafana/space-gray.css
rename to CSS/base/grafana/space-gray.css
diff --git a/CSS/themes/guacamole/aquamarine.css b/CSS/base/guacamole/aquamarine.css
similarity index 100%
rename from CSS/themes/guacamole/aquamarine.css
rename to CSS/base/guacamole/aquamarine.css
diff --git a/CSS/themes/guacamole/dark.css b/CSS/base/guacamole/dark.css
similarity index 100%
rename from CSS/themes/guacamole/dark.css
rename to CSS/base/guacamole/dark.css
diff --git a/CSS/themes/guacamole/dracula.css b/CSS/base/guacamole/dracula.css
similarity index 100%
rename from CSS/themes/guacamole/dracula.css
rename to CSS/base/guacamole/dracula.css
diff --git a/CSS/themes/guacamole/guacamole-base.css b/CSS/base/guacamole/guacamole-base.css
similarity index 100%
rename from CSS/themes/guacamole/guacamole-base.css
rename to CSS/base/guacamole/guacamole-base.css
diff --git a/CSS/themes/guacamole/hotline.css b/CSS/base/guacamole/hotline.css
similarity index 100%
rename from CSS/themes/guacamole/hotline.css
rename to CSS/base/guacamole/hotline.css
diff --git a/CSS/themes/guacamole/organizr-dark.css b/CSS/base/guacamole/organizr-dark.css
similarity index 100%
rename from CSS/themes/guacamole/organizr-dark.css
rename to CSS/base/guacamole/organizr-dark.css
diff --git a/CSS/themes/guacamole/plex.css b/CSS/base/guacamole/plex.css
similarity index 100%
rename from CSS/themes/guacamole/plex.css
rename to CSS/base/guacamole/plex.css
diff --git a/CSS/themes/guacamole/space-gray.css b/CSS/base/guacamole/space-gray.css
similarity index 100%
rename from CSS/themes/guacamole/space-gray.css
rename to CSS/base/guacamole/space-gray.css
diff --git a/CSS/themes/jackett/aquamarine.css b/CSS/base/jackett/aquamarine.css
similarity index 100%
rename from CSS/themes/jackett/aquamarine.css
rename to CSS/base/jackett/aquamarine.css
diff --git a/CSS/themes/jackett/dark.css b/CSS/base/jackett/dark.css
similarity index 100%
rename from CSS/themes/jackett/dark.css
rename to CSS/base/jackett/dark.css
diff --git a/CSS/themes/jackett/dracula.css b/CSS/base/jackett/dracula.css
similarity index 100%
rename from CSS/themes/jackett/dracula.css
rename to CSS/base/jackett/dracula.css
diff --git a/CSS/themes/jackett/hotline.css b/CSS/base/jackett/hotline.css
similarity index 100%
rename from CSS/themes/jackett/hotline.css
rename to CSS/base/jackett/hotline.css
diff --git a/CSS/themes/jackett/jackett-base.css b/CSS/base/jackett/jackett-base.css
similarity index 100%
rename from CSS/themes/jackett/jackett-base.css
rename to CSS/base/jackett/jackett-base.css
diff --git a/CSS/themes/jackett/organizr-dark.css b/CSS/base/jackett/organizr-dark.css
similarity index 100%
rename from CSS/themes/jackett/organizr-dark.css
rename to CSS/base/jackett/organizr-dark.css
diff --git a/CSS/themes/jackett/plex.css b/CSS/base/jackett/plex.css
similarity index 100%
rename from CSS/themes/jackett/plex.css
rename to CSS/base/jackett/plex.css
diff --git a/CSS/themes/jackett/space-gray.css b/CSS/base/jackett/space-gray.css
similarity index 100%
rename from CSS/themes/jackett/space-gray.css
rename to CSS/base/jackett/space-gray.css
diff --git a/CSS/themes/jellyfin/aquamarine.css b/CSS/base/jellyfin/aquamarine.css
similarity index 100%
rename from CSS/themes/jellyfin/aquamarine.css
rename to CSS/base/jellyfin/aquamarine.css
diff --git a/CSS/themes/jellyfin/dark.css b/CSS/base/jellyfin/dark.css
similarity index 100%
rename from CSS/themes/jellyfin/dark.css
rename to CSS/base/jellyfin/dark.css
diff --git a/CSS/themes/jellyfin/dracula.css b/CSS/base/jellyfin/dracula.css
similarity index 100%
rename from CSS/themes/jellyfin/dracula.css
rename to CSS/base/jellyfin/dracula.css
diff --git a/CSS/themes/jellyfin/hotline.css b/CSS/base/jellyfin/hotline.css
similarity index 100%
rename from CSS/themes/jellyfin/hotline.css
rename to CSS/base/jellyfin/hotline.css
diff --git a/CSS/themes/jellyfin/jellyfin-base.css b/CSS/base/jellyfin/jellyfin-base.css
similarity index 100%
rename from CSS/themes/jellyfin/jellyfin-base.css
rename to CSS/base/jellyfin/jellyfin-base.css
diff --git a/CSS/themes/jellyfin/organizr-dark.css b/CSS/base/jellyfin/organizr-dark.css
similarity index 100%
rename from CSS/themes/jellyfin/organizr-dark.css
rename to CSS/base/jellyfin/organizr-dark.css
diff --git a/CSS/themes/jellyfin/plex.css b/CSS/base/jellyfin/plex.css
similarity index 100%
rename from CSS/themes/jellyfin/plex.css
rename to CSS/base/jellyfin/plex.css
diff --git a/CSS/themes/jellyfin/space-gray.css b/CSS/base/jellyfin/space-gray.css
similarity index 100%
rename from CSS/themes/jellyfin/space-gray.css
rename to CSS/base/jellyfin/space-gray.css
diff --git a/CSS/themes/kitana/aquamarine.css b/CSS/base/kitana/aquamarine.css
similarity index 100%
rename from CSS/themes/kitana/aquamarine.css
rename to CSS/base/kitana/aquamarine.css
diff --git a/CSS/themes/kitana/dark.css b/CSS/base/kitana/dark.css
similarity index 100%
rename from CSS/themes/kitana/dark.css
rename to CSS/base/kitana/dark.css
diff --git a/CSS/themes/kitana/dracula.css b/CSS/base/kitana/dracula.css
similarity index 100%
rename from CSS/themes/kitana/dracula.css
rename to CSS/base/kitana/dracula.css
diff --git a/CSS/themes/kitana/hotline.css b/CSS/base/kitana/hotline.css
similarity index 100%
rename from CSS/themes/kitana/hotline.css
rename to CSS/base/kitana/hotline.css
diff --git a/CSS/themes/kitana/kitana-base.css b/CSS/base/kitana/kitana-base.css
similarity index 100%
rename from CSS/themes/kitana/kitana-base.css
rename to CSS/base/kitana/kitana-base.css
diff --git a/CSS/themes/kitana/organizr-dark.css b/CSS/base/kitana/organizr-dark.css
similarity index 100%
rename from CSS/themes/kitana/organizr-dark.css
rename to CSS/base/kitana/organizr-dark.css
diff --git a/CSS/themes/kitana/plex.css b/CSS/base/kitana/plex.css
similarity index 100%
rename from CSS/themes/kitana/plex.css
rename to CSS/base/kitana/plex.css
diff --git a/CSS/themes/kitana/space-gray.css b/CSS/base/kitana/space-gray.css
similarity index 100%
rename from CSS/themes/kitana/space-gray.css
rename to CSS/base/kitana/space-gray.css
diff --git a/CSS/themes/lazylibrarian/aquamarine.css b/CSS/base/lazylibrarian/aquamarine.css
similarity index 100%
rename from CSS/themes/lazylibrarian/aquamarine.css
rename to CSS/base/lazylibrarian/aquamarine.css
diff --git a/CSS/themes/lazylibrarian/dark.css b/CSS/base/lazylibrarian/dark.css
similarity index 100%
rename from CSS/themes/lazylibrarian/dark.css
rename to CSS/base/lazylibrarian/dark.css
diff --git a/CSS/themes/lazylibrarian/dracula.css b/CSS/base/lazylibrarian/dracula.css
similarity index 100%
rename from CSS/themes/lazylibrarian/dracula.css
rename to CSS/base/lazylibrarian/dracula.css
diff --git a/CSS/themes/lazylibrarian/hotline.css b/CSS/base/lazylibrarian/hotline.css
similarity index 100%
rename from CSS/themes/lazylibrarian/hotline.css
rename to CSS/base/lazylibrarian/hotline.css
diff --git a/CSS/themes/lazylibrarian/lazylibrarian-base.css b/CSS/base/lazylibrarian/lazylibrarian-base.css
similarity index 100%
rename from CSS/themes/lazylibrarian/lazylibrarian-base.css
rename to CSS/base/lazylibrarian/lazylibrarian-base.css
diff --git a/CSS/themes/lazylibrarian/organizr-dark.css b/CSS/base/lazylibrarian/organizr-dark.css
similarity index 100%
rename from CSS/themes/lazylibrarian/organizr-dark.css
rename to CSS/base/lazylibrarian/organizr-dark.css
diff --git a/CSS/themes/lazylibrarian/plex.css b/CSS/base/lazylibrarian/plex.css
similarity index 100%
rename from CSS/themes/lazylibrarian/plex.css
rename to CSS/base/lazylibrarian/plex.css
diff --git a/CSS/themes/lazylibrarian/space-gray.css b/CSS/base/lazylibrarian/space-gray.css
similarity index 100%
rename from CSS/themes/lazylibrarian/space-gray.css
rename to CSS/base/lazylibrarian/space-gray.css
diff --git a/CSS/themes/librespeed/aquamarine.css b/CSS/base/librespeed/aquamarine.css
similarity index 100%
rename from CSS/themes/librespeed/aquamarine.css
rename to CSS/base/librespeed/aquamarine.css
diff --git a/CSS/themes/librespeed/dark.css b/CSS/base/librespeed/dark.css
similarity index 100%
rename from CSS/themes/librespeed/dark.css
rename to CSS/base/librespeed/dark.css
diff --git a/CSS/themes/librespeed/dracula.css b/CSS/base/librespeed/dracula.css
similarity index 100%
rename from CSS/themes/librespeed/dracula.css
rename to CSS/base/librespeed/dracula.css
diff --git a/CSS/themes/librespeed/hotline.css b/CSS/base/librespeed/hotline.css
similarity index 100%
rename from CSS/themes/librespeed/hotline.css
rename to CSS/base/librespeed/hotline.css
diff --git a/CSS/themes/librespeed/librespeed-base.css b/CSS/base/librespeed/librespeed-base.css
similarity index 100%
rename from CSS/themes/librespeed/librespeed-base.css
rename to CSS/base/librespeed/librespeed-base.css
diff --git a/CSS/themes/librespeed/organizr-dark.css b/CSS/base/librespeed/organizr-dark.css
similarity index 100%
rename from CSS/themes/librespeed/organizr-dark.css
rename to CSS/base/librespeed/organizr-dark.css
diff --git a/CSS/themes/librespeed/plex.css b/CSS/base/librespeed/plex.css
similarity index 100%
rename from CSS/themes/librespeed/plex.css
rename to CSS/base/librespeed/plex.css
diff --git a/CSS/themes/librespeed/space-gray.css b/CSS/base/librespeed/space-gray.css
similarity index 100%
rename from CSS/themes/librespeed/space-gray.css
rename to CSS/base/librespeed/space-gray.css
diff --git a/CSS/themes/lidarr/aquamarine.css b/CSS/base/lidarr/aquamarine.css
similarity index 100%
rename from CSS/themes/lidarr/aquamarine.css
rename to CSS/base/lidarr/aquamarine.css
diff --git a/CSS/themes/lidarr/dark.css b/CSS/base/lidarr/dark.css
similarity index 100%
rename from CSS/themes/lidarr/dark.css
rename to CSS/base/lidarr/dark.css
diff --git a/CSS/themes/lidarr/dracula.css b/CSS/base/lidarr/dracula.css
similarity index 100%
rename from CSS/themes/lidarr/dracula.css
rename to CSS/base/lidarr/dracula.css
diff --git a/CSS/themes/lidarr/hotline.css b/CSS/base/lidarr/hotline.css
similarity index 100%
rename from CSS/themes/lidarr/hotline.css
rename to CSS/base/lidarr/hotline.css
diff --git a/CSS/themes/lidarr/lidarr-base.css b/CSS/base/lidarr/lidarr-base.css
similarity index 100%
rename from CSS/themes/lidarr/lidarr-base.css
rename to CSS/base/lidarr/lidarr-base.css
diff --git a/CSS/themes/lidarr/organizr-dark.css b/CSS/base/lidarr/organizr-dark.css
similarity index 100%
rename from CSS/themes/lidarr/organizr-dark.css
rename to CSS/base/lidarr/organizr-dark.css
diff --git a/CSS/themes/lidarr/plex.css b/CSS/base/lidarr/plex.css
similarity index 100%
rename from CSS/themes/lidarr/plex.css
rename to CSS/base/lidarr/plex.css
diff --git a/CSS/themes/lidarr/space-gray.css b/CSS/base/lidarr/space-gray.css
similarity index 100%
rename from CSS/themes/lidarr/space-gray.css
rename to CSS/base/lidarr/space-gray.css
diff --git a/CSS/themes/logarr/.deprecated b/CSS/base/logarr/.deprecated
similarity index 100%
rename from CSS/themes/logarr/.deprecated
rename to CSS/base/logarr/.deprecated
diff --git a/CSS/themes/logarr/aquamarine.css b/CSS/base/logarr/aquamarine.css
similarity index 100%
rename from CSS/themes/logarr/aquamarine.css
rename to CSS/base/logarr/aquamarine.css
diff --git a/CSS/themes/logarr/dark.css b/CSS/base/logarr/dark.css
similarity index 100%
rename from CSS/themes/logarr/dark.css
rename to CSS/base/logarr/dark.css
diff --git a/CSS/themes/logarr/hotline.css b/CSS/base/logarr/hotline.css
similarity index 100%
rename from CSS/themes/logarr/hotline.css
rename to CSS/base/logarr/hotline.css
diff --git a/CSS/themes/logarr/logarr-base.css b/CSS/base/logarr/logarr-base.css
similarity index 100%
rename from CSS/themes/logarr/logarr-base.css
rename to CSS/base/logarr/logarr-base.css
diff --git a/CSS/themes/logarr/organizr-dark.css b/CSS/base/logarr/organizr-dark.css
similarity index 100%
rename from CSS/themes/logarr/organizr-dark.css
rename to CSS/base/logarr/organizr-dark.css
diff --git a/CSS/themes/logarr/plex.css b/CSS/base/logarr/plex.css
similarity index 100%
rename from CSS/themes/logarr/plex.css
rename to CSS/base/logarr/plex.css
diff --git a/CSS/themes/logarr/space-gray.css b/CSS/base/logarr/space-gray.css
similarity index 100%
rename from CSS/themes/logarr/space-gray.css
rename to CSS/base/logarr/space-gray.css
diff --git a/CSS/themes/monitorr/.deprecated b/CSS/base/monitorr/.deprecated
similarity index 100%
rename from CSS/themes/monitorr/.deprecated
rename to CSS/base/monitorr/.deprecated
diff --git a/CSS/themes/monitorr/aquamarine.css b/CSS/base/monitorr/aquamarine.css
similarity index 100%
rename from CSS/themes/monitorr/aquamarine.css
rename to CSS/base/monitorr/aquamarine.css
diff --git a/CSS/themes/monitorr/dark.css b/CSS/base/monitorr/dark.css
similarity index 100%
rename from CSS/themes/monitorr/dark.css
rename to CSS/base/monitorr/dark.css
diff --git a/CSS/themes/monitorr/hotline.css b/CSS/base/monitorr/hotline.css
similarity index 100%
rename from CSS/themes/monitorr/hotline.css
rename to CSS/base/monitorr/hotline.css
diff --git a/CSS/themes/monitorr/monitorr-base.css b/CSS/base/monitorr/monitorr-base.css
similarity index 100%
rename from CSS/themes/monitorr/monitorr-base.css
rename to CSS/base/monitorr/monitorr-base.css
diff --git a/CSS/themes/monitorr/organizr-dark.css b/CSS/base/monitorr/organizr-dark.css
similarity index 100%
rename from CSS/themes/monitorr/organizr-dark.css
rename to CSS/base/monitorr/organizr-dark.css
diff --git a/CSS/themes/monitorr/organizr-dashboard.css b/CSS/base/monitorr/organizr-dashboard.css
similarity index 100%
rename from CSS/themes/monitorr/organizr-dashboard.css
rename to CSS/base/monitorr/organizr-dashboard.css
diff --git a/CSS/themes/monitorr/plex.css b/CSS/base/monitorr/plex.css
similarity index 100%
rename from CSS/themes/monitorr/plex.css
rename to CSS/base/monitorr/plex.css
diff --git a/CSS/themes/monitorr/space-gray.css b/CSS/base/monitorr/space-gray.css
similarity index 100%
rename from CSS/themes/monitorr/space-gray.css
rename to CSS/base/monitorr/space-gray.css
diff --git a/CSS/themes/moviematch/aquamarine.css b/CSS/base/moviematch/aquamarine.css
similarity index 100%
rename from CSS/themes/moviematch/aquamarine.css
rename to CSS/base/moviematch/aquamarine.css
diff --git a/CSS/themes/moviematch/dark.css b/CSS/base/moviematch/dark.css
similarity index 100%
rename from CSS/themes/moviematch/dark.css
rename to CSS/base/moviematch/dark.css
diff --git a/CSS/themes/moviematch/dracula.css b/CSS/base/moviematch/dracula.css
similarity index 100%
rename from CSS/themes/moviematch/dracula.css
rename to CSS/base/moviematch/dracula.css
diff --git a/CSS/themes/moviematch/hotline.css b/CSS/base/moviematch/hotline.css
similarity index 100%
rename from CSS/themes/moviematch/hotline.css
rename to CSS/base/moviematch/hotline.css
diff --git a/CSS/themes/moviematch/moviematch-base.css b/CSS/base/moviematch/moviematch-base.css
similarity index 100%
rename from CSS/themes/moviematch/moviematch-base.css
rename to CSS/base/moviematch/moviematch-base.css
diff --git a/CSS/themes/moviematch/organizr-dark.css b/CSS/base/moviematch/organizr-dark.css
similarity index 100%
rename from CSS/themes/moviematch/organizr-dark.css
rename to CSS/base/moviematch/organizr-dark.css
diff --git a/CSS/themes/moviematch/plex.css b/CSS/base/moviematch/plex.css
similarity index 100%
rename from CSS/themes/moviematch/plex.css
rename to CSS/base/moviematch/plex.css
diff --git a/CSS/themes/moviematch/space-gray.css b/CSS/base/moviematch/space-gray.css
similarity index 100%
rename from CSS/themes/moviematch/space-gray.css
rename to CSS/base/moviematch/space-gray.css
diff --git a/CSS/themes/mylar3/mylar3-base.css b/CSS/base/mylar3/mylar3-base.css
similarity index 100%
rename from CSS/themes/mylar3/mylar3-base.css
rename to CSS/base/mylar3/mylar3-base.css
diff --git a/CSS/themes/netdata/aquamarine.css b/CSS/base/netdata/aquamarine.css
similarity index 100%
rename from CSS/themes/netdata/aquamarine.css
rename to CSS/base/netdata/aquamarine.css
diff --git a/CSS/themes/netdata/dark.css b/CSS/base/netdata/dark.css
similarity index 100%
rename from CSS/themes/netdata/dark.css
rename to CSS/base/netdata/dark.css
diff --git a/CSS/themes/netdata/dracula.css b/CSS/base/netdata/dracula.css
similarity index 100%
rename from CSS/themes/netdata/dracula.css
rename to CSS/base/netdata/dracula.css
diff --git a/CSS/themes/netdata/hotline.css b/CSS/base/netdata/hotline.css
similarity index 100%
rename from CSS/themes/netdata/hotline.css
rename to CSS/base/netdata/hotline.css
diff --git a/CSS/themes/netdata/netdata-base.css b/CSS/base/netdata/netdata-base.css
similarity index 100%
rename from CSS/themes/netdata/netdata-base.css
rename to CSS/base/netdata/netdata-base.css
diff --git a/CSS/themes/netdata/organizr-dark.css b/CSS/base/netdata/organizr-dark.css
similarity index 100%
rename from CSS/themes/netdata/organizr-dark.css
rename to CSS/base/netdata/organizr-dark.css
diff --git a/CSS/themes/netdata/organizr-dashboard.css b/CSS/base/netdata/organizr-dashboard.css
similarity index 100%
rename from CSS/themes/netdata/organizr-dashboard.css
rename to CSS/base/netdata/organizr-dashboard.css
diff --git a/CSS/themes/netdata/plex.css b/CSS/base/netdata/plex.css
similarity index 100%
rename from CSS/themes/netdata/plex.css
rename to CSS/base/netdata/plex.css
diff --git a/CSS/themes/netdata/space-gray.css b/CSS/base/netdata/space-gray.css
similarity index 100%
rename from CSS/themes/netdata/space-gray.css
rename to CSS/base/netdata/space-gray.css
diff --git a/CSS/themes/nzbget/aquamarine.css b/CSS/base/nzbget/aquamarine.css
similarity index 100%
rename from CSS/themes/nzbget/aquamarine.css
rename to CSS/base/nzbget/aquamarine.css
diff --git a/CSS/themes/nzbget/dark.css b/CSS/base/nzbget/dark.css
similarity index 100%
rename from CSS/themes/nzbget/dark.css
rename to CSS/base/nzbget/dark.css
diff --git a/CSS/themes/nzbget/dracula.css b/CSS/base/nzbget/dracula.css
similarity index 100%
rename from CSS/themes/nzbget/dracula.css
rename to CSS/base/nzbget/dracula.css
diff --git a/CSS/themes/nzbget/hotline.css b/CSS/base/nzbget/hotline.css
similarity index 100%
rename from CSS/themes/nzbget/hotline.css
rename to CSS/base/nzbget/hotline.css
diff --git a/CSS/themes/nzbget/nzbget-base.css b/CSS/base/nzbget/nzbget-base.css
similarity index 100%
rename from CSS/themes/nzbget/nzbget-base.css
rename to CSS/base/nzbget/nzbget-base.css
diff --git a/CSS/themes/nzbget/organizr-dark.css b/CSS/base/nzbget/organizr-dark.css
similarity index 100%
rename from CSS/themes/nzbget/organizr-dark.css
rename to CSS/base/nzbget/organizr-dark.css
diff --git a/CSS/themes/nzbget/plex.css b/CSS/base/nzbget/plex.css
similarity index 100%
rename from CSS/themes/nzbget/plex.css
rename to CSS/base/nzbget/plex.css
diff --git a/CSS/themes/nzbget/space-gray.css b/CSS/base/nzbget/space-gray.css
similarity index 100%
rename from CSS/themes/nzbget/space-gray.css
rename to CSS/base/nzbget/space-gray.css
diff --git a/CSS/themes/nzbhydra2/aquamarine.css b/CSS/base/nzbhydra2/aquamarine.css
similarity index 100%
rename from CSS/themes/nzbhydra2/aquamarine.css
rename to CSS/base/nzbhydra2/aquamarine.css
diff --git a/CSS/themes/nzbhydra2/dark.css b/CSS/base/nzbhydra2/dark.css
similarity index 100%
rename from CSS/themes/nzbhydra2/dark.css
rename to CSS/base/nzbhydra2/dark.css
diff --git a/CSS/themes/nzbhydra2/dracula.css b/CSS/base/nzbhydra2/dracula.css
similarity index 100%
rename from CSS/themes/nzbhydra2/dracula.css
rename to CSS/base/nzbhydra2/dracula.css
diff --git a/CSS/themes/nzbhydra2/hotline.css b/CSS/base/nzbhydra2/hotline.css
similarity index 100%
rename from CSS/themes/nzbhydra2/hotline.css
rename to CSS/base/nzbhydra2/hotline.css
diff --git a/CSS/themes/nzbhydra2/nzbhydra2-base.css b/CSS/base/nzbhydra2/nzbhydra2-base.css
similarity index 100%
rename from CSS/themes/nzbhydra2/nzbhydra2-base.css
rename to CSS/base/nzbhydra2/nzbhydra2-base.css
diff --git a/CSS/themes/nzbhydra2/organizr-dark.css b/CSS/base/nzbhydra2/organizr-dark.css
similarity index 100%
rename from CSS/themes/nzbhydra2/organizr-dark.css
rename to CSS/base/nzbhydra2/organizr-dark.css
diff --git a/CSS/themes/nzbhydra2/plex.css b/CSS/base/nzbhydra2/plex.css
similarity index 100%
rename from CSS/themes/nzbhydra2/plex.css
rename to CSS/base/nzbhydra2/plex.css
diff --git a/CSS/themes/nzbhydra2/space-gray.css b/CSS/base/nzbhydra2/space-gray.css
similarity index 100%
rename from CSS/themes/nzbhydra2/space-gray.css
rename to CSS/base/nzbhydra2/space-gray.css
diff --git a/CSS/themes/ombi/aquamarine.css b/CSS/base/ombi/aquamarine.css
similarity index 100%
rename from CSS/themes/ombi/aquamarine.css
rename to CSS/base/ombi/aquamarine.css
diff --git a/CSS/themes/ombi/dark.css b/CSS/base/ombi/dark.css
similarity index 100%
rename from CSS/themes/ombi/dark.css
rename to CSS/base/ombi/dark.css
diff --git a/CSS/themes/ombi/dracula.css b/CSS/base/ombi/dracula.css
similarity index 100%
rename from CSS/themes/ombi/dracula.css
rename to CSS/base/ombi/dracula.css
diff --git a/CSS/themes/ombi/hotline.css b/CSS/base/ombi/hotline.css
similarity index 100%
rename from CSS/themes/ombi/hotline.css
rename to CSS/base/ombi/hotline.css
diff --git a/CSS/themes/ombi/ombi-base.css b/CSS/base/ombi/ombi-base.css
similarity index 100%
rename from CSS/themes/ombi/ombi-base.css
rename to CSS/base/ombi/ombi-base.css
diff --git a/CSS/themes/ombi/organizr-dark.css b/CSS/base/ombi/organizr-dark.css
similarity index 100%
rename from CSS/themes/ombi/organizr-dark.css
rename to CSS/base/ombi/organizr-dark.css
diff --git a/CSS/themes/ombi/plex.css b/CSS/base/ombi/plex.css
similarity index 100%
rename from CSS/themes/ombi/plex.css
rename to CSS/base/ombi/plex.css
diff --git a/CSS/themes/ombi/space-gray.css b/CSS/base/ombi/space-gray.css
similarity index 100%
rename from CSS/themes/ombi/space-gray.css
rename to CSS/base/ombi/space-gray.css
diff --git a/CSS/themes/organizr/aquamarine.css b/CSS/base/organizr/aquamarine.css
similarity index 100%
rename from CSS/themes/organizr/aquamarine.css
rename to CSS/base/organizr/aquamarine.css
diff --git a/CSS/themes/organizr/dark.css b/CSS/base/organizr/dark.css
similarity index 100%
rename from CSS/themes/organizr/dark.css
rename to CSS/base/organizr/dark.css
diff --git a/CSS/themes/organizr/dracula.css b/CSS/base/organizr/dracula.css
similarity index 100%
rename from CSS/themes/organizr/dracula.css
rename to CSS/base/organizr/dracula.css
diff --git a/CSS/themes/organizr/hotline.css b/CSS/base/organizr/hotline.css
similarity index 100%
rename from CSS/themes/organizr/hotline.css
rename to CSS/base/organizr/hotline.css
diff --git a/CSS/themes/organizr/organizr-base-old.css b/CSS/base/organizr/organizr-base-old.css
similarity index 100%
rename from CSS/themes/organizr/organizr-base-old.css
rename to CSS/base/organizr/organizr-base-old.css
diff --git a/CSS/themes/organizr/organizr-base.css b/CSS/base/organizr/organizr-base.css
similarity index 100%
rename from CSS/themes/organizr/organizr-base.css
rename to CSS/base/organizr/organizr-base.css
diff --git a/CSS/themes/organizr/plex.css b/CSS/base/organizr/plex.css
similarity index 100%
rename from CSS/themes/organizr/plex.css
rename to CSS/base/organizr/plex.css
diff --git a/CSS/themes/organizr/space-gray.css b/CSS/base/organizr/space-gray.css
similarity index 100%
rename from CSS/themes/organizr/space-gray.css
rename to CSS/base/organizr/space-gray.css
diff --git a/CSS/themes/overseerr/overseerr-base.css b/CSS/base/overseerr/overseerr-base.css
similarity index 100%
rename from CSS/themes/overseerr/overseerr-base.css
rename to CSS/base/overseerr/overseerr-base.css
diff --git a/CSS/themes/petio/aquamarine.css b/CSS/base/petio/aquamarine.css
similarity index 100%
rename from CSS/themes/petio/aquamarine.css
rename to CSS/base/petio/aquamarine.css
diff --git a/CSS/themes/petio/dark.css b/CSS/base/petio/dark.css
similarity index 100%
rename from CSS/themes/petio/dark.css
rename to CSS/base/petio/dark.css
diff --git a/CSS/themes/petio/dracula.css b/CSS/base/petio/dracula.css
similarity index 100%
rename from CSS/themes/petio/dracula.css
rename to CSS/base/petio/dracula.css
diff --git a/CSS/themes/petio/hotline.css b/CSS/base/petio/hotline.css
similarity index 100%
rename from CSS/themes/petio/hotline.css
rename to CSS/base/petio/hotline.css
diff --git a/CSS/themes/petio/organizr-dark.css b/CSS/base/petio/organizr-dark.css
similarity index 100%
rename from CSS/themes/petio/organizr-dark.css
rename to CSS/base/petio/organizr-dark.css
diff --git a/CSS/themes/petio/petio-base.css b/CSS/base/petio/petio-base.css
similarity index 100%
rename from CSS/themes/petio/petio-base.css
rename to CSS/base/petio/petio-base.css
diff --git a/CSS/themes/petio/plex.css b/CSS/base/petio/plex.css
similarity index 100%
rename from CSS/themes/petio/plex.css
rename to CSS/base/petio/plex.css
diff --git a/CSS/themes/petio/space-gray.css b/CSS/base/petio/space-gray.css
similarity index 100%
rename from CSS/themes/petio/space-gray.css
rename to CSS/base/petio/space-gray.css
diff --git a/CSS/themes/pihole/aquamarine.css b/CSS/base/pihole/aquamarine.css
similarity index 100%
rename from CSS/themes/pihole/aquamarine.css
rename to CSS/base/pihole/aquamarine.css
diff --git a/CSS/themes/pihole/dark.css b/CSS/base/pihole/dark.css
similarity index 100%
rename from CSS/themes/pihole/dark.css
rename to CSS/base/pihole/dark.css
diff --git a/CSS/themes/pihole/dracula.css b/CSS/base/pihole/dracula.css
similarity index 100%
rename from CSS/themes/pihole/dracula.css
rename to CSS/base/pihole/dracula.css
diff --git a/CSS/themes/pihole/hotline.css b/CSS/base/pihole/hotline.css
similarity index 100%
rename from CSS/themes/pihole/hotline.css
rename to CSS/base/pihole/hotline.css
diff --git a/CSS/themes/pihole/organizr-dark.css b/CSS/base/pihole/organizr-dark.css
similarity index 100%
rename from CSS/themes/pihole/organizr-dark.css
rename to CSS/base/pihole/organizr-dark.css
diff --git a/CSS/themes/pihole/pihole-base.css b/CSS/base/pihole/pihole-base.css
similarity index 100%
rename from CSS/themes/pihole/pihole-base.css
rename to CSS/base/pihole/pihole-base.css
diff --git a/CSS/themes/pihole/plex.css b/CSS/base/pihole/plex.css
similarity index 100%
rename from CSS/themes/pihole/plex.css
rename to CSS/base/pihole/plex.css
diff --git a/CSS/themes/pihole/space-gray.css b/CSS/base/pihole/space-gray.css
similarity index 100%
rename from CSS/themes/pihole/space-gray.css
rename to CSS/base/pihole/space-gray.css
diff --git a/CSS/themes/plex/aquamarine.css b/CSS/base/plex/aquamarine.css
similarity index 100%
rename from CSS/themes/plex/aquamarine.css
rename to CSS/base/plex/aquamarine.css
diff --git a/CSS/themes/plex/dark.css b/CSS/base/plex/dark.css
similarity index 100%
rename from CSS/themes/plex/dark.css
rename to CSS/base/plex/dark.css
diff --git a/CSS/themes/plex/dracula.css b/CSS/base/plex/dracula.css
similarity index 100%
rename from CSS/themes/plex/dracula.css
rename to CSS/base/plex/dracula.css
diff --git a/CSS/themes/plex/hotline.css b/CSS/base/plex/hotline.css
similarity index 100%
rename from CSS/themes/plex/hotline.css
rename to CSS/base/plex/hotline.css
diff --git a/CSS/themes/plex/organizr-dark.css b/CSS/base/plex/organizr-dark.css
similarity index 100%
rename from CSS/themes/plex/organizr-dark.css
rename to CSS/base/plex/organizr-dark.css
diff --git a/CSS/themes/plex/plex-base.css b/CSS/base/plex/plex-base.css
similarity index 100%
rename from CSS/themes/plex/plex-base.css
rename to CSS/base/plex/plex-base.css
diff --git a/CSS/themes/plex/space-gray.css b/CSS/base/plex/space-gray.css
similarity index 100%
rename from CSS/themes/plex/space-gray.css
rename to CSS/base/plex/space-gray.css
diff --git a/CSS/themes/plpp/.deprecated b/CSS/base/plpp/.deprecated
similarity index 100%
rename from CSS/themes/plpp/.deprecated
rename to CSS/base/plpp/.deprecated
diff --git a/CSS/themes/plpp/aquamarine.css b/CSS/base/plpp/aquamarine.css
similarity index 100%
rename from CSS/themes/plpp/aquamarine.css
rename to CSS/base/plpp/aquamarine.css
diff --git a/CSS/themes/plpp/dark.css b/CSS/base/plpp/dark.css
similarity index 100%
rename from CSS/themes/plpp/dark.css
rename to CSS/base/plpp/dark.css
diff --git a/CSS/themes/plpp/hotline.css b/CSS/base/plpp/hotline.css
similarity index 100%
rename from CSS/themes/plpp/hotline.css
rename to CSS/base/plpp/hotline.css
diff --git a/CSS/themes/plpp/organizr-dark.css b/CSS/base/plpp/organizr-dark.css
similarity index 100%
rename from CSS/themes/plpp/organizr-dark.css
rename to CSS/base/plpp/organizr-dark.css
diff --git a/CSS/themes/plpp/plex.css b/CSS/base/plpp/plex.css
similarity index 100%
rename from CSS/themes/plpp/plex.css
rename to CSS/base/plpp/plex.css
diff --git a/CSS/themes/plpp/plpp-base.css b/CSS/base/plpp/plpp-base.css
similarity index 100%
rename from CSS/themes/plpp/plpp-base.css
rename to CSS/base/plpp/plpp-base.css
diff --git a/CSS/themes/plpp/space-gray.css b/CSS/base/plpp/space-gray.css
similarity index 100%
rename from CSS/themes/plpp/space-gray.css
rename to CSS/base/plpp/space-gray.css
diff --git a/CSS/themes/portainer/aquamarine.css b/CSS/base/portainer/aquamarine.css
similarity index 100%
rename from CSS/themes/portainer/aquamarine.css
rename to CSS/base/portainer/aquamarine.css
diff --git a/CSS/themes/portainer/dark.css b/CSS/base/portainer/dark.css
similarity index 100%
rename from CSS/themes/portainer/dark.css
rename to CSS/base/portainer/dark.css
diff --git a/CSS/themes/portainer/dracula.css b/CSS/base/portainer/dracula.css
similarity index 100%
rename from CSS/themes/portainer/dracula.css
rename to CSS/base/portainer/dracula.css
diff --git a/CSS/themes/portainer/hotline.css b/CSS/base/portainer/hotline.css
similarity index 100%
rename from CSS/themes/portainer/hotline.css
rename to CSS/base/portainer/hotline.css
diff --git a/CSS/themes/portainer/organizr-dark.css b/CSS/base/portainer/organizr-dark.css
similarity index 100%
rename from CSS/themes/portainer/organizr-dark.css
rename to CSS/base/portainer/organizr-dark.css
diff --git a/CSS/themes/portainer/plex.css b/CSS/base/portainer/plex.css
similarity index 100%
rename from CSS/themes/portainer/plex.css
rename to CSS/base/portainer/plex.css
diff --git a/CSS/themes/portainer/portainer-base.css b/CSS/base/portainer/portainer-base.css
similarity index 100%
rename from CSS/themes/portainer/portainer-base.css
rename to CSS/base/portainer/portainer-base.css
diff --git a/CSS/themes/portainer/space-gray.css b/CSS/base/portainer/space-gray.css
similarity index 100%
rename from CSS/themes/portainer/space-gray.css
rename to CSS/base/portainer/space-gray.css
diff --git a/CSS/themes/prowlarr/aquamarine.css b/CSS/base/prowlarr/aquamarine.css
similarity index 100%
rename from CSS/themes/prowlarr/aquamarine.css
rename to CSS/base/prowlarr/aquamarine.css
diff --git a/CSS/themes/prowlarr/dark.css b/CSS/base/prowlarr/dark.css
similarity index 100%
rename from CSS/themes/prowlarr/dark.css
rename to CSS/base/prowlarr/dark.css
diff --git a/CSS/themes/prowlarr/dracula.css b/CSS/base/prowlarr/dracula.css
similarity index 100%
rename from CSS/themes/prowlarr/dracula.css
rename to CSS/base/prowlarr/dracula.css
diff --git a/CSS/themes/prowlarr/hotline.css b/CSS/base/prowlarr/hotline.css
similarity index 100%
rename from CSS/themes/prowlarr/hotline.css
rename to CSS/base/prowlarr/hotline.css
diff --git a/CSS/themes/prowlarr/organizr-dark.css b/CSS/base/prowlarr/organizr-dark.css
similarity index 100%
rename from CSS/themes/prowlarr/organizr-dark.css
rename to CSS/base/prowlarr/organizr-dark.css
diff --git a/CSS/themes/prowlarr/plex.css b/CSS/base/prowlarr/plex.css
similarity index 100%
rename from CSS/themes/prowlarr/plex.css
rename to CSS/base/prowlarr/plex.css
diff --git a/CSS/themes/prowlarr/prowlarr-base.css b/CSS/base/prowlarr/prowlarr-base.css
similarity index 100%
rename from CSS/themes/prowlarr/prowlarr-base.css
rename to CSS/base/prowlarr/prowlarr-base.css
diff --git a/CSS/themes/prowlarr/space-gray.css b/CSS/base/prowlarr/space-gray.css
similarity index 100%
rename from CSS/themes/prowlarr/space-gray.css
rename to CSS/base/prowlarr/space-gray.css
diff --git a/CSS/themes/qbittorrent/aquamarine.css b/CSS/base/qbittorrent/aquamarine.css
similarity index 100%
rename from CSS/themes/qbittorrent/aquamarine.css
rename to CSS/base/qbittorrent/aquamarine.css
diff --git a/CSS/themes/qbittorrent/dark.css b/CSS/base/qbittorrent/dark.css
similarity index 100%
rename from CSS/themes/qbittorrent/dark.css
rename to CSS/base/qbittorrent/dark.css
diff --git a/CSS/themes/qbittorrent/dracula.css b/CSS/base/qbittorrent/dracula.css
similarity index 100%
rename from CSS/themes/qbittorrent/dracula.css
rename to CSS/base/qbittorrent/dracula.css
diff --git a/CSS/themes/qbittorrent/hotline.css b/CSS/base/qbittorrent/hotline.css
similarity index 100%
rename from CSS/themes/qbittorrent/hotline.css
rename to CSS/base/qbittorrent/hotline.css
diff --git a/CSS/themes/qbittorrent/organizr-dark.css b/CSS/base/qbittorrent/organizr-dark.css
similarity index 100%
rename from CSS/themes/qbittorrent/organizr-dark.css
rename to CSS/base/qbittorrent/organizr-dark.css
diff --git a/CSS/themes/qbittorrent/plex.css b/CSS/base/qbittorrent/plex.css
similarity index 100%
rename from CSS/themes/qbittorrent/plex.css
rename to CSS/base/qbittorrent/plex.css
diff --git a/CSS/themes/qbittorrent/qbittorrent-base.css b/CSS/base/qbittorrent/qbittorrent-base.css
similarity index 100%
rename from CSS/themes/qbittorrent/qbittorrent-base.css
rename to CSS/base/qbittorrent/qbittorrent-base.css
diff --git a/CSS/themes/qbittorrent/space-gray.css b/CSS/base/qbittorrent/space-gray.css
similarity index 100%
rename from CSS/themes/qbittorrent/space-gray.css
rename to CSS/base/qbittorrent/space-gray.css
diff --git a/CSS/themes/radarr/aquamarine.css b/CSS/base/radarr/aquamarine.css
similarity index 100%
rename from CSS/themes/radarr/aquamarine.css
rename to CSS/base/radarr/aquamarine.css
diff --git a/CSS/themes/radarr/dark.css b/CSS/base/radarr/dark.css
similarity index 100%
rename from CSS/themes/radarr/dark.css
rename to CSS/base/radarr/dark.css
diff --git a/CSS/themes/radarr/dracula.css b/CSS/base/radarr/dracula.css
similarity index 100%
rename from CSS/themes/radarr/dracula.css
rename to CSS/base/radarr/dracula.css
diff --git a/CSS/themes/radarr/hotline.css b/CSS/base/radarr/hotline.css
similarity index 100%
rename from CSS/themes/radarr/hotline.css
rename to CSS/base/radarr/hotline.css
diff --git a/CSS/themes/radarr/organizr-dark.css b/CSS/base/radarr/organizr-dark.css
similarity index 100%
rename from CSS/themes/radarr/organizr-dark.css
rename to CSS/base/radarr/organizr-dark.css
diff --git a/CSS/themes/radarr/plex.css b/CSS/base/radarr/plex.css
similarity index 100%
rename from CSS/themes/radarr/plex.css
rename to CSS/base/radarr/plex.css
diff --git a/CSS/themes/radarr/radarr-base.css b/CSS/base/radarr/radarr-base.css
similarity index 100%
rename from CSS/themes/radarr/radarr-base.css
rename to CSS/base/radarr/radarr-base.css
diff --git a/CSS/themes/radarr/radarrv2.css b/CSS/base/radarr/radarrv2.css
similarity index 100%
rename from CSS/themes/radarr/radarrv2.css
rename to CSS/base/radarr/radarrv2.css
diff --git a/CSS/themes/radarr/space-gray.css b/CSS/base/radarr/space-gray.css
similarity index 100%
rename from CSS/themes/radarr/space-gray.css
rename to CSS/base/radarr/space-gray.css
diff --git a/CSS/themes/readarr/aquamarine.css b/CSS/base/readarr/aquamarine.css
similarity index 100%
rename from CSS/themes/readarr/aquamarine.css
rename to CSS/base/readarr/aquamarine.css
diff --git a/CSS/themes/readarr/dark.css b/CSS/base/readarr/dark.css
similarity index 100%
rename from CSS/themes/readarr/dark.css
rename to CSS/base/readarr/dark.css
diff --git a/CSS/themes/readarr/dracula.css b/CSS/base/readarr/dracula.css
similarity index 100%
rename from CSS/themes/readarr/dracula.css
rename to CSS/base/readarr/dracula.css
diff --git a/CSS/themes/readarr/hotline.css b/CSS/base/readarr/hotline.css
similarity index 100%
rename from CSS/themes/readarr/hotline.css
rename to CSS/base/readarr/hotline.css
diff --git a/CSS/themes/readarr/organizr-dark.css b/CSS/base/readarr/organizr-dark.css
similarity index 100%
rename from CSS/themes/readarr/organizr-dark.css
rename to CSS/base/readarr/organizr-dark.css
diff --git a/CSS/themes/readarr/plex.css b/CSS/base/readarr/plex.css
similarity index 100%
rename from CSS/themes/readarr/plex.css
rename to CSS/base/readarr/plex.css
diff --git a/CSS/themes/readarr/readarr-base.css b/CSS/base/readarr/readarr-base.css
similarity index 100%
rename from CSS/themes/readarr/readarr-base.css
rename to CSS/base/readarr/readarr-base.css
diff --git a/CSS/themes/readarr/space-gray.css b/CSS/base/readarr/space-gray.css
similarity index 100%
rename from CSS/themes/readarr/space-gray.css
rename to CSS/base/readarr/space-gray.css
diff --git a/CSS/themes/requestrr/aquamarine.css b/CSS/base/requestrr/aquamarine.css
similarity index 100%
rename from CSS/themes/requestrr/aquamarine.css
rename to CSS/base/requestrr/aquamarine.css
diff --git a/CSS/themes/requestrr/dark.css b/CSS/base/requestrr/dark.css
similarity index 100%
rename from CSS/themes/requestrr/dark.css
rename to CSS/base/requestrr/dark.css
diff --git a/CSS/themes/requestrr/dracula.css b/CSS/base/requestrr/dracula.css
similarity index 100%
rename from CSS/themes/requestrr/dracula.css
rename to CSS/base/requestrr/dracula.css
diff --git a/CSS/themes/requestrr/hotline.css b/CSS/base/requestrr/hotline.css
similarity index 100%
rename from CSS/themes/requestrr/hotline.css
rename to CSS/base/requestrr/hotline.css
diff --git a/CSS/themes/requestrr/organizr-dark.css b/CSS/base/requestrr/organizr-dark.css
similarity index 100%
rename from CSS/themes/requestrr/organizr-dark.css
rename to CSS/base/requestrr/organizr-dark.css
diff --git a/CSS/themes/requestrr/plex.css b/CSS/base/requestrr/plex.css
similarity index 100%
rename from CSS/themes/requestrr/plex.css
rename to CSS/base/requestrr/plex.css
diff --git a/CSS/themes/requestrr/requestrr-base.css b/CSS/base/requestrr/requestrr-base.css
similarity index 100%
rename from CSS/themes/requestrr/requestrr-base.css
rename to CSS/base/requestrr/requestrr-base.css
diff --git a/CSS/themes/requestrr/space-gray.css b/CSS/base/requestrr/space-gray.css
similarity index 100%
rename from CSS/themes/requestrr/space-gray.css
rename to CSS/base/requestrr/space-gray.css
diff --git a/CSS/themes/resilio-sync/aquamarine.css b/CSS/base/resilio-sync/aquamarine.css
similarity index 100%
rename from CSS/themes/resilio-sync/aquamarine.css
rename to CSS/base/resilio-sync/aquamarine.css
diff --git a/CSS/themes/resilio-sync/dark.css b/CSS/base/resilio-sync/dark.css
similarity index 100%
rename from CSS/themes/resilio-sync/dark.css
rename to CSS/base/resilio-sync/dark.css
diff --git a/CSS/themes/resilio-sync/dracula.css b/CSS/base/resilio-sync/dracula.css
similarity index 100%
rename from CSS/themes/resilio-sync/dracula.css
rename to CSS/base/resilio-sync/dracula.css
diff --git a/CSS/themes/resilio-sync/hotline.css b/CSS/base/resilio-sync/hotline.css
similarity index 100%
rename from CSS/themes/resilio-sync/hotline.css
rename to CSS/base/resilio-sync/hotline.css
diff --git a/CSS/themes/resilio-sync/organizr-dark.css b/CSS/base/resilio-sync/organizr-dark.css
similarity index 100%
rename from CSS/themes/resilio-sync/organizr-dark.css
rename to CSS/base/resilio-sync/organizr-dark.css
diff --git a/CSS/themes/resilio-sync/plex.css b/CSS/base/resilio-sync/plex.css
similarity index 100%
rename from CSS/themes/resilio-sync/plex.css
rename to CSS/base/resilio-sync/plex.css
diff --git a/CSS/themes/resilio-sync/resilio-sync-base.css b/CSS/base/resilio-sync/resilio-sync-base.css
similarity index 100%
rename from CSS/themes/resilio-sync/resilio-sync-base.css
rename to CSS/base/resilio-sync/resilio-sync-base.css
diff --git a/CSS/themes/resilio-sync/space-gray.css b/CSS/base/resilio-sync/space-gray.css
similarity index 100%
rename from CSS/themes/resilio-sync/space-gray.css
rename to CSS/base/resilio-sync/space-gray.css
diff --git a/CSS/themes/rutorrent/aquamarine.css b/CSS/base/rutorrent/aquamarine.css
similarity index 100%
rename from CSS/themes/rutorrent/aquamarine.css
rename to CSS/base/rutorrent/aquamarine.css
diff --git a/CSS/themes/rutorrent/dark.css b/CSS/base/rutorrent/dark.css
similarity index 100%
rename from CSS/themes/rutorrent/dark.css
rename to CSS/base/rutorrent/dark.css
diff --git a/CSS/themes/rutorrent/dracula.css b/CSS/base/rutorrent/dracula.css
similarity index 100%
rename from CSS/themes/rutorrent/dracula.css
rename to CSS/base/rutorrent/dracula.css
diff --git a/CSS/themes/rutorrent/hotline.css b/CSS/base/rutorrent/hotline.css
similarity index 100%
rename from CSS/themes/rutorrent/hotline.css
rename to CSS/base/rutorrent/hotline.css
diff --git a/CSS/themes/rutorrent/organizr-dark.css b/CSS/base/rutorrent/organizr-dark.css
similarity index 100%
rename from CSS/themes/rutorrent/organizr-dark.css
rename to CSS/base/rutorrent/organizr-dark.css
diff --git a/CSS/themes/rutorrent/plex.css b/CSS/base/rutorrent/plex.css
similarity index 100%
rename from CSS/themes/rutorrent/plex.css
rename to CSS/base/rutorrent/plex.css
diff --git a/CSS/themes/rutorrent/rutorrent-base.css b/CSS/base/rutorrent/rutorrent-base.css
similarity index 100%
rename from CSS/themes/rutorrent/rutorrent-base.css
rename to CSS/base/rutorrent/rutorrent-base.css
diff --git a/CSS/themes/rutorrent/space-gray.css b/CSS/base/rutorrent/space-gray.css
similarity index 100%
rename from CSS/themes/rutorrent/space-gray.css
rename to CSS/base/rutorrent/space-gray.css
diff --git a/CSS/themes/sabnzbd/aquamarine.css b/CSS/base/sabnzbd/aquamarine.css
similarity index 100%
rename from CSS/themes/sabnzbd/aquamarine.css
rename to CSS/base/sabnzbd/aquamarine.css
diff --git a/CSS/themes/sabnzbd/dark.css b/CSS/base/sabnzbd/dark.css
similarity index 100%
rename from CSS/themes/sabnzbd/dark.css
rename to CSS/base/sabnzbd/dark.css
diff --git a/CSS/themes/sabnzbd/dracula.css b/CSS/base/sabnzbd/dracula.css
similarity index 100%
rename from CSS/themes/sabnzbd/dracula.css
rename to CSS/base/sabnzbd/dracula.css
diff --git a/CSS/themes/sabnzbd/hotline.css b/CSS/base/sabnzbd/hotline.css
similarity index 100%
rename from CSS/themes/sabnzbd/hotline.css
rename to CSS/base/sabnzbd/hotline.css
diff --git a/CSS/themes/sabnzbd/organizr-dark.css b/CSS/base/sabnzbd/organizr-dark.css
similarity index 100%
rename from CSS/themes/sabnzbd/organizr-dark.css
rename to CSS/base/sabnzbd/organizr-dark.css
diff --git a/CSS/themes/sabnzbd/plex.css b/CSS/base/sabnzbd/plex.css
similarity index 100%
rename from CSS/themes/sabnzbd/plex.css
rename to CSS/base/sabnzbd/plex.css
diff --git a/CSS/themes/sabnzbd/sabnzbd-base.css b/CSS/base/sabnzbd/sabnzbd-base.css
similarity index 100%
rename from CSS/themes/sabnzbd/sabnzbd-base.css
rename to CSS/base/sabnzbd/sabnzbd-base.css
diff --git a/CSS/themes/sabnzbd/space-gray.css b/CSS/base/sabnzbd/space-gray.css
similarity index 100%
rename from CSS/themes/sabnzbd/space-gray.css
rename to CSS/base/sabnzbd/space-gray.css
diff --git a/CSS/themes/sonarr/aquamarine.css b/CSS/base/sonarr/aquamarine.css
similarity index 100%
rename from CSS/themes/sonarr/aquamarine.css
rename to CSS/base/sonarr/aquamarine.css
diff --git a/CSS/themes/sonarr/dark.css b/CSS/base/sonarr/dark.css
similarity index 100%
rename from CSS/themes/sonarr/dark.css
rename to CSS/base/sonarr/dark.css
diff --git a/CSS/themes/sonarr/dracula.css b/CSS/base/sonarr/dracula.css
similarity index 100%
rename from CSS/themes/sonarr/dracula.css
rename to CSS/base/sonarr/dracula.css
diff --git a/CSS/themes/sonarr/hotline.css b/CSS/base/sonarr/hotline.css
similarity index 100%
rename from CSS/themes/sonarr/hotline.css
rename to CSS/base/sonarr/hotline.css
diff --git a/CSS/themes/sonarr/organizr-dark.css b/CSS/base/sonarr/organizr-dark.css
similarity index 100%
rename from CSS/themes/sonarr/organizr-dark.css
rename to CSS/base/sonarr/organizr-dark.css
diff --git a/CSS/themes/sonarr/plex.css b/CSS/base/sonarr/plex.css
similarity index 100%
rename from CSS/themes/sonarr/plex.css
rename to CSS/base/sonarr/plex.css
diff --git a/CSS/themes/sonarr/sonarr-base.css b/CSS/base/sonarr/sonarr-base.css
similarity index 100%
rename from CSS/themes/sonarr/sonarr-base.css
rename to CSS/base/sonarr/sonarr-base.css
diff --git a/CSS/themes/sonarr/space-gray.css b/CSS/base/sonarr/space-gray.css
similarity index 100%
rename from CSS/themes/sonarr/space-gray.css
rename to CSS/base/sonarr/space-gray.css
diff --git a/CSS/themes/synclounge/aquamarine.css b/CSS/base/synclounge/aquamarine.css
similarity index 100%
rename from CSS/themes/synclounge/aquamarine.css
rename to CSS/base/synclounge/aquamarine.css
diff --git a/CSS/themes/synclounge/dark.css b/CSS/base/synclounge/dark.css
similarity index 100%
rename from CSS/themes/synclounge/dark.css
rename to CSS/base/synclounge/dark.css
diff --git a/CSS/themes/synclounge/hotline.css b/CSS/base/synclounge/hotline.css
similarity index 100%
rename from CSS/themes/synclounge/hotline.css
rename to CSS/base/synclounge/hotline.css
diff --git a/CSS/themes/synclounge/organizr-dark.css b/CSS/base/synclounge/organizr-dark.css
similarity index 100%
rename from CSS/themes/synclounge/organizr-dark.css
rename to CSS/base/synclounge/organizr-dark.css
diff --git a/CSS/themes/synclounge/plex.css b/CSS/base/synclounge/plex.css
similarity index 100%
rename from CSS/themes/synclounge/plex.css
rename to CSS/base/synclounge/plex.css
diff --git a/CSS/themes/synclounge/space-gray.css b/CSS/base/synclounge/space-gray.css
similarity index 100%
rename from CSS/themes/synclounge/space-gray.css
rename to CSS/base/synclounge/space-gray.css
diff --git a/CSS/themes/synclounge/synclounge-base.css b/CSS/base/synclounge/synclounge-base.css
similarity index 100%
rename from CSS/themes/synclounge/synclounge-base.css
rename to CSS/base/synclounge/synclounge-base.css
diff --git a/CSS/themes/tautulli/aquamarine.css b/CSS/base/tautulli/aquamarine.css
similarity index 100%
rename from CSS/themes/tautulli/aquamarine.css
rename to CSS/base/tautulli/aquamarine.css
diff --git a/CSS/themes/tautulli/dark.css b/CSS/base/tautulli/dark.css
similarity index 100%
rename from CSS/themes/tautulli/dark.css
rename to CSS/base/tautulli/dark.css
diff --git a/CSS/themes/tautulli/dracula.css b/CSS/base/tautulli/dracula.css
similarity index 100%
rename from CSS/themes/tautulli/dracula.css
rename to CSS/base/tautulli/dracula.css
diff --git a/CSS/themes/tautulli/hotline.css b/CSS/base/tautulli/hotline.css
similarity index 100%
rename from CSS/themes/tautulli/hotline.css
rename to CSS/base/tautulli/hotline.css
diff --git a/CSS/themes/tautulli/organizr-dark.css b/CSS/base/tautulli/organizr-dark.css
similarity index 100%
rename from CSS/themes/tautulli/organizr-dark.css
rename to CSS/base/tautulli/organizr-dark.css
diff --git a/CSS/themes/tautulli/plex.css b/CSS/base/tautulli/plex.css
similarity index 100%
rename from CSS/themes/tautulli/plex.css
rename to CSS/base/tautulli/plex.css
diff --git a/CSS/themes/tautulli/space-gray.css b/CSS/base/tautulli/space-gray.css
similarity index 100%
rename from CSS/themes/tautulli/space-gray.css
rename to CSS/base/tautulli/space-gray.css
diff --git a/CSS/themes/tautulli/tautulli-base.css b/CSS/base/tautulli/tautulli-base.css
similarity index 100%
rename from CSS/themes/tautulli/tautulli-base.css
rename to CSS/base/tautulli/tautulli-base.css
diff --git a/CSS/themes/thelounge/.deprecated b/CSS/base/thelounge/.deprecated
similarity index 100%
rename from CSS/themes/thelounge/.deprecated
rename to CSS/base/thelounge/.deprecated
diff --git a/CSS/themes/thelounge/aquamarine.css b/CSS/base/thelounge/aquamarine.css
similarity index 100%
rename from CSS/themes/thelounge/aquamarine.css
rename to CSS/base/thelounge/aquamarine.css
diff --git a/CSS/themes/thelounge/dark.css b/CSS/base/thelounge/dark.css
similarity index 100%
rename from CSS/themes/thelounge/dark.css
rename to CSS/base/thelounge/dark.css
diff --git a/CSS/themes/thelounge/hotline.css b/CSS/base/thelounge/hotline.css
similarity index 100%
rename from CSS/themes/thelounge/hotline.css
rename to CSS/base/thelounge/hotline.css
diff --git a/CSS/themes/thelounge/organizr-dark.css b/CSS/base/thelounge/organizr-dark.css
similarity index 100%
rename from CSS/themes/thelounge/organizr-dark.css
rename to CSS/base/thelounge/organizr-dark.css
diff --git a/CSS/themes/thelounge/plex.css b/CSS/base/thelounge/plex.css
similarity index 100%
rename from CSS/themes/thelounge/plex.css
rename to CSS/base/thelounge/plex.css
diff --git a/CSS/themes/thelounge/space-gray.css b/CSS/base/thelounge/space-gray.css
similarity index 100%
rename from CSS/themes/thelounge/space-gray.css
rename to CSS/base/thelounge/space-gray.css
diff --git a/CSS/themes/thelounge/thelounge-base.css b/CSS/base/thelounge/thelounge-base.css
similarity index 100%
rename from CSS/themes/thelounge/thelounge-base.css
rename to CSS/base/thelounge/thelounge-base.css
diff --git a/CSS/themes/transmission/aquamarine.css b/CSS/base/transmission/aquamarine.css
similarity index 100%
rename from CSS/themes/transmission/aquamarine.css
rename to CSS/base/transmission/aquamarine.css
diff --git a/CSS/themes/transmission/dark.css b/CSS/base/transmission/dark.css
similarity index 100%
rename from CSS/themes/transmission/dark.css
rename to CSS/base/transmission/dark.css
diff --git a/CSS/themes/transmission/dracula.css b/CSS/base/transmission/dracula.css
similarity index 100%
rename from CSS/themes/transmission/dracula.css
rename to CSS/base/transmission/dracula.css
diff --git a/CSS/themes/transmission/hotline.css b/CSS/base/transmission/hotline.css
similarity index 100%
rename from CSS/themes/transmission/hotline.css
rename to CSS/base/transmission/hotline.css
diff --git a/CSS/themes/transmission/organizr-dark.css b/CSS/base/transmission/organizr-dark.css
similarity index 100%
rename from CSS/themes/transmission/organizr-dark.css
rename to CSS/base/transmission/organizr-dark.css
diff --git a/CSS/themes/transmission/plex.css b/CSS/base/transmission/plex.css
similarity index 100%
rename from CSS/themes/transmission/plex.css
rename to CSS/base/transmission/plex.css
diff --git a/CSS/themes/transmission/space-gray.css b/CSS/base/transmission/space-gray.css
similarity index 100%
rename from CSS/themes/transmission/space-gray.css
rename to CSS/base/transmission/space-gray.css
diff --git a/CSS/themes/transmission/transmission-base.css b/CSS/base/transmission/transmission-base.css
similarity index 100%
rename from CSS/themes/transmission/transmission-base.css
rename to CSS/base/transmission/transmission-base.css
diff --git a/CSS/themes/unraid/aquamarine.css b/CSS/base/unraid/aquamarine.css
similarity index 100%
rename from CSS/themes/unraid/aquamarine.css
rename to CSS/base/unraid/aquamarine.css
diff --git a/CSS/themes/unraid/dark.css b/CSS/base/unraid/dark.css
similarity index 100%
rename from CSS/themes/unraid/dark.css
rename to CSS/base/unraid/dark.css
diff --git a/CSS/themes/unraid/dracula.css b/CSS/base/unraid/dracula.css
similarity index 100%
rename from CSS/themes/unraid/dracula.css
rename to CSS/base/unraid/dracula.css
diff --git a/CSS/themes/unraid/hotline.css b/CSS/base/unraid/hotline.css
similarity index 100%
rename from CSS/themes/unraid/hotline.css
rename to CSS/base/unraid/hotline.css
diff --git a/CSS/themes/unraid/organizr-dark.css b/CSS/base/unraid/organizr-dark.css
similarity index 100%
rename from CSS/themes/unraid/organizr-dark.css
rename to CSS/base/unraid/organizr-dark.css
diff --git a/CSS/themes/unraid/plex.css b/CSS/base/unraid/plex.css
similarity index 100%
rename from CSS/themes/unraid/plex.css
rename to CSS/base/unraid/plex.css
diff --git a/CSS/themes/unraid/space-gray.css b/CSS/base/unraid/space-gray.css
similarity index 100%
rename from CSS/themes/unraid/space-gray.css
rename to CSS/base/unraid/space-gray.css
diff --git a/CSS/themes/unraid/unraid-base.css b/CSS/base/unraid/unraid-base.css
similarity index 100%
rename from CSS/themes/unraid/unraid-base.css
rename to CSS/base/unraid/unraid-base.css
diff --git a/CSS/themes/uptime-kuma/uptime-kuma-base.css b/CSS/base/uptime-kuma/uptime-kuma-base.css
similarity index 100%
rename from CSS/themes/uptime-kuma/uptime-kuma-base.css
rename to CSS/base/uptime-kuma/uptime-kuma-base.css
diff --git a/CSS/themes/vuetorrent/aquamarine.css b/CSS/base/vuetorrent/aquamarine.css
similarity index 100%
rename from CSS/themes/vuetorrent/aquamarine.css
rename to CSS/base/vuetorrent/aquamarine.css
diff --git a/CSS/themes/vuetorrent/dark.css b/CSS/base/vuetorrent/dark.css
similarity index 100%
rename from CSS/themes/vuetorrent/dark.css
rename to CSS/base/vuetorrent/dark.css
diff --git a/CSS/themes/vuetorrent/dracula.css b/CSS/base/vuetorrent/dracula.css
similarity index 100%
rename from CSS/themes/vuetorrent/dracula.css
rename to CSS/base/vuetorrent/dracula.css
diff --git a/CSS/themes/vuetorrent/hotline.css b/CSS/base/vuetorrent/hotline.css
similarity index 100%
rename from CSS/themes/vuetorrent/hotline.css
rename to CSS/base/vuetorrent/hotline.css
diff --git a/CSS/themes/vuetorrent/organizr-dark.css b/CSS/base/vuetorrent/organizr-dark.css
similarity index 100%
rename from CSS/themes/vuetorrent/organizr-dark.css
rename to CSS/base/vuetorrent/organizr-dark.css
diff --git a/CSS/themes/vuetorrent/plex.css b/CSS/base/vuetorrent/plex.css
similarity index 100%
rename from CSS/themes/vuetorrent/plex.css
rename to CSS/base/vuetorrent/plex.css
diff --git a/CSS/themes/vuetorrent/space-gray.css b/CSS/base/vuetorrent/space-gray.css
similarity index 100%
rename from CSS/themes/vuetorrent/space-gray.css
rename to CSS/base/vuetorrent/space-gray.css
diff --git a/CSS/themes/vuetorrent/vuetorrent-base.css b/CSS/base/vuetorrent/vuetorrent-base.css
similarity index 100%
rename from CSS/themes/vuetorrent/vuetorrent-base.css
rename to CSS/base/vuetorrent/vuetorrent-base.css
diff --git a/CSS/themes/webtools/.deprecated b/CSS/base/webtools/.deprecated
similarity index 100%
rename from CSS/themes/webtools/.deprecated
rename to CSS/base/webtools/.deprecated
diff --git a/CSS/themes/webtools/aquamarine.css b/CSS/base/webtools/aquamarine.css
similarity index 100%
rename from CSS/themes/webtools/aquamarine.css
rename to CSS/base/webtools/aquamarine.css
diff --git a/CSS/themes/webtools/dark.css b/CSS/base/webtools/dark.css
similarity index 100%
rename from CSS/themes/webtools/dark.css
rename to CSS/base/webtools/dark.css
diff --git a/CSS/themes/webtools/hotline.css b/CSS/base/webtools/hotline.css
similarity index 100%
rename from CSS/themes/webtools/hotline.css
rename to CSS/base/webtools/hotline.css
diff --git a/CSS/themes/webtools/organizr-dark.css b/CSS/base/webtools/organizr-dark.css
similarity index 100%
rename from CSS/themes/webtools/organizr-dark.css
rename to CSS/base/webtools/organizr-dark.css
diff --git a/CSS/themes/webtools/plex.css b/CSS/base/webtools/plex.css
similarity index 100%
rename from CSS/themes/webtools/plex.css
rename to CSS/base/webtools/plex.css
diff --git a/CSS/themes/webtools/space-gray.css b/CSS/base/webtools/space-gray.css
similarity index 100%
rename from CSS/themes/webtools/space-gray.css
rename to CSS/base/webtools/space-gray.css
diff --git a/CSS/themes/webtools/webtools-base.css b/CSS/base/webtools/webtools-base.css
similarity index 100%
rename from CSS/themes/webtools/webtools-base.css
rename to CSS/base/webtools/webtools-base.css
diff --git a/CSS/themes/xbackbone/aquamarine.css b/CSS/base/xbackbone/aquamarine.css
similarity index 100%
rename from CSS/themes/xbackbone/aquamarine.css
rename to CSS/base/xbackbone/aquamarine.css
diff --git a/CSS/themes/xbackbone/dark.css b/CSS/base/xbackbone/dark.css
similarity index 100%
rename from CSS/themes/xbackbone/dark.css
rename to CSS/base/xbackbone/dark.css
diff --git a/CSS/themes/xbackbone/dracula.css b/CSS/base/xbackbone/dracula.css
similarity index 100%
rename from CSS/themes/xbackbone/dracula.css
rename to CSS/base/xbackbone/dracula.css
diff --git a/CSS/themes/xbackbone/hotline.css b/CSS/base/xbackbone/hotline.css
similarity index 100%
rename from CSS/themes/xbackbone/hotline.css
rename to CSS/base/xbackbone/hotline.css
diff --git a/CSS/themes/xbackbone/organizr-dark.css b/CSS/base/xbackbone/organizr-dark.css
similarity index 100%
rename from CSS/themes/xbackbone/organizr-dark.css
rename to CSS/base/xbackbone/organizr-dark.css
diff --git a/CSS/themes/xbackbone/plex.css b/CSS/base/xbackbone/plex.css
similarity index 100%
rename from CSS/themes/xbackbone/plex.css
rename to CSS/base/xbackbone/plex.css
diff --git a/CSS/themes/xbackbone/space-gray.css b/CSS/base/xbackbone/space-gray.css
similarity index 100%
rename from CSS/themes/xbackbone/space-gray.css
rename to CSS/base/xbackbone/space-gray.css
diff --git a/CSS/themes/xbackbone/xbackbone-base.css b/CSS/base/xbackbone/xbackbone-base.css
similarity index 100%
rename from CSS/themes/xbackbone/xbackbone-base.css
rename to CSS/base/xbackbone/xbackbone-base.css
diff --git a/CSS/variables/blackberry-abyss.css b/CSS/community-theme-options/blackberry-abyss.css
similarity index 100%
rename from CSS/variables/blackberry-abyss.css
rename to CSS/community-theme-options/blackberry-abyss.css
diff --git a/CSS/variables/blackberry-amethyst.css b/CSS/community-theme-options/blackberry-amethyst.css
similarity index 100%
rename from CSS/variables/blackberry-amethyst.css
rename to CSS/community-theme-options/blackberry-amethyst.css
diff --git a/CSS/variables/blackberry-carol.css b/CSS/community-theme-options/blackberry-carol.css
similarity index 100%
rename from CSS/variables/blackberry-carol.css
rename to CSS/community-theme-options/blackberry-carol.css
diff --git a/CSS/variables/blackberry-dreamscape.css b/CSS/community-theme-options/blackberry-dreamscape.css
similarity index 100%
rename from CSS/variables/blackberry-dreamscape.css
rename to CSS/community-theme-options/blackberry-dreamscape.css
diff --git a/CSS/variables/blackberry-flamingo.css b/CSS/community-theme-options/blackberry-flamingo.css
similarity index 100%
rename from CSS/variables/blackberry-flamingo.css
rename to CSS/community-theme-options/blackberry-flamingo.css
diff --git a/CSS/variables/blackberry-hearth.css b/CSS/community-theme-options/blackberry-hearth.css
similarity index 100%
rename from CSS/variables/blackberry-hearth.css
rename to CSS/community-theme-options/blackberry-hearth.css
diff --git a/CSS/variables/blackberry-martian.css b/CSS/community-theme-options/blackberry-martian.css
similarity index 100%
rename from CSS/variables/blackberry-martian.css
rename to CSS/community-theme-options/blackberry-martian.css
diff --git a/CSS/variables/blackberry-pumpkin.css b/CSS/community-theme-options/blackberry-pumpkin.css
similarity index 100%
rename from CSS/variables/blackberry-pumpkin.css
rename to CSS/community-theme-options/blackberry-pumpkin.css
diff --git a/CSS/variables/blackberry-royal.css b/CSS/community-theme-options/blackberry-royal.css
similarity index 100%
rename from CSS/variables/blackberry-royal.css
rename to CSS/community-theme-options/blackberry-royal.css
diff --git a/CSS/variables/blackberry-shadow.css b/CSS/community-theme-options/blackberry-shadow.css
similarity index 100%
rename from CSS/variables/blackberry-shadow.css
rename to CSS/community-theme-options/blackberry-shadow.css
diff --git a/CSS/variables/blackberry-solar.css b/CSS/community-theme-options/blackberry-solar.css
similarity index 100%
rename from CSS/variables/blackberry-solar.css
rename to CSS/community-theme-options/blackberry-solar.css
diff --git a/CSS/variables/blackberry-vanta.css b/CSS/community-theme-options/blackberry-vanta.css
similarity index 100%
rename from CSS/variables/blackberry-vanta.css
rename to CSS/community-theme-options/blackberry-vanta.css
diff --git a/CSS/variables/hotline-old.css b/CSS/community-theme-options/hotline-old.css
similarity index 100%
rename from CSS/variables/hotline-old.css
rename to CSS/community-theme-options/hotline-old.css
diff --git a/CSS/variables/mind.css b/CSS/community-theme-options/mind.css
similarity index 100%
rename from CSS/variables/mind.css
rename to CSS/community-theme-options/mind.css
diff --git a/CSS/variables/onedark.css b/CSS/community-theme-options/onedark.css
similarity index 100%
rename from CSS/variables/onedark.css
rename to CSS/community-theme-options/onedark.css
diff --git a/CSS/variables/power.css b/CSS/community-theme-options/power.css
similarity index 100%
rename from CSS/variables/power.css
rename to CSS/community-theme-options/power.css
diff --git a/CSS/variables/reality.css b/CSS/community-theme-options/reality.css
similarity index 100%
rename from CSS/variables/reality.css
rename to CSS/community-theme-options/reality.css
diff --git a/CSS/variables/soul.css b/CSS/community-theme-options/soul.css
similarity index 100%
rename from CSS/variables/soul.css
rename to CSS/community-theme-options/soul.css
diff --git a/CSS/variables/space.css b/CSS/community-theme-options/space.css
similarity index 100%
rename from CSS/variables/space.css
rename to CSS/community-theme-options/space.css
diff --git a/CSS/variables/time.css b/CSS/community-theme-options/time.css
similarity index 100%
rename from CSS/variables/time.css
rename to CSS/community-theme-options/time.css
diff --git a/CSS/variables/aquamarine.css b/CSS/theme-options/aquamarine.css
similarity index 100%
rename from CSS/variables/aquamarine.css
rename to CSS/theme-options/aquamarine.css
diff --git a/CSS/variables/dark.css b/CSS/theme-options/dark.css
similarity index 100%
rename from CSS/variables/dark.css
rename to CSS/theme-options/dark.css
diff --git a/CSS/variables/dracula.css b/CSS/theme-options/dracula.css
similarity index 100%
rename from CSS/variables/dracula.css
rename to CSS/theme-options/dracula.css
diff --git a/CSS/variables/hotline.css b/CSS/theme-options/hotline.css
similarity index 100%
rename from CSS/variables/hotline.css
rename to CSS/theme-options/hotline.css
diff --git a/CSS/variables/hotpink.css b/CSS/theme-options/hotpink.css
similarity index 100%
rename from CSS/variables/hotpink.css
rename to CSS/theme-options/hotpink.css
diff --git a/CSS/variables/nord.css b/CSS/theme-options/nord.css
similarity index 100%
rename from CSS/variables/nord.css
rename to CSS/theme-options/nord.css
diff --git a/CSS/variables/organizr-dark.css b/CSS/theme-options/organizr-dark.css
similarity index 100%
rename from CSS/variables/organizr-dark.css
rename to CSS/theme-options/organizr-dark.css
diff --git a/CSS/variables/organizr.css b/CSS/theme-options/organizr.css
similarity index 100%
rename from CSS/variables/organizr.css
rename to CSS/theme-options/organizr.css
diff --git a/CSS/variables/overseerr.css b/CSS/theme-options/overseerr.css
similarity index 100%
rename from CSS/variables/overseerr.css
rename to CSS/theme-options/overseerr.css
diff --git a/CSS/variables/plex.css b/CSS/theme-options/plex.css
similarity index 100%
rename from CSS/variables/plex.css
rename to CSS/theme-options/plex.css
diff --git a/CSS/variables/space-gray.css b/CSS/theme-options/space-gray.css
similarity index 100%
rename from CSS/variables/space-gray.css
rename to CSS/theme-options/space-gray.css
diff --git a/themes.py b/themes.py
index 9bfe379d..505f9c61 100644
--- a/themes.py
+++ b/themes.py
@@ -59,50 +59,59 @@ def create_addons_json():
     return dumps(ADDONS)
 
 
-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)
+        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(theme_shas)
         for theme in themes:
             THEMES.update({
                 "themes": {
                     theme.split(".")[0].capitalize(): {
-                        "url": f"https://{DOMAIN}/CSS/variables/{theme}?sha={SHAS.get(theme)}"
+                        "url": f"https://{DOMAIN}/CSS/theme-options/{theme}?sha={THEME_SHAS.get(theme)}"
                     }for theme in themes
                 }
             })
+        for theme in community_themes:
+            print(theme)
+            THEMES.update({
+                "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
+                }
+            })
         return dumps(THEMES)
     else:
         ADDONS = loads(create_addons_json())
         APPS = {"applications": {}}
-        app_shas = subprocess.check_output(
-            ["git", "ls-files", "-s", "./CSS/themes/*base.css"])
+        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')}",
+                        "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/themes/{app}/.deprecated')
+                    } for app in app_folders if not isfile(f'./CSS/base/{app}/.deprecated')
                 }
-            }
-            )
-        THEMES = loads(create_json(themes=themes, no_sub_folders=True))
+            })
+        THEMES = loads(create_json(themes=themes, community_themes=community_themes, no_sub_folders=True))
         APPS.update(ADDONS)
         APPS.update(THEMES)
         return dumps(APPS)
 
 
 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))]
+    print(community_themes)
+    with open("CNAME", "rt", closefd=True) as cname:
+        DOMAIN= cname.readline()
+    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)