diff --git a/README.md b/README.md
index 8bb900b..22f7fee 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,7 @@ A dark and light Neovim theme written in Lua ported from the Visual Studio Code
 - [vim-sneak](https://github.com/justinmk/vim-sneak)
 - [Fern](https://github.com/lambdalisue/fern.vim)
 - [Barbar](https://github.com/romgrk/barbar.nvim)
+- [Scrollbar](https://github.com/petertriho/nvim-scrollbar)
 - [Mini](https://github.com/echasnovski/mini.nvim)
 
 ## ⚡️ Requirements
diff --git a/lua/tokyonight/theme.lua b/lua/tokyonight/theme.lua
index 781a62e..c750941 100644
--- a/lua/tokyonight/theme.lua
+++ b/lua/tokyonight/theme.lua
@@ -472,6 +472,27 @@ function M.setup(config)
     CmpItemKindOperator = { fg = c.green1, bg = c.none },
     CmpItemKindSnippet = { fg = c.dark5, bg = c.none },
 
+    -- Scrollbar
+    ScrollbarHandle = { fg = c.none, bg = c.bg_highlight  },
+
+    ScrollbarSearchHandle = { fg = c.orange, bg = c.bg_highlight  },
+    ScrollbarSearch = { fg = c.orange, bg = c.none  },
+
+    ScrollbarErrorHandle = { fg = c.error, bg = c.bg_highlight  },
+    ScrollbarError = { fg = c.error, bg = c.none  },
+
+    ScrollbarWarnHandle = { fg = c.warning, bg = c.bg_highlight  },
+    ScrollbarWarn = { fg = c.warning, bg = c.none  },
+
+    ScrollbarInfoHandle = { fg = c.info, bg = c.bg_highlight  },
+    ScrollbarInfo = { fg = c.info, bg = c.none  },
+
+    ScrollbarHintHandle = { fg = c.hint, bg = c.bg_highlight  },
+    ScrollbarHint = { fg = c.hint, bg = c.none  },
+
+    ScrollbarMiscHandle = { fg = c.purple, bg = c.bg_highlight  },
+    ScrollbarMisc = { fg = c.purple, bg = c.none  },
+
     -- Mini
     MiniCompletionActiveParameter = { style = "underline" },