diff --git a/src/renderer/App.css b/src/renderer/App.css
index dbd60cc2d..a022e056d 100644
--- a/src/renderer/App.css
+++ b/src/renderer/App.css
@@ -5,36 +5,21 @@ body,
   -webkit-user-select: none;
 }
 
-html::-webkit-scrollbar,
-div.flex-grow::-webkit-scrollbar {
+*::-webkit-scrollbar {
   width: 10px;
 }
 
-html::-webkit-scrollbar-thumb,
-div.flex-grow::-webkit-scrollbar-thumb {
-  background-color: #c1c1c1;
-  border-radius: 10px;
+*::-webkit-scrollbar-track {
+  background-color: var(--gitify-scrollbar-track);
 }
 
-html::-webkit-scrollbar-thumb:hover,
-div.flex-grow::-webkit-scrollbar-thumb:hover {
-  background-color: #a8a8a8;
+*::-webkit-scrollbar-thumb {
+  background-color: var(--gitify-scrollbar-thumb);
   border-radius: 10px;
 }
 
-html.dark::-webkit-scrollbar-track,
-html.dark div.flex-grow::-webkit-scrollbar-track {
-  background-color: #090e15;
-}
-
-html.dark::-webkit-scrollbar-thumb,
-html.dark div.flex-grow::-webkit-scrollbar-thumb {
-  background-color: #24292e;
-}
-
-html.dark::-webkit-scrollbar-thumb:hover,
-html.dark div.flex-grow::-webkit-scrollbar-thumb:hover {
-  background-color: #3a3f44;
+*::-webkit-scrollbar-thumb:hover {
+  background-color: var(--gitify-scrollbar-thumb-hover);
 }
 
 body {
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 676b41d3b..e5a4585a3 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -23,31 +23,31 @@ const config: Config = {
           open: '#1f883d',
         },
         gitify: {
-          background: 'var(--color-gitify-background)',
-          font: 'var(--color-gitify-font)',
+          background: 'var(--gitify-background)',
+          font: 'var(--gitify-font)',
           error: colors.red[500],
           sidebar: '#24292e',
-          footer: 'var(--color-gitify-footer)',
+          footer: 'var(--gitify-footer)',
           accounts: {
-            rest: 'var(--color-gitify-accounts-rest)',
-            error: 'var(--color-gitify-accounts-error)',
+            rest: 'var(--gitify-accounts-rest)',
+            error: 'var(--gitify-accounts-error)',
           },
-          repositories: 'var(--color-gitify-repositories)',
+          repositories: 'var(--gitify-repositories)',
           notifications: {
-            border: 'var(--color-gitify-notifications-border)',
-            rest: 'var(--color-gitify-notifications-rest)',
-            hover: 'var(--color-gitify-notifications-hover)',
+            border: 'var(--gitify-notifications-border)',
+            rest: 'var(--gitify-notifications-rest)',
+            hover: 'var(--gitify-notifications-hover)',
           },
           tooltip: {
             icon: colors.blue[500],
-            popout: 'var(--color-gitify-tooltip-popout)',
+            popout: 'var(--gitify-tooltip-popout)',
           },
           link: colors.blue[500],
           caution: colors.orange[600],
           settings: colors.blue[600],
           pill: {
-            rest: 'var(--color-gitify-pill-rest)',
-            hover: 'var(--color-gitify-pill-hover)',
+            rest: 'var(--gitify-pill-rest)',
+            hover: 'var(--gitify-pill-hover)',
           },
         },
       },
@@ -60,32 +60,46 @@ const config: Config = {
     ({ addBase }) => {
       addBase({
         ':root': {
-          '--color-gitify-background': colors.white,
-          '--color-gitify-font': colors.gray[700],
-          '--color-gitify-footer': colors.gray[200],
-          '--color-gitify-accounts-rest': colors.gray[300],
-          '--color-gitify-accounts-error': colors.red[300],
-          '--color-gitify-repositories': colors.gray[100],
-          '--color-gitify-notifications-border': colors.gray[100],
-          '--color-gitify-notifications-rest': colors.white,
-          '--color-gitify-notifications-hover': colors.gray[100],
-          '--color-gitify-tooltip-popout': colors.white,
-          '--color-gitify-pill-rest': colors.gray[100],
-          '--color-gitify-pill-hover': colors.gray[200],
+          '--gitify-background': colors.white,
+          '--gitify-font': colors.gray[700],
+          '--gitify-footer': colors.gray[200],
+
+          '--gitify-accounts-rest': colors.gray[300],
+          '--gitify-accounts-error': colors.red[300],
+
+          '--gitify-repositories': colors.gray[100],
+
+          '--gitify-notifications-border': colors.gray[100],
+          '--gitify-notifications-rest': colors.white,
+          '--gitify-notifications-hover': colors.gray[100],
+          '--gitify-tooltip-popout': colors.white,
+          '--gitify-pill-rest': colors.gray[100],
+          '--gitify-pill-hover': colors.gray[200],
+
+          '--gitify-scrollbar-track': colors.gray[100],
+          '--gitify-scrollbar-thumb': colors.gray[400],
+          '--gitify-scrollbar-thumb-hover': colors.gray[500],
         },
         '.dark': {
-          '--color-gitify-background': '#161b22',
-          '--color-gitify-font': colors.gray[100],
-          '--color-gitify-footer': '#000209',
-          '--color-gitify-accounts-rest': '#000209',
-          '--color-gitify-accounts-error': colors.red[500],
-          '--color-gitify-repositories': '#090e15',
-          '--color-gitify-notifications-border': '#090e15',
-          '--color-gitify-notifications-rest': '#161b22',
-          '--color-gitify-notifications-hover': '#090e15',
-          '--color-gitify-tooltip-popout': '#24292e',
-          '--color-gitify-pill-rest': colors.gray[800],
-          '--color-gitify-pill-hover': colors.gray[700],
+          '--gitify-background': '#161b22',
+          '--gitify-font': colors.gray[100],
+          '--gitify-footer': '#000209',
+
+          '--gitify-accounts-rest': '#000209',
+          '--gitify-accounts-error': colors.red[500],
+
+          '--gitify-repositories': '#090e15',
+
+          '--gitify-notifications-border': '#090e15',
+          '--gitify-notifications-rest': '#161b22',
+          '--gitify-notifications-hover': '#090e15',
+          '--gitify-tooltip-popout': '#24292e',
+          '--gitify-pill-rest': colors.gray[800],
+          '--gitify-pill-hover': colors.gray[700],
+
+          '--gitify-scrollbar-track': '#090e15',
+          '--gitify-scrollbar-thumb': '#24292e',
+          '--gitify-scrollbar-thumb-hover': '#3a3f44',
         },
       });
     },