diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 2fb8d375..a328399c 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -54,6 +54,8 @@ jobs:
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2.2.1
+        with:
+          driver-opts: image=moby/buildkit:v0.10.5
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2.1.0
diff --git a/css/base/rutorrent/aquamarine.css b/css/base/rutorrent/aquamarine.css
index e98f0a0d..b42cce16 100644
--- a/css/base/rutorrent/aquamarine.css
+++ b/css/base/rutorrent/aquamarine.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/theme-options/aquamarine.css?sha=7f02500167b598d1a64c86198ed3c9af9dec5466");
\ No newline at end of file
diff --git a/css/base/rutorrent/blackberry-abyss.css b/css/base/rutorrent/blackberry-abyss.css
index f426ff76..cac072dc 100644
--- a/css/base/rutorrent/blackberry-abyss.css
+++ b/css/base/rutorrent/blackberry-abyss.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/blackberry-abyss.css?sha=b64eb1f01cbd66a9dd888a96e62bb05ccf749802");
\ No newline at end of file
diff --git a/css/base/rutorrent/blackberry-amethyst.css b/css/base/rutorrent/blackberry-amethyst.css
index 2d3d845c..8d8fd17e 100644
--- a/css/base/rutorrent/blackberry-amethyst.css
+++ b/css/base/rutorrent/blackberry-amethyst.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/blackberry-amethyst.css?sha=1f1cd7d10acca7c00b54073724bb75e73c83a603");
\ No newline at end of file
diff --git a/css/base/rutorrent/blackberry-carol.css b/css/base/rutorrent/blackberry-carol.css
index 6d8f7874..0e7755d5 100644
--- a/css/base/rutorrent/blackberry-carol.css
+++ b/css/base/rutorrent/blackberry-carol.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/blackberry-carol.css?sha=51ce48be9f6521bf9805a0b6206967540352ca2b");
\ No newline at end of file
diff --git a/css/base/rutorrent/blackberry-dreamscape.css b/css/base/rutorrent/blackberry-dreamscape.css
index 27383818..3ce64c30 100644
--- a/css/base/rutorrent/blackberry-dreamscape.css
+++ b/css/base/rutorrent/blackberry-dreamscape.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/blackberry-dreamscape.css?sha=adc24f5a940aa6f8e0061e4b1ad86126f95ba57f");
\ No newline at end of file
diff --git a/css/base/rutorrent/blackberry-flamingo.css b/css/base/rutorrent/blackberry-flamingo.css
index c12bc924..f920bf5d 100644
--- a/css/base/rutorrent/blackberry-flamingo.css
+++ b/css/base/rutorrent/blackberry-flamingo.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/blackberry-flamingo.css?sha=d075526c4af1caa77d1d6ccb11536b66aa993b99");
\ No newline at end of file
diff --git a/css/base/rutorrent/blackberry-hearth.css b/css/base/rutorrent/blackberry-hearth.css
index 3ccbcfe6..133a923a 100644
--- a/css/base/rutorrent/blackberry-hearth.css
+++ b/css/base/rutorrent/blackberry-hearth.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/blackberry-hearth.css?sha=5a139953a525ca38111fd2dfa815c686bc5dbb88");
\ No newline at end of file
diff --git a/css/base/rutorrent/blackberry-martian.css b/css/base/rutorrent/blackberry-martian.css
index 2830ffb3..bf6975c0 100644
--- a/css/base/rutorrent/blackberry-martian.css
+++ b/css/base/rutorrent/blackberry-martian.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/blackberry-martian.css?sha=6eb4cd0529632fca270378f66f777182f4e2fb3e");
\ No newline at end of file
diff --git a/css/base/rutorrent/blackberry-pumpkin.css b/css/base/rutorrent/blackberry-pumpkin.css
index 77f5d2c9..ca269266 100644
--- a/css/base/rutorrent/blackberry-pumpkin.css
+++ b/css/base/rutorrent/blackberry-pumpkin.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/blackberry-pumpkin.css?sha=0e4c45af378262c4705bc538fdc3357e24613098");
\ No newline at end of file
diff --git a/css/base/rutorrent/blackberry-royal.css b/css/base/rutorrent/blackberry-royal.css
index 5c18f588..c3b75db4 100644
--- a/css/base/rutorrent/blackberry-royal.css
+++ b/css/base/rutorrent/blackberry-royal.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/blackberry-royal.css?sha=6aebe0c7f1aa26cb9822b1e44ebd7ffa628d981a");
\ No newline at end of file
diff --git a/css/base/rutorrent/blackberry-shadow.css b/css/base/rutorrent/blackberry-shadow.css
index 21b89e44..ac0fe398 100644
--- a/css/base/rutorrent/blackberry-shadow.css
+++ b/css/base/rutorrent/blackberry-shadow.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/blackberry-shadow.css?sha=b1ea4de97e26ef32b52edc79e0fb8aeee4a7d83d");
\ No newline at end of file
diff --git a/css/base/rutorrent/blackberry-solar.css b/css/base/rutorrent/blackberry-solar.css
index a3c95d5f..7d069b7a 100644
--- a/css/base/rutorrent/blackberry-solar.css
+++ b/css/base/rutorrent/blackberry-solar.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/blackberry-solar.css?sha=d53082caa15548ea53a518a9ca950eeab6a95059");
\ No newline at end of file
diff --git a/css/base/rutorrent/blackberry-vanta.css b/css/base/rutorrent/blackberry-vanta.css
index efb62bf7..a2817371 100644
--- a/css/base/rutorrent/blackberry-vanta.css
+++ b/css/base/rutorrent/blackberry-vanta.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/blackberry-vanta.css?sha=5ae2f81e3d70a7a3f166ebfba6ae4ff050ea766d");
\ No newline at end of file
diff --git a/css/base/rutorrent/dark.css b/css/base/rutorrent/dark.css
index 8fa52b62..8f711bae 100644
--- a/css/base/rutorrent/dark.css
+++ b/css/base/rutorrent/dark.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/theme-options/dark.css?sha=08b228ea163be7beccc6bd88a6d002c4e172032e");
\ No newline at end of file
diff --git a/css/base/rutorrent/dracula.css b/css/base/rutorrent/dracula.css
index 777a003c..7bd2e373 100644
--- a/css/base/rutorrent/dracula.css
+++ b/css/base/rutorrent/dracula.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/theme-options/dracula.css?sha=908bc4d3b082e330e916d506a46b4fad1994e99c");
\ No newline at end of file
diff --git a/css/base/rutorrent/hotline-old.css b/css/base/rutorrent/hotline-old.css
index be9253da..3f7c3bc1 100644
--- a/css/base/rutorrent/hotline-old.css
+++ b/css/base/rutorrent/hotline-old.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/hotline-old.css?sha=4befb6edb8a0b329baa4319e3c6fec9856f1d76f");
\ No newline at end of file
diff --git a/css/base/rutorrent/hotline.css b/css/base/rutorrent/hotline.css
index cce3d1ef..bdf38e9c 100644
--- a/css/base/rutorrent/hotline.css
+++ b/css/base/rutorrent/hotline.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/theme-options/hotline.css?sha=1cf394f1f517bb0ce3672d67846a3ab1bf8eda4c");
\ No newline at end of file
diff --git a/css/base/rutorrent/hotpink.css b/css/base/rutorrent/hotpink.css
index 3fb13810..d25c1220 100644
--- a/css/base/rutorrent/hotpink.css
+++ b/css/base/rutorrent/hotpink.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/theme-options/hotpink.css?sha=18ffb7ff0cf9d4ae97f09c2ccb980d8bb0fd9d3e");
\ No newline at end of file
diff --git a/css/base/rutorrent/ibracorp.css b/css/base/rutorrent/ibracorp.css
index 2dc8ec83..a4ccf5d0 100644
--- a/css/base/rutorrent/ibracorp.css
+++ b/css/base/rutorrent/ibracorp.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/ibracorp.css?sha=0757f163ac0c650f194555b7e0869213ff85f4e9");
\ No newline at end of file
diff --git a/css/base/rutorrent/maroon.css b/css/base/rutorrent/maroon.css
index 2da7f2e7..ea22590a 100644
--- a/css/base/rutorrent/maroon.css
+++ b/css/base/rutorrent/maroon.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/theme-options/maroon.css?sha=2260540a1a97c69eadd787b998113b892e4124da");
\ No newline at end of file
diff --git a/css/base/rutorrent/mind.css b/css/base/rutorrent/mind.css
index 0c0109dd..1d03ae89 100644
--- a/css/base/rutorrent/mind.css
+++ b/css/base/rutorrent/mind.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/mind.css?sha=bd65d1ae6f686873d9ef0d04100ae358deca1844");
\ No newline at end of file
diff --git a/css/base/rutorrent/nord.css b/css/base/rutorrent/nord.css
index bb3b182f..e2382294 100644
--- a/css/base/rutorrent/nord.css
+++ b/css/base/rutorrent/nord.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/theme-options/nord.css?sha=66e2ab527d521003b7c1cd114a31af3d2cb6af7b");
\ No newline at end of file
diff --git a/css/base/rutorrent/onedark.css b/css/base/rutorrent/onedark.css
index 8448abed..6dcb52d6 100644
--- a/css/base/rutorrent/onedark.css
+++ b/css/base/rutorrent/onedark.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/onedark.css?sha=7754291defa741c805bb0aec4d647ba27fec9cca");
\ No newline at end of file
diff --git a/css/base/rutorrent/organizr.css b/css/base/rutorrent/organizr.css
index 1c562888..6ba422c5 100644
--- a/css/base/rutorrent/organizr.css
+++ b/css/base/rutorrent/organizr.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/theme-options/organizr.css?sha=2a1ee65a26780204509f713f7ea2d5ebdc5bd057");
\ No newline at end of file
diff --git a/css/base/rutorrent/overseerr.css b/css/base/rutorrent/overseerr.css
index 3d83a58a..e8ac7e6e 100644
--- a/css/base/rutorrent/overseerr.css
+++ b/css/base/rutorrent/overseerr.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/theme-options/overseerr.css?sha=eedb2e0df6cc892903b8716a05184c61577ebe20");
\ No newline at end of file
diff --git a/css/base/rutorrent/pine-shadow.css b/css/base/rutorrent/pine-shadow.css
index 77876878..9c686f61 100644
--- a/css/base/rutorrent/pine-shadow.css
+++ b/css/base/rutorrent/pine-shadow.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/pine-shadow.css?sha=cc2adf274933630ff06539a244ba9fffff9090dc");
\ No newline at end of file
diff --git a/css/base/rutorrent/plex.css b/css/base/rutorrent/plex.css
index c95afdeb..3b8da2ea 100644
--- a/css/base/rutorrent/plex.css
+++ b/css/base/rutorrent/plex.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/theme-options/plex.css?sha=f31f9e494f6e675b55d16f0f811d94a0b9def845");
\ No newline at end of file
diff --git a/css/base/rutorrent/power.css b/css/base/rutorrent/power.css
index 31255f38..1c1511a0 100644
--- a/css/base/rutorrent/power.css
+++ b/css/base/rutorrent/power.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/power.css?sha=e3e059c24433790a92157332489c91eb6fabaf96");
\ No newline at end of file
diff --git a/css/base/rutorrent/reality.css b/css/base/rutorrent/reality.css
index 84a54ab4..ba5cf877 100644
--- a/css/base/rutorrent/reality.css
+++ b/css/base/rutorrent/reality.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/reality.css?sha=411fda46ff8940263182b2cc9b8c0144e62473d7");
\ No newline at end of file
diff --git a/css/base/rutorrent/rutorrent-base.css b/css/base/rutorrent/rutorrent-base.css
index 1bab4037..8d5faa30 100644
--- a/css/base/rutorrent/rutorrent-base.css
+++ b/css/base/rutorrent/rutorrent-base.css
@@ -424,18 +424,24 @@ div#CatList {
     border-left: none
 }
 
-div#CatList ul li span {
+/* div#CatList ul li span {
     color: var(--text)
 }
 
 div#CatList ul li.sel span {
     color: #AACF27
-}
+} */
 
 div#CatList ul li {
+    color: var(--text);
     border: none;
-    margin: 0px 5px;
-    font-family: 'Roboto'
+    font-family: 'Roboto';
+    padding: 4px;
+}
+
+div#CatList .label-prefix
+{
+    font-size: 21px;
 }
 
 div#CatList ul li.sel {
@@ -445,13 +451,21 @@ div#CatList ul li.sel {
     border: none
 }
 
-#-_-_-all-_-_-,
-#-_-_-dls-_-_-,
-#-_-_-com-_-_-,
-#-_-_-act-_-_-,
-#-_-_-iac-_-_-,
-#-_-_-err-_-_- {
-    background-image: url(/resources/rutorrent/status_icons.png)
+div#CatList li.sel .label-prefix{
+    color: var(--text)
+}
+
+.label-count,.label-size {
+	color: #D4D6C9;
+	background-color: #273238;
+}
+
+li.sel .label-count, li.sel .label-size {
+	color:#009DDD;
+}
+
+.label-icon {
+	background-image: url(/resources/rutorrent/status_icons.png);
 }
 
 .catpanel {
@@ -474,41 +488,8 @@ div#CatList ul li.sel {
     transition: all .3s cubic-bezier(0.68, -0.55, 0.27, 1.55) 0
 }
 
-#-_-_-all-_-_- {
-    background-position: 4px -175px
-}
-
-#-_-_-dls-_-_- {
-    background-position: 4px 2px
-}
-
-#-_-_-com-_-_- {
-    background-position: 4px -15px
-}
-
-#-_-_-act-_-_- {
-    background-position: 4px -159px
-}
-
-#-_-_-iac-_-_- {
-    background-position: 4px -31px
-}
-
-#-_-_-err-_-_- {
-    background-position: 4px -95px
-}
-
-div#CatList ul li.RSS {
-    background-image: url(/resources/rutorrent/status_icons.png);
-    background-position: 4px -207px
-}
-
-div#CatList ul li.disRSS {
-    background-image: url(/resources/rutorrent/status_icons.png)
-}
-
 .stable-icon {
-    background-image: url(/resources/rutorrent/status_icons.png)
+    background-image: url(/resources/rutorrent/status_icons.png);
 }
 
 .Icon_File {
@@ -523,11 +504,11 @@ div#CatList ul li.disRSS {
     background: transparent url(/resources/rutorrent/dir.gif) no-repeat left center
 }
 
-div#CatList ul li.sel span {
+div#CatList .sel .label-size, div#CatList .sel .label-size {
     color: rgb(var(--accent-color));
 }
 
-div#flabel_cont ul li {
+#flabel_cont li:not(.-_-_-all-_-_-) .label-icon {
     background-image: url(/resources/rutorrent/status_icons.png);
     background-position: 4px -352px
 }
@@ -569,6 +550,21 @@ div.graph_tab {
     background: var(--transparency-dark-25);
 }
 
+.graph_tab_grid {
+	border: 2px solid #606060;
+}
+
+.graph_tab_legend {
+	color: #FFF;
+	background-color: #181818;
+}
+
+.graph_tab_tooltip {
+	color: #FFF;
+	background-color: #606060;
+	border: 1px solid #606060;
+}
+
 div.table_tab {
     background: var(--transparency-dark-45);
     font-family: 'Roboto'
@@ -757,9 +753,7 @@ div#tcreate textarea#trackers {
     cursor: text;
 }
 
-input[type="text"],
-input[type="password"],
-select {
+input[type="number"],input[type="text"],input[type="password"],select {
     color: var(--text-hover);
     border: none;
     background: var(--transparency-dark-25) url(/resources/rutorrent/headers.png) repeat-x scroll 0 -138px;
@@ -767,10 +761,7 @@ select {
     outline: none;
 }
 
-input[type="text"][disabled],
-input[type="password"][disabled],
-input[type="file"][disabled],
-select[disabled] {
+input[type="number"][disabled],input[type="text"][disabled],input[type="password"][disabled],input[type="file"][disabled],select[disabled] {
     color: var(--text-hover);
     border: none;
     background: var(--transparency-dark-10) url(/resources/rutorrent/headers.png) repeat scroll 0 0 !important;
@@ -1625,7 +1616,7 @@ div#dlgEditRatioRules {
 }
 
 #autodl-multiselect-header {
-    background-image: url(/resources/rutorrent/dlg-autodl-irc.gif");
+    background-image: url(/resources/rutorrent/dlg-autodl-irc.gif);
 }
 
 .shieven {
@@ -1810,3 +1801,8 @@ div.label-count, div.label-size{
     color: var(--label-text-color);
     text-shadow: none;
 }
+
+li.sel .label-count, li.sel .label-size {
+    color: var(--label-text-color);
+    background-color: rgb(var(--accent-color), .75);
+}
diff --git a/css/base/rutorrent/soul.css b/css/base/rutorrent/soul.css
index 6ddc193f..0588a1a3 100644
--- a/css/base/rutorrent/soul.css
+++ b/css/base/rutorrent/soul.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/soul.css?sha=07c2b204f14dbe38c7a5f9d0b7d901de99f4e4c3");
\ No newline at end of file
diff --git a/css/base/rutorrent/space-gray.css b/css/base/rutorrent/space-gray.css
index 8031c364..72c2a345 100644
--- a/css/base/rutorrent/space-gray.css
+++ b/css/base/rutorrent/space-gray.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/theme-options/space-gray.css?sha=b8691b12c5972ad40471008c8d9fb05145b692d4");
\ No newline at end of file
diff --git a/css/base/rutorrent/space.css b/css/base/rutorrent/space.css
index 2c7857fd..78176413 100644
--- a/css/base/rutorrent/space.css
+++ b/css/base/rutorrent/space.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/space.css?sha=0f922ed3e9d26c0a6242132bcdc1d2bc4aec6f7b");
\ No newline at end of file
diff --git a/css/base/rutorrent/time.css b/css/base/rutorrent/time.css
index 8149b3f8..a993037d 100644
--- a/css/base/rutorrent/time.css
+++ b/css/base/rutorrent/time.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/time.css?sha=6cc9173f0be75cbd57bce1bd2aeddbd6da8258c8");
\ No newline at end of file
diff --git a/css/base/rutorrent/trueblack.css b/css/base/rutorrent/trueblack.css
index c4135ac1..2e9833db 100644
--- a/css/base/rutorrent/trueblack.css
+++ b/css/base/rutorrent/trueblack.css
@@ -1,2 +1,2 @@
-@import url("/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b");
+@import url("/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7");
 @import url("/css/community-theme-options/trueblack.css?sha=de3a1b7f21d63c3c9d72c16e03f90c7309ceb695");
\ No newline at end of file
diff --git a/themes.json b/themes.json
index 4a96bf11..0e35c55f 100644
--- a/themes.json
+++ b/themes.json
@@ -375,7 +375,7 @@
     },
     "rutorrent": {
       "addons": {},
-      "base_css": "https://develop.theme-park.dev/css/base/rutorrent/rutorrent-base.css?sha=1bab40378c85751580ec01c1c3728d616ec1093b"
+      "base_css": "https://develop.theme-park.dev/css/base/rutorrent/rutorrent-base.css?sha=8d5faa3034388a0f1ee7b80a5ab71c631220e4e7"
     },
     "sabnzbd": {
       "addons": {},