diff --git a/.github/workflows/minify-and-deploy.yml b/.github/workflows/minify-and-deploy.yml
index 55cf9195..09e4dbb3 100644
--- a/.github/workflows/minify-and-deploy.yml
+++ b/.github/workflows/minify-and-deploy.yml
@@ -85,4 +85,9 @@ jobs:
           publish_dir: ./
           publish_branch: live_testing
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          exclude_assets: ''
\ No newline at end of file
+          exclude_assets: ''
+      - name: Clear CF Cache
+        run: |
+          curl -X GET "https://api.cloudflare.com/client/v4/user/tokens/verify" \
+          -H "Authorization: Bearer ${{ secrets.CLOUDFLARE_CACHE_PURGE }}" \
+          -H "Content-Type:application/json"
\ No newline at end of file
diff --git a/css/addons/unraid/login-page/alien/alien_base.css b/css/addons/unraid/login-page/alien/alien-base.css
similarity index 100%
rename from css/addons/unraid/login-page/alien/alien_base.css
rename to css/addons/unraid/login-page/alien/alien-base.css
diff --git a/css/addons/unraid/login-page/alien/custom.css b/css/addons/unraid/login-page/alien/custom.css
index eec0e7e3..3b127bdf 100644
--- a/css/addons/unraid/login-page/alien/custom.css
+++ b/css/addons/unraid/login-page/alien/custom.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/alien/alien_base.css");
+@import url("/css/addons/unraid/login-page/alien/alien-base.css");
 :root {
     --main-bg: radial-gradient(ellipse at center,rgba(0, 255, 119, 0.1) 0,rgba(0,255,119,0) 100%) center center/cover no-repeat fixed, 
     url(/css/addons/unraid/login-page/alien/wallpaper/hallway2.jpg) center center/cover no-repeat fixed;
diff --git a/css/addons/unraid/login-page/alien/hallway.css b/css/addons/unraid/login-page/alien/hallway.css
index 6247189f..72232d4c 100644
--- a/css/addons/unraid/login-page/alien/hallway.css
+++ b/css/addons/unraid/login-page/alien/hallway.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/alien/alien_base.css");
+@import url("/css/addons/unraid/login-page/alien/alien-base.css");
 :root {
     --main-bg: radial-gradient(ellipse at center,rgba(0, 255, 119, 0.1) 0,rgba(0,255,119,0) 100%) center center/cover no-repeat fixed, 
     url(/css/addons/unraid/login-page/alien/wallpaper/hallway.jpg) center center/cover no-repeat fixed;
diff --git a/css/addons/unraid/login-page/alien/hallway2.css b/css/addons/unraid/login-page/alien/hallway2.css
index fef31746..a1fdba5d 100644
--- a/css/addons/unraid/login-page/alien/hallway2.css
+++ b/css/addons/unraid/login-page/alien/hallway2.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/alien/alien_base.css");
+@import url("/css/addons/unraid/login-page/alien/alien-base.css");
 :root {
     --main-bg: radial-gradient(ellipse at center,rgba(0, 255, 119, 0.1) 0,rgba(0,255,119,0) 100%) center center/cover no-repeat fixed, 
     url(/css/addons/unraid/login-page/alien/wallpaper/hallway2.jpg) center center/cover no-repeat fixed;
diff --git a/css/addons/unraid/login-page/alien/hallway3.css b/css/addons/unraid/login-page/alien/hallway3.css
index 3f7cc521..eaa87edd 100644
--- a/css/addons/unraid/login-page/alien/hallway3.css
+++ b/css/addons/unraid/login-page/alien/hallway3.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/alien/alien_base.css");
+@import url("/css/addons/unraid/login-page/alien/alien-base.css");
 :root {
     --main-bg: radial-gradient(ellipse at center,rgba(0, 255, 119, 0.1) 0,rgba(0,255,119,0) 100%) center center/cover no-repeat fixed, 
     url(/css/addons/unraid/login-page/alien/wallpaper/hallway3.jpg) center center/cover no-repeat fixed;
diff --git a/css/addons/unraid/login-page/alien/hallway4.css b/css/addons/unraid/login-page/alien/hallway4.css
index bfd5e75c..aeb86d48 100644
--- a/css/addons/unraid/login-page/alien/hallway4.css
+++ b/css/addons/unraid/login-page/alien/hallway4.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/alien/alien_base.css");
+@import url("/css/addons/unraid/login-page/alien/alien-base.css");
 :root {
     --main-bg: radial-gradient(ellipse at center,rgba(0, 255, 119, 0.1) 0,rgba(0,255,119,0) 100%) center center/cover no-repeat fixed, 
     url(/css/addons/unraid/login-page/alien/wallpaper/hallway4.jpg) center center/cover no-repeat fixed;
diff --git a/css/addons/unraid/login-page/alien/isolation.css b/css/addons/unraid/login-page/alien/isolation.css
index eb795ea3..8a65e839 100644
--- a/css/addons/unraid/login-page/alien/isolation.css
+++ b/css/addons/unraid/login-page/alien/isolation.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/alien/alien_base.css");
+@import url("/css/addons/unraid/login-page/alien/alien-base.css");
 :root {
     --main-bg: radial-gradient(ellipse at center,rgba(0, 255, 119, 0.1) 0,rgba(0,255,119,0) 100%) center center/cover no-repeat fixed, 
     url(/css/addons/unraid/login-page/alien/wallpaper/isolation.png) center center/cover no-repeat fixed;
diff --git a/css/addons/unraid/login-page/alien/isolation_video.css b/css/addons/unraid/login-page/alien/isolation_video.css
index a66b918a..76e9a924 100644
--- a/css/addons/unraid/login-page/alien/isolation_video.css
+++ b/css/addons/unraid/login-page/alien/isolation_video.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/alien/alien_base.css");
+@import url("/css/addons/unraid/login-page/alien/alien-base.css");
 :root {
     --main-bg: transparent;
     --logo: url(/css/addons/unraid/login-page/alien/logo/wings_green.png) center no-repeat;
diff --git a/css/addons/unraid/login-page/alien/nightmare.css b/css/addons/unraid/login-page/alien/nightmare.css
index 8c6cadb1..a3f1d315 100644
--- a/css/addons/unraid/login-page/alien/nightmare.css
+++ b/css/addons/unraid/login-page/alien/nightmare.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/alien/alien_base.css");
+@import url("/css/addons/unraid/login-page/alien/alien-base.css");
 :root {
     --main-bg: radial-gradient(ellipse at center,rgba(0, 255, 119, 0.1) 0,rgba(0,255,119,0) 100%) center center/cover no-repeat fixed, 
     url(/css/addons/unraid/login-page/alien/wallpaper/nightmare.png) center center/cover no-repeat fixed;
diff --git a/css/addons/unraid/login-page/alien/scanner.css b/css/addons/unraid/login-page/alien/scanner.css
index 7c65e7d6..27cc81f7 100644
--- a/css/addons/unraid/login-page/alien/scanner.css
+++ b/css/addons/unraid/login-page/alien/scanner.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/alien/alien_base.css");
+@import url("/css/addons/unraid/login-page/alien/alien-base.css");
 :root {
     --main-bg: radial-gradient(ellipse at center,rgba(0, 255, 119, 0.1) 0,rgba(0,255,119,0) 100%) center center/cover no-repeat fixed, 
     url(/css/addons/unraid/login-page/alien/wallpaper/scanner.jpg) center center/cover no-repeat fixed;
diff --git a/css/addons/unraid/login-page/custom_login.sh b/css/addons/unraid/login-page/custom_login.sh
index b70c4a2a..19abdce1 100644
--- a/css/addons/unraid/login-page/custom_login.sh
+++ b/css/addons/unraid/login-page/custom_login.sh
@@ -1,12 +1,21 @@
 #!/bin/bash
 TYPE="retro-terminal"
 THEME="green.css"
-DOMAIN="theme-park.dev" # If you update the domain after the script has been run, You must disable and re the whole theme with the DISABLE_THEME env.
+DOMAIN="theme-park.dev"
 SCHEME="https"
 ADD_JS="true"
 JS="custom_text_header.js"
 DISABLE_THEME="false"
 
+## FAQ
+
+  # If you update the DOMAIN variable after the script has been run,
+  # you must disable the whole theme with the DISABLE_THEME="true" env first and re-run it again after with "false".
+
+  # Your domain can be your custom domain or a github pages (user.github.io) etc. Don't add the whole URL with scheme, you only need to add the domain.
+
+  # If your custom domain uses a subfolder you must escape the forward slash. (custom.com\/subfolder)
+
 echo -e "Variables set:\\n\
 TYPE          = ${TYPE}\\n\
 THEME         = ${THEME}\\n\
diff --git a/css/addons/unraid/login-page/fallout/dirty_terminal.css b/css/addons/unraid/login-page/fallout/dirty_terminal.css
index bac17b4f..3896f0ba 100644
--- a/css/addons/unraid/login-page/fallout/dirty_terminal.css
+++ b/css/addons/unraid/login-page/fallout/dirty_terminal.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/fallout/fallout_base.css");
+@import url("/css/addons/unraid/login-page/fallout/fallout-base.css");
 :root {
     --main-bg-color: url(/css/addons/unraid/login-page/fallout/wallpaper/rocky-wall.png),
     url(/css/addons/unraid/login-page/fallout/wallpaper/terminal.jpg) center center/cover no-repeat fixed;
diff --git a/css/addons/unraid/login-page/fallout/dirty_terminal2.css b/css/addons/unraid/login-page/fallout/dirty_terminal2.css
index 407558ab..670b921a 100644
--- a/css/addons/unraid/login-page/fallout/dirty_terminal2.css
+++ b/css/addons/unraid/login-page/fallout/dirty_terminal2.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/fallout/fallout_base.css");
+@import url("/css/addons/unraid/login-page/fallout/fallout-base.css");
 :root {
     --main-bg-color: url(/css/addons/unraid/login-page/fallout/wallpaper/rocky-wall.png),
     url(/css/addons/unraid/login-page/fallout/wallpaper/terminal2.jpg) center center/cover no-repeat fixed;
diff --git a/css/addons/unraid/login-page/fallout/fallout_base.css b/css/addons/unraid/login-page/fallout/fallout-base.css
similarity index 100%
rename from css/addons/unraid/login-page/fallout/fallout_base.css
rename to css/addons/unraid/login-page/fallout/fallout-base.css
diff --git a/css/addons/unraid/login-page/fallout/fallout_video.css b/css/addons/unraid/login-page/fallout/fallout_video.css
index 344c115a..5875d1bd 100644
--- a/css/addons/unraid/login-page/fallout/fallout_video.css
+++ b/css/addons/unraid/login-page/fallout/fallout_video.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/fallout/fallout_base.css");
+@import url("/css/addons/unraid/login-page/fallout/fallout-base.css");
 :root {
     --main-bg-color: transparent;
     --logo: url(/css/addons/unraid/login-page/fallout/logo/vault-tec_green.png) center no-repeat;
diff --git a/css/addons/unraid/login-page/fallout/terminal.css b/css/addons/unraid/login-page/fallout/terminal.css
index 4e27717d..0b3d14ad 100644
--- a/css/addons/unraid/login-page/fallout/terminal.css
+++ b/css/addons/unraid/login-page/fallout/terminal.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/fallout/fallout_base.css");
+@import url("/css/addons/unraid/login-page/fallout/fallout-base.css");
 :root {
     --main-bg-color: url(/css/addons/unraid/login-page/fallout/wallpaper/terminal.jpg) center center/cover no-repeat fixed;
     --logo: url(/css/addons/unraid/login-page/fallout/logo/vault-tec_green.png) center no-repeat;
diff --git a/css/addons/unraid/login-page/fallout/terminal2.css b/css/addons/unraid/login-page/fallout/terminal2.css
index cea6c1ae..3c8f53f2 100644
--- a/css/addons/unraid/login-page/fallout/terminal2.css
+++ b/css/addons/unraid/login-page/fallout/terminal2.css
@@ -1,4 +1,4 @@
-@import url("/css/addons/unraid/login-page/fallout/fallout_base.css");
+@import url("/css/addons/unraid/login-page/fallout/fallout-base.css");
 :root {
     --main-bg-color: url(/css/addons/unraid/login-page/fallout/wallpaper/terminal2.jpg) center center/cover no-repeat fixed;
     --logo: url(/css/addons/unraid/login-page/fallout/logo/vault-tec_green.png) center no-repeat;
diff --git a/css/base/qbittorrent/qbittorrent-base.css b/css/base/qbittorrent/qbittorrent-base.css
index c9a7ff06..3802696e 100644
--- a/css/base/qbittorrent/qbittorrent-base.css
+++ b/css/base/qbittorrent/qbittorrent-base.css
@@ -10,7 +10,6 @@
 /*		   		        Made by @gilbN					 */
 /*			      https://github.com/gilbN/theme.park			 */
 
-@import url(https://use.fontawesome.com/releases/v5.0.7/css/all.css);
 @import url("/css/defaults/placeholders.css");
 @import url("/css/defaults/transparent.css");
 
@@ -307,7 +306,7 @@ label {
 }
 
 li.divider {
-  border-top: 1px solid rgba(255, 255, 255, .25) !important;
+  border-top: 1px solid var(--transparency-light-25) !important;
 }
 
 
@@ -404,13 +403,13 @@ li.divider {
 }
 
 .contextMenu .separator {
-  border-top: 1px solid rgba(255, 255, 255, 0.08);
+  border-top: 1px solid var(--transparency-light-10);
 }
 
 /* Sidemenu */
 .selectedFilter {
-  background-color: rgba(var(--accent-color), 0.6);
-  color: #eee;
+  background-color: var(--button-color);
+  color: var(--button-text);
 }
 
 .selectedFilter:before {
@@ -418,8 +417,13 @@ li.divider {
 }
 
 ul.filterList li:hover {
-  background-color: rgba(var(--accent-color), 0.6);
-  color: var(--button-color-hover) !important;
+  background-color: var(--transparency-light-15);
+  color: var(--text-hover) !important;
+}
+
+ul.filterList .selectedFilter:hover {
+  background-color: var(--button-color-hover);
+  color: var(--button-text-hover);
 }
 
 ul.filterList li:hover:before {
@@ -437,6 +441,16 @@ ul.filterList li:hover:before {
 }
 
 /* Bottom menu */
+
+#progress {
+  border: 1px solid var(--transparency-light-25);
+}
+
+hr {
+  background-color: var(--transparency-light-25);
+  color: var(--text);
+}
+
 .panel-headerContent.tabs {
   background: none !important;
 }
@@ -470,7 +484,7 @@ ul.filterList li:hover:before {
 }
 
 .tab-menu li a:hover {
-  background: var(--transparency-light-10) !important;
+  color: rgb(var(--accent-color)) !important;
 }
 
 .toolbarTabs {
@@ -498,7 +512,7 @@ ul.filterList li:hover:before {
 fieldset {
   border-width: 1px !important;
   border-style: solid !important;
-  border-color: rgba(255, 255, 255, 0.25) !important;
+  border-color: var(--transparency-light-25) !important;
 }
 
 /*Modal */
@@ -532,8 +546,8 @@ fieldset {
 }
 
 .mochaContentBorder {
-  border-top: 1px solid rgba(255, 255, 255, .25) !important;
-  border-bottom: 1px solid rgba(255, 255, 255, .25) !important;
+  border-top: 1px solid var(--transparency-light-25) !important;
+  border-bottom: 1px solid var(--transparency-light-25) !important;
 }
 
 .mocha.isFocused .mochaTitlebar h3 {
@@ -551,7 +565,7 @@ fieldset.settings legend {
 }
 
 fieldset.settings {
-  border: solid 1px rgba(255, 255, 255, 0.25) !important;
+  border: solid 1px var(--transparency-light-25) !important;
   border-radius: 8px;
   -webkit-border-radius: 8px;
   -moz-border-radius: 8px;
@@ -559,7 +573,7 @@ fieldset.settings {
 }
 
 textarea:disabled {
-  color: rgb(84, 84, 84);
+  color: var(--text-muted);
   cursor: default;
   background: var(--transparency-light-05) !important;
   border: none !important;
@@ -575,7 +589,7 @@ textarea {
 #watched_folders_tab td,
 #watched_folders_tab th {
   padding: 2px 4px;
-  border: 1px solid rgba(255, 255, 255, 0.25) !important;
+  border: 1px solid var(--transparency-light-25) !important;
 }
 
 input[type="button"i]:hover {
@@ -643,4 +657,9 @@ select {
 select:focus {
   background: var(--drop-down-menu-bg);
   color: var(--text)
+}
+
+.select-watched-folder-editable {
+  background-color: var(--transparency-dark-05);
+  border: solid var(--transparency-light-10) 1px;
 }
\ No newline at end of file
diff --git a/css/defaults/servarr-base.css b/css/defaults/servarr-base.css
index 79c90750..59150d5f 100644
--- a/css/defaults/servarr-base.css
+++ b/css/defaults/servarr-base.css
@@ -280,7 +280,7 @@ a:hover {
     background: var(--transparency-dark-25);
 }
 
-[class*=".ProgressBar-purple-"] {
+[class*="ProgressBar-purple-"] {
     background-color: rgb(var(--accent-color));
 }