diff --git a/nvim/.config/nvim/autocmd.vim b/nvim/.config/nvim/autocmd.vim
index 8044874..759e29f 100644
--- a/nvim/.config/nvim/autocmd.vim
+++ b/nvim/.config/nvim/autocmd.vim
@@ -27,3 +27,8 @@ augroup UserStatusline
   autocmd ColorScheme * hi User7 guifg=Gray guibg=Black
   autocmd ColorScheme * hi User8 guifg=DarkYellow guibg=Black
 augroup END
+
+augroup ColorschemeBg
+  autocmd!
+  autocmd ColorScheme * hi Normal guibg=#000000
+augroup END
diff --git a/nvim/.config/nvim/config.vim b/nvim/.config/nvim/config.vim
index d027156..5a2a6fa 100644
--- a/nvim/.config/nvim/config.vim
+++ b/nvim/.config/nvim/config.vim
@@ -74,10 +74,6 @@ set completeopt=menu,noselect,preview,noinsert
 " See https://github.com/thaerkh/vim-workspace/issues/11
 set sessionoptions-=blank
 
-let g:jellybeans_use_term_italics = 1
-let g:jellybeans_overrides = { 'background': { 'guibg': '000000' } }
-colorscheme jellybeans
-
 " Disable providers we do not give a shit about
 let g:loaded_python_provider = 0
 let g:loaded_ruby_provider = 0
@@ -88,3 +84,11 @@ let g:python3_host_prog = '/usr/bin/python3'
 " Disable netrw completely
 let g:loaded_netrw       = 1
 let g:loaded_netrwPlugin = 1
+
+" Colorscheme
+set background=dark
+let g:gruvbox_italics = 0
+let g:gruvbox_italicize_strings = 0
+let g:gruvbox_filetype_hi_groups = 0
+let g:gruvbox_plugin_hi_groups = 1
+colorscheme gruvbox8_hard
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index cfec577..4f53494 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -14,7 +14,7 @@ Plug 'ap/vim-buftabline'
 " Manage Project sessions
 Plug 'thaerkh/vim-workspace'
 " Theme
-Plug 'nanotech/jellybeans.vim'
+Plug 'lifepillar/vim-gruvbox8'
 " Syntax highlighting
 Plug 'sheerun/vim-polyglot'
 " For LaTeX support
@@ -99,8 +99,8 @@ call plug#end()
 
 let g:vim_home = get(g:, 'vim_home', expand('~/.config/nvim/'))
 let config_list = [
-      \ 'config.vim',
       \ 'autocmd.vim',
+      \ 'config.vim',
       \ 'functions.vim',
       \ 'keymappings.vim',
       \ 'plugin_settings.vim',