diff --git a/home/vim/default.nix b/home/vim/default.nix
index 08f5ecd..eb79fe9 100644
--- a/home/vim/default.nix
+++ b/home/vim/default.nix
@@ -31,10 +31,7 @@ in
     plugins = with pkgs.vimPlugins; [
       # Theming
       lightline-vim # Fancy status bar
-      {
-        plugin = onedark-vim; # Nice dark theme
-        optional = true; # Needs to be `packadd`-ed manually...
-      }
+      vim-gruvbox8 # Nice dark theme
 
       # tpope essentials
       vim-commentary # Easy comments
diff --git a/home/vim/init.vim b/home/vim/init.vim
index 8968204..23717e1 100644
--- a/home/vim/init.vim
+++ b/home/vim/init.vim
@@ -68,10 +68,12 @@ set timeoutlen=500
 " Set dark mode by default
 set background=dark
 
-" Load it manually because of autoload functions...
-packadd! onedark-vim
-" Use onedark
-colorscheme onedark
+" Include plug-in integration
+let g:gruvbox_plugin_hi_groups=1
+" Include filetype integration
+let g:gruvbox_filetype_hi_groups=1
+" Use my preferred colorscheme
+colorscheme gruvbox8
 " }}}
 
 " Search parameters {{{
diff --git a/home/vim/plugin/settings/lightline.vim b/home/vim/plugin/settings/lightline.vim
index 0513160..feaa733 100644
--- a/home/vim/plugin/settings/lightline.vim
+++ b/home/vim/plugin/settings/lightline.vim
@@ -2,7 +2,7 @@
 let g:lightline={}
 
 " Use the wombat colorscheme
-let g:lightline.colorscheme='onedark'
+let g:lightline.colorscheme='wombat'
 
 " Status-line for active buffer
 let g:lightline.active={