-hi! link CursorColumn CursorLine
-hi CursorLine ctermfg=NONE ctermbg=255 guifg=NONE guibg=#ebebeb guisp=NONE cterm=NONE,bold,italic gui=NONE,bold,italic
-hi DiffAdd ctermfg=233 ctermbg=158 guifg=#141414 guibg=#b3ffcc guisp=NONE cterm=NONE gui=NONE
-hi DiffChange ctermfg=233 ctermbg=153 guifg=#141414 guibg=#afc3d7 guisp=NONE cterm=NONE gui=NONE
-hi DiffDelete ctermfg=233 ctermbg=210 guifg=#141414 guibg=#ff9999 guisp=NONE cterm=NONE gui=NONE
-hi DiffText ctermfg=233 ctermbg=158 guifg=#141414 guibg=#b3ffcc guisp=NONE cterm=NONE gui=NONE
-hi Directory ctermfg=74 ctermbg=NONE guifg=#7ab1cc guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
-hi EndOfBuffer ctermfg=231 ctermbg=NONE guifg=#fbfbfb guibg=NONE guisp=NONE cterm=NONE gui=NONE
-hi Error ctermfg=231 ctermbg=124 guifg=#fbfbfb guibg=#b72e2e guisp=NONE cterm=NONE gui=NONE
+hi! link CursorColumn ColorColumn
+hi! link CursorLine ColorColumn
+hi DiffAdd ctermfg=115 ctermbg=233 guifg=#99d6c1 guibg=#121419 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
+hi DiffAdded ctermfg=115 ctermbg=233 guifg=#99d6c1 guibg=#121419 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
+hi DiffChange ctermfg=110 ctermbg=233 guifg=#a8bcd1 guibg=#121419 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
+hi DiffDelete ctermfg=217 ctermbg=233 guifg=#f5b3bb guibg=#121419 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
+hi DiffRemoved ctermfg=217 ctermbg=233 guifg=#f5b3bb guibg=#121419 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
+hi DiffText ctermfg=115 ctermbg=233 guifg=#99d6c1 guibg=#121419 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
+hi Directory ctermfg=67 ctermbg=NONE guifg=#517aa3 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold
+hi EndOfBuffer ctermfg=255 ctermbg=NONE guifg=#eaeaeb guibg=NONE guisp=NONE cterm=NONE gui=NONE
+hi Error ctermfg=160 ctermbg=NONE guifg=#dc1b33 guibg=NONE guisp=NONE cterm=NONE,bold,reverse gui=NONE,bold,standout