diff --git a/dbb-css/base/authelia/dbb-plex.css b/dbb/css/base/authelia/dbb-plex.css
similarity index 100%
rename from dbb-css/base/authelia/dbb-plex.css
rename to dbb/css/base/authelia/dbb-plex.css
diff --git a/dbb-css/base/fhdhr/fhdhr-base.css b/dbb/css/base/fhdhr/fhdhr-base.css
similarity index 100%
rename from dbb-css/base/fhdhr/fhdhr-base.css
rename to dbb/css/base/fhdhr/fhdhr-base.css
diff --git a/dbb-css/base/huginn/huginn-base.css b/dbb/css/base/huginn/huginn-base.css
similarity index 100%
rename from dbb-css/base/huginn/huginn-base.css
rename to dbb/css/base/huginn/huginn-base.css
diff --git a/dbb-css/base/mailcow/mailcow-base.css b/dbb/css/base/mailcow/mailcow-base.css
similarity index 100%
rename from dbb-css/base/mailcow/mailcow-base.css
rename to dbb/css/base/mailcow/mailcow-base.css
diff --git a/dbb-css/base/mediawiki-vector/mediawiki-vector-base.css b/dbb/css/base/mediawiki-vector/mediawiki-vector-base.css
similarity index 100%
rename from dbb-css/base/mediawiki-vector/mediawiki-vector-base.css
rename to dbb/css/base/mediawiki-vector/mediawiki-vector-base.css
diff --git a/dbb-css/base/nginx-error-pages/nginx-error-pages-base.css b/dbb/css/base/nginx-error-pages/nginx-error-pages-base.css
similarity index 100%
rename from dbb-css/base/nginx-error-pages/nginx-error-pages-base.css
rename to dbb/css/base/nginx-error-pages/nginx-error-pages-base.css
diff --git a/dbb-css/base/selfoss/selfoss-base.css b/dbb/css/base/selfoss/selfoss-base.css
similarity index 100%
rename from dbb-css/base/selfoss/selfoss-base.css
rename to dbb/css/base/selfoss/selfoss-base.css
diff --git a/dbb-css/base/thelounge/dbb-plex.css b/dbb/css/base/thelounge/dbb-plex.css
similarity index 100%
rename from dbb-css/base/thelounge/dbb-plex.css
rename to dbb/css/base/thelounge/dbb-plex.css
diff --git a/dbb-css/deluge/Deluge-Dark/LICENSE b/dbb/deluge/Deluge-Dark/LICENSE
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/LICENSE
rename to dbb/deluge/Deluge-Dark/LICENSE
diff --git a/dbb-css/deluge/Deluge-Dark/README.md b/dbb/deluge/Deluge-Dark/README.md
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/README.md
rename to dbb/deluge/Deluge-Dark/README.md
diff --git a/dbb-css/deluge/Deluge-Dark/_config.yml b/dbb/deluge/Deluge-Dark/_config.yml
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/_config.yml
rename to dbb/deluge/Deluge-Dark/_config.yml
diff --git a/dbb-css/deluge/Deluge-Dark/deluge.css b/dbb/deluge/Deluge-Dark/deluge.css
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/deluge.css
rename to dbb/deluge/Deluge-Dark/deluge.css
diff --git a/dbb-css/deluge/Deluge-Dark/images/active.png b/dbb/deluge/Deluge-Dark/images/active.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/active.png
rename to dbb/deluge/Deluge-Dark/images/active.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/add.png b/dbb/deluge/Deluge-Dark/images/add.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/add.png
rename to dbb/deluge/Deluge-Dark/images/add.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/add_small.png b/dbb/deluge/Deluge-Dark/images/add_small.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/add_small.png
rename to dbb/deluge/Deluge-Dark/images/add_small.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/all.png b/dbb/deluge/Deluge-Dark/images/all.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/all.png
rename to dbb/deluge/Deluge-Dark/images/all.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/ascending.png b/dbb/deluge/Deluge-Dark/images/ascending.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/ascending.png
rename to dbb/deluge/Deluge-Dark/images/ascending.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/bottom.png b/dbb/deluge/Deluge-Dark/images/bottom.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/bottom.png
rename to dbb/deluge/Deluge-Dark/images/bottom.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/checking.png b/dbb/deluge/Deluge-Dark/images/checking.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/checking.png
rename to dbb/deluge/Deluge-Dark/images/checking.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/columns.png b/dbb/deluge/Deluge-Dark/images/columns.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/columns.png
rename to dbb/deluge/Deluge-Dark/images/columns.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/connection.png b/dbb/deluge/Deluge-Dark/images/connection.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/connection.png
rename to dbb/deluge/Deluge-Dark/images/connection.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/connection_small.png b/dbb/deluge/Deluge-Dark/images/connection_small.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/connection_small.png
rename to dbb/deluge/Deluge-Dark/images/connection_small.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/connections.png b/dbb/deluge/Deluge-Dark/images/connections.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/connections.png
rename to dbb/deluge/Deluge-Dark/images/connections.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/deluge.png b/dbb/deluge/Deluge-Dark/images/deluge.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/deluge.png
rename to dbb/deluge/Deluge-Dark/images/deluge.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/descending.png b/dbb/deluge/Deluge-Dark/images/descending.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/descending.png
rename to dbb/deluge/Deluge-Dark/images/descending.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/dling.png b/dbb/deluge/Deluge-Dark/images/dling.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/dling.png
rename to dbb/deluge/Deluge-Dark/images/dling.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/down.png b/dbb/deluge/Deluge-Dark/images/down.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/down.png
rename to dbb/deluge/Deluge-Dark/images/down.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/down_small.png b/dbb/deluge/Deluge-Dark/images/down_small.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/down_small.png
rename to dbb/deluge/Deluge-Dark/images/down_small.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/edit.png b/dbb/deluge/Deluge-Dark/images/edit.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/edit.png
rename to dbb/deluge/Deluge-Dark/images/edit.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/error.png b/dbb/deluge/Deluge-Dark/images/error.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/error.png
rename to dbb/deluge/Deluge-Dark/images/error.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/file.png b/dbb/deluge/Deluge-Dark/images/file.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/file.png
rename to dbb/deluge/Deluge-Dark/images/file.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/folder.png b/dbb/deluge/Deluge-Dark/images/folder.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/folder.png
rename to dbb/deluge/Deluge-Dark/images/folder.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/harddrive.png b/dbb/deluge/Deluge-Dark/images/harddrive.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/harddrive.png
rename to dbb/deluge/Deluge-Dark/images/harddrive.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/help.png b/dbb/deluge/Deluge-Dark/images/help.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/help.png
rename to dbb/deluge/Deluge-Dark/images/help.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/logout.png b/dbb/deluge/Deluge-Dark/images/logout.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/logout.png
rename to dbb/deluge/Deluge-Dark/images/logout.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/move.png b/dbb/deluge/Deluge-Dark/images/move.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/move.png
rename to dbb/deluge/Deluge-Dark/images/move.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/ok.png b/dbb/deluge/Deluge-Dark/images/ok.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/ok.png
rename to dbb/deluge/Deluge-Dark/images/ok.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/pause.png b/dbb/deluge/Deluge-Dark/images/pause.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/pause.png
rename to dbb/deluge/Deluge-Dark/images/pause.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/paused.png b/dbb/deluge/Deluge-Dark/images/paused.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/paused.png
rename to dbb/deluge/Deluge-Dark/images/paused.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/plugin.png b/dbb/deluge/Deluge-Dark/images/plugin.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/plugin.png
rename to dbb/deluge/Deluge-Dark/images/plugin.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/queue.png b/dbb/deluge/Deluge-Dark/images/queue.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/queue.png
rename to dbb/deluge/Deluge-Dark/images/queue.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/queued.png b/dbb/deluge/Deluge-Dark/images/queued.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/queued.png
rename to dbb/deluge/Deluge-Dark/images/queued.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/remove.png b/dbb/deluge/Deluge-Dark/images/remove.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/remove.png
rename to dbb/deluge/Deluge-Dark/images/remove.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/remove_small.png b/dbb/deluge/Deluge-Dark/images/remove_small.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/remove_small.png
rename to dbb/deluge/Deluge-Dark/images/remove_small.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/resume.png b/dbb/deluge/Deluge-Dark/images/resume.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/resume.png
rename to dbb/deluge/Deluge-Dark/images/resume.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/resume_small.png b/dbb/deluge/Deluge-Dark/images/resume_small.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/resume_small.png
rename to dbb/deluge/Deluge-Dark/images/resume_small.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/search.png b/dbb/deluge/Deluge-Dark/images/search.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/search.png
rename to dbb/deluge/Deluge-Dark/images/search.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/settings.png b/dbb/deluge/Deluge-Dark/images/settings.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/settings.png
rename to dbb/deluge/Deluge-Dark/images/settings.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/settings_small.png b/dbb/deluge/Deluge-Dark/images/settings_small.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/settings_small.png
rename to dbb/deluge/Deluge-Dark/images/settings_small.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/top.png b/dbb/deluge/Deluge-Dark/images/top.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/top.png
rename to dbb/deluge/Deluge-Dark/images/top.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/uling.png b/dbb/deluge/Deluge-Dark/images/uling.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/uling.png
rename to dbb/deluge/Deluge-Dark/images/uling.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/up.png b/dbb/deluge/Deluge-Dark/images/up.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/up.png
rename to dbb/deluge/Deluge-Dark/images/up.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/up_small.png b/dbb/deluge/Deluge-Dark/images/up_small.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/up_small.png
rename to dbb/deluge/Deluge-Dark/images/up_small.png
diff --git a/dbb-css/deluge/Deluge-Dark/images/update.png b/dbb/deluge/Deluge-Dark/images/update.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/images/update.png
rename to dbb/deluge/Deluge-Dark/images/update.png
diff --git a/dbb-css/deluge/Deluge-Dark/screenshots/deluge_dark_ss.png b/dbb/deluge/Deluge-Dark/screenshots/deluge_dark_ss.png
similarity index 100%
rename from dbb-css/deluge/Deluge-Dark/screenshots/deluge_dark_ss.png
rename to dbb/deluge/Deluge-Dark/screenshots/deluge_dark_ss.png
diff --git a/dbb-css/fhdhr/fhdhr.css b/dbb/fhdhr/fhdhr.css
similarity index 100%
rename from dbb-css/fhdhr/fhdhr.css
rename to dbb/fhdhr/fhdhr.css
diff --git a/dbb-css/mediawiki/vector-dark.css b/dbb/mediawiki/vector-dark.css
similarity index 100%
rename from dbb-css/mediawiki/vector-dark.css
rename to dbb/mediawiki/vector-dark.css
diff --git a/dbb-css/nzbget/nzbget.css b/dbb/nzbget/nzbget.css
similarity index 100%
rename from dbb-css/nzbget/nzbget.css
rename to dbb/nzbget/nzbget.css
diff --git a/dbb-css/proxmox/PVEDiscordDark.css b/dbb/proxmox/PVEDiscordDark.css
similarity index 100%
rename from dbb-css/proxmox/PVEDiscordDark.css
rename to dbb/proxmox/PVEDiscordDark.css
diff --git a/dbb-css/proxmox/discordDark.css b/dbb/proxmox/discordDark.css
similarity index 100%
rename from dbb-css/proxmox/discordDark.css
rename to dbb/proxmox/discordDark.css
diff --git a/dbb-css/proxmox/plex.css b/dbb/proxmox/plex.css
similarity index 100%
rename from dbb-css/proxmox/plex.css
rename to dbb/proxmox/plex.css
diff --git a/dbb-css/selfoss/selfoss.css b/dbb/selfoss/selfoss.css
similarity index 81%
rename from dbb-css/selfoss/selfoss.css
rename to dbb/selfoss/selfoss.css
index a770d334..6c931fb0 100644
--- a/dbb-css/selfoss/selfoss.css
+++ b/dbb/selfoss/selfoss.css
@@ -1,4 +1,4 @@
-@import url("/theme.park/dbb-css/base/selfoss/selfoss-base.css");
+@import url("/theme.park/dbb/css/base/selfoss/selfoss-base.css");
 @import url("/theme.park/css/theme-options/plex.css");
 
 .source[data-id]::after {
diff --git a/dbb-css/selfoss_2.18/user.css b/dbb/selfoss_2.18/user.css
similarity index 96%
rename from dbb-css/selfoss_2.18/user.css
rename to dbb/selfoss_2.18/user.css
index b5d0a2be..94822ebb 100644
--- a/dbb-css/selfoss_2.18/user.css
+++ b/dbb/selfoss_2.18/user.css
@@ -1,4 +1,4 @@
-@import url("/theme.park/dbb-css/base/selfoss/selfoss-base.css");
+@import url("/theme.park/dbb/css/base/selfoss/selfoss-base.css");
 @import url("/theme.park/css/theme-options/plex.css");
 
 // :focus {