diff --git a/src/styles/components/_index.scss b/src/styles/components/_index.scss
index b8aa1e71e..333266d0e 100644
--- a/src/styles/components/_index.scss
+++ b/src/styles/components/_index.scss
@@ -1,5 +1,3 @@
-@import "base";
-
 @import "attachments";
 @import "gantt";
 @import "tooltip";
diff --git a/src/styles/components/base/_index.scss b/src/styles/components/base/_index.scss
deleted file mode 100644
index 30e2cbf14..000000000
--- a/src/styles/components/base/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'scrollbars';
diff --git a/src/styles/theme/_index.scss b/src/styles/theme/_index.scss
index 9f8d234ea..8f4f5b3df 100644
--- a/src/styles/theme/_index.scss
+++ b/src/styles/theme/_index.scss
@@ -1,3 +1,5 @@
+@import "scrollbars";
+
 @import "theme";
 
 @import "content";
diff --git a/src/styles/components/base/scrollbars.scss b/src/styles/theme/scrollbars.scss
similarity index 78%
rename from src/styles/components/base/scrollbars.scss
rename to src/styles/theme/scrollbars.scss
index 92a856e33..29d241067 100644
--- a/src/styles/components/base/scrollbars.scss
+++ b/src/styles/theme/scrollbars.scss
@@ -1,3 +1,8 @@
+$scrollbar-height: 8px;
+$scrollbar-track-color: $grey-200;
+$scrollbar-thumb-color: $grey-300;
+$scrollbar-hover-color: $grey-500;
+
 // Chrome
 ::-webkit-scrollbar {
   width: $scrollbar-height;
diff --git a/src/styles/variables/variables.scss b/src/styles/variables/variables.scss
index 678a2fa61..abe0ef0ab 100644
--- a/src/styles/variables/variables.scss
+++ b/src/styles/variables/variables.scss
@@ -29,11 +29,6 @@ $vikunja-nav-logo-full-width: 164px;
 $transition-duration: 150ms;
 $transition: $transition-duration ease;
 
-$scrollbar-height: 8px;
-$scrollbar-track-color: $grey-200;
-$scrollbar-thumb-color: $grey-300;
-$scrollbar-hover-color: $grey-500;
-
 $button-height: 34px;
 
 $switch-view-height: 2.69rem;