diff --git a/nvim/.config/nvim/autocmd.vim b/nvim/.config/nvim/autocmd.vim
index 759e29f..8044874 100644
--- a/nvim/.config/nvim/autocmd.vim
+++ b/nvim/.config/nvim/autocmd.vim
@@ -27,8 +27,3 @@ 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/colors/molokai.vim b/nvim/.config/nvim/colors/molokai.vim
new file mode 100644
index 0000000..7b91f1c
--- /dev/null
+++ b/nvim/.config/nvim/colors/molokai.vim
@@ -0,0 +1,119 @@
+" Vim color file
+"
+" Author: Tomas Restrepo <tomas@winterdom.com>
+" https://github.com/tomasr/molokai
+"
+" Note: Based on the Monokai theme for TextMate
+" by Wimer Hazenberg and its darker variant
+" by Hamish Stuart Macpherson
+"
+" Modified to drop terminal support and guifg to
+" be pitch black by Sanchayan Maity
+"
+
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name="molokai"
+
+" vertical split lines should look like a line instead of a dashed one
+set fillchars+=vert:│
+
+
+hi Boolean         guifg=#AE81FF
+hi Character       guifg=#E6DB74
+hi Number          guifg=#AE81FF
+hi String          guifg=#E6DB74
+hi Conditional     guifg=#F92672               gui=bold
+hi Constant        guifg=#AE81FF               gui=bold
+hi Cursor          guifg=#000000 guibg=#F8F8F0
+hi iCursor         guifg=#000000 guibg=#F8F8F0
+hi Debug           guifg=#BCA3A3               gui=bold
+hi Define          guifg=#66D9EF
+hi Delimiter       guifg=#8F8F8F
+hi DiffAdd                       guibg=#13354A
+hi DiffChange      guifg=#89807D guibg=#4C4745
+hi DiffDelete      guifg=#960050 guibg=#1E0010
+hi DiffText                      guibg=#4C4745 gui=italic,bold
+
+hi Directory       guifg=#A6E22E               gui=bold
+hi Error           guifg=#E6DB74 guibg=#1E0010
+hi ErrorMsg        guifg=#F92672 guibg=#232526 gui=bold
+hi Exception       guifg=#A6E22E               gui=bold
+hi Float           guifg=#AE81FF
+hi FoldColumn      guifg=#465457 guibg=#000000
+hi Folded          guifg=#465457 guibg=#000000
+hi Function        guifg=#A6E22E
+hi Identifier      guifg=#FD971F
+hi Ignore          guifg=#808080 guibg=bg
+hi IncSearch       guifg=#C4BE89 guibg=#000000
+
+hi Keyword         guifg=#F92672               gui=bold
+hi Label           guifg=#E6DB74               gui=none
+hi Macro           guifg=#C4BE89               gui=italic
+hi SpecialKey      guifg=#66D9EF               gui=italic
+
+hi MatchParen      guifg=#000000 guibg=#FD971F gui=bold
+hi ModeMsg         guifg=#E6DB74
+hi MoreMsg         guifg=#E6DB74
+hi Operator        guifg=#F92672
+
+" complete menu
+hi Pmenu           guifg=#66D9EF guibg=#000000
+hi PmenuSel                      guibg=#808080
+hi PmenuSbar                     guibg=#080808
+hi PmenuThumb      guifg=#66D9EF
+
+hi PreCondit       guifg=#A6E22E               gui=bold
+hi PreProc         guifg=#A6E22E
+hi Question        guifg=#66D9EF
+hi Repeat          guifg=#F92672               gui=bold
+hi Search          guifg=#000000 guibg=#FFE792
+" marks
+hi SignColumn      guifg=#A6E22E guibg=#232526
+hi SpecialChar     guifg=#F92672               gui=bold
+hi SpecialComment  guifg=#7E8E91               gui=bold
+hi Special         guifg=#66D9EF guibg=bg      gui=italic
+if has("spell")
+    hi SpellBad    guisp=#FF0000 gui=undercurl
+    hi SpellCap    guisp=#7070F0 gui=undercurl
+    hi SpellLocal  guisp=#70F0F0 gui=undercurl
+    hi SpellRare   guisp=#FFFFFF gui=undercurl
+endif
+hi Statement       guifg=#F92672               gui=bold
+hi StatusLine      guifg=#455354 guibg=fg
+hi StatusLineNC    guifg=#808080 guibg=#080808
+hi StorageClass    guifg=#FD971F               gui=italic
+hi Structure       guifg=#66D9EF
+hi Tag             guifg=#F92672               gui=italic
+hi Title           guifg=#ef5939
+hi Todo            guifg=#FFFFFF guibg=bg      gui=bold
+
+hi Typedef         guifg=#66D9EF
+hi Type            guifg=#66D9EF               gui=none
+hi Underlined      guifg=#808080               gui=underline
+
+hi VertSplit       guifg=#808080 guibg=#080808 gui=bold
+hi VisualNOS                     guibg=#403D3D
+hi Visual                        guibg=#403D3D
+hi WarningMsg      guifg=#FFFFFF guibg=#333333 gui=bold
+hi WildMenu        guifg=#66D9EF guibg=#000000
+
+hi TabLineFill     guifg=#1B1D1E guibg=#1B1D1E
+hi TabLine         guibg=#1B1D1E guifg=#808080 gui=none
+
+hi Normal          guifg=#F8F8F2 guibg=#000000
+hi Comment         guifg=#7E8E91
+hi CursorLine                    guibg=#293739
+hi CursorLineNr    guifg=#FD971F               gui=none
+hi CursorColumn                  guibg=#293739
+hi ColorColumn                   guibg=#232526
+hi LineNr          guifg=#465457 guibg=#1B1D1E
+hi NonText         guifg=#465457
+hi SpecialKey      guifg=#465457
+
+" Must be at the end, because of ctermbg=234 bug.
+" https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ
+set background=dark
+
diff --git a/nvim/.config/nvim/config.vim b/nvim/.config/nvim/config.vim
index 5a2a6fa..076f71a 100644
--- a/nvim/.config/nvim/config.vim
+++ b/nvim/.config/nvim/config.vim
@@ -86,9 +86,4 @@ 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
+colorscheme molokai
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 3e242ee..29d97af 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -13,8 +13,6 @@ Plug 'axelf4/vim-strip-trailing-whitespace'
 Plug 'ap/vim-buftabline'
 " Manage Project sessions
 Plug 'thaerkh/vim-workspace'
-" Theme
-Plug 'lifepillar/vim-gruvbox8'
 " Syntax highlighting
 Plug 'sheerun/vim-polyglot'
 " For LaTeX support