diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 289ba31..51c8ffa 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -1,12 +1,12 @@
 {
   "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" },
+  "catppuccin": { "branch": "main", "commit": "9703f227bfab20d04bcee62d2f08f1795723b4ae" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "dracula.nvim": { "branch": "main", "commit": "a6cb758d4b182d9f2b7e742910078d94877c1059" },
   "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" },
   "fidget.nvim": { "branch": "legacy", "commit": "2f7c08f45639a64a5c0abcf67321d52c3f499ae6" },
   "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" },
diff --git a/config/nvim/lua/fschauen/init.lua b/config/nvim/lua/fschauen/init.lua
index 548e1c5..a86e4ea 100644
--- a/config/nvim/lua/fschauen/init.lua
+++ b/config/nvim/lua/fschauen/init.lua
@@ -15,6 +15,6 @@ require('fschauen.autocmd').setup()
 require('fschauen.filetype').setup()
 require('fschauen.lazy').setup()
 
-local colorscheme = 'gruvbox'
+local colorscheme = vim.env.NVIM_COLORSCHEME or 'gruvbox'
 vim.cmd('silent! colorscheme ' .. colorscheme)
 
diff --git a/config/nvim/lua/fschauen/plugins/colorscheme.lua b/config/nvim/lua/fschauen/plugins/colorscheme.lua
index 54cb158..3812911 100644
--- a/config/nvim/lua/fschauen/plugins/colorscheme.lua
+++ b/config/nvim/lua/fschauen/plugins/colorscheme.lua
@@ -1,8 +1,55 @@
+local colorscheme = function(tbl)
+  return vim.tbl_deep_extend('keep', tbl, { lazy = false, priority = 1000 })
+end
+
 return {
-  { 'fschauen/gruvbox.nvim', dev = true },
-  { 'fschauen/solarized.nvim', dev = true },
-  { 'folke/tokyonight.nvim' },
-  { 'rebelot/kanagawa.nvim' },
-  { 'Mofiqul/dracula.nvim' },
+  colorscheme { 'fschauen/gruvbox.nvim', dev = true },
+  colorscheme { 'fschauen/solarized.nvim', dev = true },
+
+  colorscheme { 'catppuccin/nvim',
+    name = 'catppuccin',
+    opts = {
+      flavor = 'mocha',
+      show_end_of_buffer = true,
+      dim_inactive = { enabled = true },
+      integrations = { notify = true },
+      custom_highlights = function(colors)
+        local extra_dark = false
+        return extra_dark
+          and {
+            Normal     = { bg = colors.crust },
+            CursorLine = { bg = colors.mantle },
+          }
+          or {}
+      end,
+    },
+  },
+
+  colorscheme { 'rebelot/kanagawa.nvim',
+    opts = {
+      dimInactive = true,
+      theme = 'dragon',
+      overrides = function(colors)
+        local palette = colors.palette
+        return {
+          Normal       = { bg = palette.sumiInk2 },
+          CursorLine   = { bg = palette.sumiInk3 },
+          LineNr       = { bg = palette.sumiInk2 },
+          CursorLineNr = { bg = palette.sumiInk2 },
+          SignColumn   = { bg = palette.sumiInk2 },
+        }
+      end,
+    },
+  },
+
+  colorscheme { 'folke/tokyonight.nvim',
+    opts = {
+      style = 'night',
+      dim_inactive = true,
+      on_colors = function(colors)
+        colors.bg_highlight = '#1d212f'
+      end,
+    },
+  },
 }