Merge remote-tracking branch 'upstream/master' into aucmd_textputpostaucmd_textputpost

1 files changed, 242 insertions, 199 deletions

diff --git a/runtime/colors/quiet.vim b/runtime/colors/quiet.vim
index d286839250..9ab313b837 100644
--- a/runtime/colors/quiet.vim
+++ b/runtime/colors/quiet.vim
@@ -1,10 +1,10 @@
 " Name:         quiet
-" Description:  `monochrome`, but less ugly, with diffs, searches, a few other niceties, and both light and dark versions.
-" Author:       neutaaaaan <neutaaaaan-gh@protonmail.com>
-" Maintainer:   neutaaaaan <neutaaaaan-gh@protonmail.com>
+" Description:  A mostly monochrome colorscheme, with a few niceties.
+" Author:       Maxence Weynans <neutaaaaan@gmail.com>
+" Maintainer:   Maxence Weynans <neutaaaaan@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Vim License (see `:help license`)`
-" Last Updated: Fri 16 Sep 2022 09:52:50 MSK
+" Last Updated: Wed 15 Mar 2023 06:45:06 PM CET
 
 " Generated by Colortemplate v2.2.0
 
@@ -48,61 +48,66 @@ hi! link debugPC CursorLine
 
 if &background ==# 'dark'
   if (has('termguicolors') && &termguicolors) || has('gui_running')
-    let g:terminal_ansi_colors = ['#080808', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#dadada', '#707070', '#ff005f', '#00d75f', '#ffaf00', '#5fafff', '#ff87ff', '#00d7d7', '#ffffff']
+    let g:terminal_ansi_colors = ['#000000', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#dadada', '#707070', '#ff005f', '#00d75f', '#ffaf00', '#5fafff', '#ff87ff', '#00d7d7', '#ffffff']
     " Nvim uses g:terminal_color_{0-15} instead
     for i in range(g:terminal_ansi_colors->len())
       let g:terminal_color_{i} = g:terminal_ansi_colors[i]
     endfor
   endif
-  hi Normal guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi Normal guifg=#dadada guibg=#000000 gui=NONE cterm=NONE
   hi ColorColumn guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE
   hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
   hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
   hi CursorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
   hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
   hi CursorLineNr guifg=#dadada guibg=#303030 gui=NONE cterm=NONE
-  hi DiffAdd guifg=#00af00 guibg=#080808 gui=reverse cterm=reverse
-  hi DiffChange guifg=#87afd7 guibg=#080808 gui=reverse cterm=reverse
-  hi DiffDelete guifg=#d75f5f guibg=#080808 gui=reverse cterm=reverse
-  hi DiffText guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
+  hi DiffAdd guifg=#00af00 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffChange guifg=#87afd7 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffDelete guifg=#d75f5f guibg=#000000 gui=reverse cterm=reverse
+  hi DiffText guifg=#d787d7 guibg=#000000 gui=reverse cterm=reverse
   hi Directory guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi ErrorMsg guifg=#dadada guibg=#080808 gui=reverse cterm=reverse
+  hi EndOfBuffer guifg=#707070 guibg=NONE gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#dadada guibg=#000000 gui=reverse cterm=reverse
   hi FoldColumn guifg=#707070 guibg=NONE gui=NONE cterm=NONE
-  hi Folded guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
-  hi IncSearch guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
-  hi LineNr guifg=#444444 guibg=NONE gui=NONE cterm=NONE
+  hi Folded guifg=#707070 guibg=#000000 gui=NONE cterm=NONE
+  hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
+  hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
   hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
   hi ModeMsg guifg=#dadada guibg=NONE gui=bold cterm=bold
   hi MoreMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi NonText guifg=#707070 guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=#080808 guibg=#87afd7 gui=NONE cterm=NONE
-  hi PmenuSbar guifg=#dadada guibg=#707070 gui=NONE cterm=NONE
-  hi PmenuSel guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
-  hi PmenuThumb guifg=#dadada guibg=#d787d7 gui=NONE cterm=NONE
+  hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuKind guifg=#000000 guibg=#a8a8a8 gui=bold cterm=bold
+  hi PmenuSbar guifg=#707070 guibg=#585858 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#000000 guibg=#dadada gui=bold cterm=bold
+  hi PmenuThumb guifg=#dadada guibg=#dadada gui=NONE cterm=NONE
   hi Question guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi QuickFixLine guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
-  hi Search guifg=#00afff guibg=#080808 gui=reverse cterm=reverse
+  hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+  hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse
   hi SignColumn guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi SpecialKey guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#707070 guibg=NONE gui=bold cterm=bold
   hi SpellBad guifg=#d7005f guibg=NONE guisp=#d7005f gui=undercurl cterm=underline
   hi SpellCap guifg=#0087d7 guibg=NONE guisp=#0087d7 gui=undercurl cterm=underline
   hi SpellLocal guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl cterm=underline
   hi SpellRare guifg=#00afaf guibg=NONE guisp=#00afaf gui=undercurl cterm=underline
-  hi StatusLine guifg=#080808 guibg=#dadada gui=bold cterm=bold
-  hi StatusLineNC guifg=#707070 guibg=#080808 gui=reverse cterm=reverse
-  hi TabLine guifg=#707070 guibg=#080808 gui=reverse cterm=reverse
+  hi StatusLine guifg=#000000 guibg=#dadada gui=bold cterm=bold
+  hi StatusLineNC guifg=#707070 guibg=#000000 gui=reverse cterm=reverse
+  hi TabLine guifg=#707070 guibg=#000000 gui=reverse cterm=reverse
   hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi TabLineSel guifg=#080808 guibg=#dadada gui=bold cterm=bold
+  hi TabLineSel guifg=#000000 guibg=#dadada gui=bold cterm=bold
   hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
-  hi Visual guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
+  hi VertSplit guifg=#707070 guibg=#000000 gui=NONE cterm=NONE
+  hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
   hi VisualNOS guifg=NONE guibg=#303030 gui=NONE cterm=NONE
   hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi WildMenu guifg=#00afff guibg=#080808 gui=bold cterm=bold
+  hi WildMenu guifg=#00afff guibg=#000000 gui=bold cterm=bold
   hi Comment guifg=#707070 guibg=NONE gui=bold cterm=bold
   hi Constant guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi Error guifg=#ff005f guibg=#080808 gui=bold,reverse cterm=bold,reverse
+  hi Error guifg=#ff005f guibg=#000000 gui=bold,reverse cterm=bold,reverse
   hi Identifier guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi Ignore guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi PreProc guifg=#dadada guibg=NONE gui=NONE cterm=NONE
@@ -111,131 +116,141 @@ if &background ==# 'dark'
   hi Todo guifg=#00ffaf guibg=NONE gui=bold,reverse cterm=bold,reverse
   hi Type guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi Underlined guifg=#dadada guibg=NONE gui=underline cterm=underline
-  hi CursorIM guifg=#080808 guibg=#afff00 gui=NONE cterm=NONE
-  hi ToolbarLine guifg=NONE guibg=#080808 gui=NONE cterm=NONE
-  hi ToolbarButton guifg=#dadada guibg=#080808 gui=bold cterm=bold
+  hi CursorIM guifg=#000000 guibg=#afff00 gui=NONE cterm=NONE
+  hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE
+  hi ToolbarButton guifg=#dadada guibg=#000000 gui=bold cterm=bold
 else
   " Light background
   if (has('termguicolors') && &termguicolors) || has('gui_running')
-    let g:terminal_ansi_colors = ['#080808', '#af0000', '#005f00', '#af5f00', '#005faf', '#870087', '#008787', '#d7d7d7', '#626262', '#d70000', '#008700', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff']
+    let g:terminal_ansi_colors = ['#000000', '#af0000', '#005f00', '#af5f00', '#005faf', '#870087', '#008787', '#d7d7d7', '#626262', '#d70000', '#008700', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff']
     " Nvim uses g:terminal_color_{0-15} instead
     for i in range(g:terminal_ansi_colors->len())
       let g:terminal_color_{i} = g:terminal_ansi_colors[i]
     endfor
   endif
-  hi Normal guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi Normal guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE
   hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
   hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
   hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
   hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
   hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-  hi CursorLineNr guifg=#080808 guibg=#eeeeee gui=NONE cterm=NONE
-  hi DiffAdd guifg=#87d787 guibg=#080808 gui=reverse cterm=reverse
-  hi DiffChange guifg=#afafd7 guibg=#080808 gui=reverse cterm=reverse
-  hi DiffDelete guifg=#d78787 guibg=#080808 gui=reverse cterm=reverse
-  hi DiffText guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
-  hi Directory guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi ErrorMsg guifg=#080808 guibg=#d7d7d7 gui=reverse cterm=reverse
+  hi CursorLineNr guifg=#000000 guibg=#eeeeee gui=NONE cterm=NONE
+  hi DiffAdd guifg=#87d787 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffChange guifg=#afafd7 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffDelete guifg=#d78787 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffText guifg=#d787d7 guibg=#000000 gui=reverse cterm=reverse
+  hi Directory guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#000000 guibg=#d7d7d7 gui=reverse cterm=reverse
   hi FoldColumn guifg=#626262 guibg=NONE gui=NONE cterm=NONE
   hi Folded guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi IncSearch guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
+  hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
   hi LineNr guifg=#a8a8a8 guibg=NONE gui=NONE cterm=NONE
   hi MatchParen guifg=#ff00af guibg=#d7d7d7 gui=bold cterm=bold
-  hi ModeMsg guifg=#080808 guibg=NONE gui=bold cterm=bold
-  hi MoreMsg guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi ModeMsg guifg=#000000 guibg=NONE gui=bold cterm=bold
+  hi MoreMsg guifg=#000000 guibg=NONE gui=NONE cterm=NONE
   hi NonText guifg=#626262 guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=#080808 guibg=#afafd7 gui=NONE cterm=NONE
-  hi PmenuSbar guifg=#080808 guibg=#626262 gui=NONE cterm=NONE
-  hi PmenuSel guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
-  hi PmenuThumb guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
-  hi Question guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi QuickFixLine guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
-  hi Search guifg=#00afff guibg=#080808 gui=reverse cterm=reverse
-  hi SignColumn guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi SpecialKey guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuKind guifg=#000000 guibg=#a8a8a8 gui=bold cterm=bold
+  hi PmenuSbar guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#d7d7d7 guibg=#000000 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#d7d7d7 guibg=#000000 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#d7d7d7 guibg=#000000 gui=bold cterm=bold
+  hi PmenuThumb guifg=#000000 guibg=#000000 gui=NONE cterm=NONE
+  hi Question guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+  hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse
+  hi SignColumn guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#626262 guibg=NONE gui=bold cterm=bold
   hi SpellBad guifg=#af0000 guibg=#d7d7d7 guisp=#af0000 gui=undercurl cterm=underline
   hi SpellCap guifg=#005faf guibg=#d7d7d7 guisp=#005faf gui=undercurl cterm=underline
   hi SpellLocal guifg=#870087 guibg=#d7d7d7 guisp=#870087 gui=undercurl cterm=underline
   hi SpellRare guifg=#008787 guibg=#d7d7d7 guisp=#008787 gui=undercurl cterm=underline
-  hi StatusLine guifg=#eeeeee guibg=#080808 gui=bold cterm=bold
-  hi StatusLineNC guifg=#080808 guibg=#a8a8a8 gui=NONE cterm=NONE
-  hi TabLine guifg=#080808 guibg=#a8a8a8 gui=NONE cterm=NONE
-  hi TabLineFill guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi TabLineSel guifg=#eeeeee guibg=#080808 gui=bold cterm=bold
+  hi StatusLine guifg=#eeeeee guibg=#000000 gui=bold cterm=bold
+  hi StatusLineNC guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi TabLine guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi TabLineFill guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#eeeeee guibg=#000000 gui=bold cterm=bold
   hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi VertSplit guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi Visual guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
+  hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
   hi VisualNOS guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-  hi WarningMsg guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi WildMenu guifg=#080808 guibg=#eeeeee gui=bold cterm=bold
-  hi Comment guifg=#080808 guibg=NONE gui=bold cterm=bold
-  hi Constant guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Error guifg=#ff005f guibg=#080808 gui=bold,reverse cterm=bold,reverse
-  hi Identifier guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Ignore guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi PreProc guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Special guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Statement guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Todo guifg=#00ffaf guibg=#080808 gui=bold,reverse cterm=bold,reverse
-  hi Type guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Underlined guifg=#080808 guibg=NONE gui=underline cterm=underline
-  hi CursorIM guifg=#080808 guibg=#afff00 gui=NONE cterm=NONE
+  hi WarningMsg guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi WildMenu guifg=#000000 guibg=#eeeeee gui=bold cterm=bold
+  hi Comment guifg=#000000 guibg=NONE gui=bold cterm=bold
+  hi Constant guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Error guifg=#ff005f guibg=#000000 gui=bold,reverse cterm=bold,reverse
+  hi Identifier guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Ignore guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=#00ffaf guibg=#000000 gui=bold,reverse cterm=bold,reverse
+  hi Type guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=#000000 guibg=NONE gui=underline cterm=underline
+  hi CursorIM guifg=#000000 guibg=#afff00 gui=NONE cterm=NONE
   hi ToolbarLine guifg=NONE guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi ToolbarButton guifg=#080808 guibg=#d7d7d7 gui=bold cterm=bold
+  hi ToolbarButton guifg=#000000 guibg=#d7d7d7 gui=bold cterm=bold
 endif
 
 if s:t_Co >= 256
   if &background ==# 'dark'
-    hi Normal ctermfg=253 ctermbg=232 cterm=NONE
+    hi Normal ctermfg=253 ctermbg=16 cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CurSearch ctermfg=207 ctermbg=16 cterm=reverse
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
     hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
     hi CursorLineNr ctermfg=253 ctermbg=236 cterm=NONE
-    hi DiffAdd ctermfg=34 ctermbg=232 cterm=reverse
-    hi DiffChange ctermfg=110 ctermbg=232 cterm=reverse
-    hi DiffDelete ctermfg=167 ctermbg=232 cterm=reverse
-    hi DiffText ctermfg=176 ctermbg=232 cterm=reverse
+    hi DiffAdd ctermfg=34 ctermbg=16 cterm=reverse
+    hi DiffChange ctermfg=110 ctermbg=16 cterm=reverse
+    hi DiffDelete ctermfg=167 ctermbg=16 cterm=reverse
+    hi DiffText ctermfg=176 ctermbg=16 cterm=reverse
     hi Directory ctermfg=253 ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=253 ctermbg=NONE cterm=NONE
-    hi ErrorMsg ctermfg=253 ctermbg=232 cterm=reverse
+    hi EndOfBuffer ctermfg=242 ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=253 ctermbg=16 cterm=reverse
     hi FoldColumn ctermfg=242 ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=242 ctermbg=232 cterm=NONE
-    hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse
-    hi LineNr ctermfg=238 ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=242 ctermbg=16 cterm=NONE
+    hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
+    hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
     hi ModeMsg ctermfg=253 ctermbg=NONE cterm=bold
     hi MoreMsg ctermfg=253 ctermbg=NONE cterm=NONE
     hi NonText ctermfg=242 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=232 ctermbg=110 cterm=NONE
-    hi PmenuSbar ctermfg=253 ctermbg=242 cterm=NONE
-    hi PmenuSel ctermfg=232 ctermbg=176 cterm=NONE
-    hi PmenuThumb ctermfg=253 ctermbg=176 cterm=NONE
+    hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE
+    hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE
+    hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold
+    hi PmenuSbar ctermfg=242 ctermbg=240 cterm=NONE
+    hi PmenuSel ctermfg=16 ctermbg=253 cterm=NONE
+    hi PmenuExtraSel ctermfg=16 ctermbg=253 cterm=NONE
+    hi PmenuKindSel ctermfg=16 ctermbg=253 cterm=bold
+    hi PmenuThumb ctermfg=253 ctermbg=253 cterm=NONE
     hi Question ctermfg=253 ctermbg=NONE cterm=NONE
-    hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse
-    hi Search ctermfg=39 ctermbg=232 cterm=reverse
+    hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse
+    hi Search ctermfg=39 ctermbg=16 cterm=reverse
     hi SignColumn ctermfg=253 ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=253 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=242 ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=161 ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=32 ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=176 ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline
-    hi StatusLine ctermfg=232 ctermbg=253 cterm=bold
-    hi StatusLineNC ctermfg=242 ctermbg=232 cterm=reverse
-    hi TabLine ctermfg=242 ctermbg=232 cterm=reverse
+    hi StatusLine ctermfg=16 ctermbg=253 cterm=bold
+    hi StatusLineNC ctermfg=242 ctermbg=16 cterm=reverse
+    hi TabLine ctermfg=242 ctermbg=16 cterm=reverse
     hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE
-    hi TabLineSel ctermfg=232 ctermbg=253 cterm=bold
+    hi TabLineSel ctermfg=16 ctermbg=253 cterm=bold
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=242 ctermbg=232 cterm=NONE
-    hi Visual ctermfg=214 ctermbg=232 cterm=reverse
+    hi VertSplit ctermfg=242 ctermbg=16 cterm=NONE
+    hi Visual ctermfg=214 ctermbg=16 cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=236 cterm=NONE
     hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE
-    hi WildMenu ctermfg=39 ctermbg=232 cterm=bold
+    hi WildMenu ctermfg=39 ctermbg=16 cterm=bold
     hi Comment ctermfg=242 ctermbg=NONE cterm=bold
     hi Constant ctermfg=253 ctermbg=NONE cterm=NONE
-    hi Error ctermfg=197 ctermbg=232 cterm=bold,reverse
+    hi Error ctermfg=197 ctermbg=16 cterm=bold,reverse
     hi Identifier ctermfg=253 ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=253 ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=253 ctermbg=NONE cterm=NONE
@@ -244,71 +259,76 @@ if s:t_Co >= 256
     hi Todo ctermfg=49 ctermbg=NONE cterm=bold,reverse
     hi Type ctermfg=253 ctermbg=NONE cterm=NONE
     hi Underlined ctermfg=253 ctermbg=NONE cterm=underline
-    hi CursorIM ctermfg=232 ctermbg=154 cterm=NONE
-    hi ToolbarLine ctermfg=NONE ctermbg=232 cterm=NONE
-    hi ToolbarButton ctermfg=253 ctermbg=232 cterm=bold
+    hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
+    hi ToolbarButton ctermfg=253 ctermbg=16 cterm=bold
   else
     " Light background
-    hi Normal ctermfg=232 ctermbg=188 cterm=NONE
+    hi Normal ctermfg=16 ctermbg=188 cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CurSearch ctermfg=207 ctermbg=16 cterm=reverse
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
     hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE
-    hi CursorLineNr ctermfg=232 ctermbg=255 cterm=NONE
-    hi DiffAdd ctermfg=114 ctermbg=232 cterm=reverse
-    hi DiffChange ctermfg=146 ctermbg=232 cterm=reverse
-    hi DiffDelete ctermfg=174 ctermbg=232 cterm=reverse
-    hi DiffText ctermfg=176 ctermbg=232 cterm=reverse
-    hi Directory ctermfg=232 ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=232 ctermbg=NONE cterm=NONE
-    hi ErrorMsg ctermfg=232 ctermbg=188 cterm=reverse
+    hi CursorLineNr ctermfg=16 ctermbg=255 cterm=NONE
+    hi DiffAdd ctermfg=114 ctermbg=16 cterm=reverse
+    hi DiffChange ctermfg=146 ctermbg=16 cterm=reverse
+    hi DiffDelete ctermfg=174 ctermbg=16 cterm=reverse
+    hi DiffText ctermfg=176 ctermbg=16 cterm=reverse
+    hi Directory ctermfg=16 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=241 ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=16 ctermbg=188 cterm=reverse
     hi FoldColumn ctermfg=241 ctermbg=NONE cterm=NONE
     hi Folded ctermfg=241 ctermbg=188 cterm=NONE
-    hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse
+    hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
     hi LineNr ctermfg=248 ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=199 ctermbg=188 cterm=bold
-    hi ModeMsg ctermfg=232 ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=232 ctermbg=NONE cterm=NONE
+    hi ModeMsg ctermfg=16 ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=16 ctermbg=NONE cterm=NONE
     hi NonText ctermfg=241 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=232 ctermbg=146 cterm=NONE
-    hi PmenuSbar ctermfg=232 ctermbg=241 cterm=NONE
-    hi PmenuSel ctermfg=232 ctermbg=176 cterm=NONE
-    hi PmenuThumb ctermfg=232 ctermbg=176 cterm=NONE
-    hi Question ctermfg=232 ctermbg=NONE cterm=NONE
-    hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse
-    hi Search ctermfg=39 ctermbg=232 cterm=reverse
-    hi SignColumn ctermfg=232 ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=232 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE
+    hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE
+    hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold
+    hi PmenuSbar ctermfg=16 ctermbg=254 cterm=NONE
+    hi PmenuSel ctermfg=188 ctermbg=16 cterm=NONE
+    hi PmenuExtraSel ctermfg=188 ctermbg=16 cterm=NONE
+    hi PmenuKindSel ctermfg=188 ctermbg=16 cterm=bold
+    hi PmenuThumb ctermfg=16 ctermbg=16 cterm=NONE
+    hi Question ctermfg=16 ctermbg=NONE cterm=NONE
+    hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse
+    hi Search ctermfg=39 ctermbg=16 cterm=reverse
+    hi SignColumn ctermfg=16 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=241 ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=124 ctermbg=188 cterm=underline
     hi SpellCap ctermfg=25 ctermbg=188 cterm=underline
     hi SpellLocal ctermfg=90 ctermbg=188 cterm=underline
     hi SpellRare ctermfg=30 ctermbg=188 cterm=underline
-    hi StatusLine ctermfg=255 ctermbg=232 cterm=bold
-    hi StatusLineNC ctermfg=232 ctermbg=248 cterm=NONE
-    hi TabLine ctermfg=232 ctermbg=248 cterm=NONE
-    hi TabLineFill ctermfg=232 ctermbg=188 cterm=NONE
-    hi TabLineSel ctermfg=255 ctermbg=232 cterm=bold
+    hi StatusLine ctermfg=255 ctermbg=16 cterm=bold
+    hi StatusLineNC ctermfg=16 ctermbg=248 cterm=NONE
+    hi TabLine ctermfg=16 ctermbg=248 cterm=NONE
+    hi TabLineFill ctermfg=16 ctermbg=188 cterm=NONE
+    hi TabLineSel ctermfg=255 ctermbg=16 cterm=bold
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=241 ctermbg=188 cterm=NONE
-    hi Visual ctermfg=214 ctermbg=232 cterm=reverse
+    hi Visual ctermfg=214 ctermbg=16 cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=255 cterm=NONE
-    hi WarningMsg ctermfg=232 ctermbg=NONE cterm=NONE
-    hi WildMenu ctermfg=232 ctermbg=255 cterm=bold
-    hi Comment ctermfg=232 ctermbg=NONE cterm=bold
-    hi Constant ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Error ctermfg=197 ctermbg=232 cterm=bold,reverse
-    hi Identifier ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=232 ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Special ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=49 ctermbg=232 cterm=bold,reverse
-    hi Type ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=232 ctermbg=NONE cterm=underline
-    hi CursorIM ctermfg=232 ctermbg=154 cterm=NONE
+    hi WarningMsg ctermfg=16 ctermbg=NONE cterm=NONE
+    hi WildMenu ctermfg=16 ctermbg=255 cterm=bold
+    hi Comment ctermfg=16 ctermbg=NONE cterm=bold
+    hi Constant ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Error ctermfg=197 ctermbg=16 cterm=bold,reverse
+    hi Identifier ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=16 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=49 ctermbg=16 cterm=bold,reverse
+    hi Type ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=16 ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE
     hi ToolbarLine ctermfg=NONE ctermbg=188 cterm=NONE
-    hi ToolbarButton ctermfg=232 ctermbg=188 cterm=bold
+    hi ToolbarButton ctermfg=16 ctermbg=188 cterm=bold
   endif
   unlet s:t_Co
   finish
@@ -316,6 +336,19 @@ endif
 
 if s:t_Co >= 16
   if &background ==# 'dark'
+    hi Comment ctermfg=darkgrey ctermbg=NONE cterm=bold
+    hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
+    hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi Search ctermfg=cyan ctermbg=black cterm=reverse
+    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold
+    hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -328,43 +361,35 @@ if s:t_Co >= 16
     hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
     hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
     hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline
-    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
     hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Question ctermfg=NONE ctermbg=NONE cterm=standout
     hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
-    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -378,6 +403,18 @@ if s:t_Co >= 16
     hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   else
     " Light background
+    hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
+    hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi Search ctermfg=cyan ctermbg=black cterm=reverse
+    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold
+    hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -390,43 +427,36 @@ if s:t_Co >= 16
     hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
     hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
     hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline
-    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
     hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Question ctermfg=NONE ctermbg=NONE cterm=standout
     hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
-    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
     hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -445,6 +475,19 @@ endif
 
 if s:t_Co >= 8
   if &background ==# 'dark'
+    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+    hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -457,43 +500,35 @@ if s:t_Co >= 8
     hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
     hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
     hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline
-    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
     hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Question ctermfg=NONE ctermbg=NONE cterm=standout
     hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
-    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -507,6 +542,18 @@ if s:t_Co >= 8
     hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   else
     " Light background
+    hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -519,43 +566,36 @@ if s:t_Co >= 8
     hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
     hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
     hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline
-    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
     hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Question ctermfg=NONE ctermbg=NONE cterm=standout
     hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
-    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
     hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -641,7 +681,7 @@ if s:t_Co >= 0
 endif
 
 " Background: dark
-" Color: dark0         #080808           232               black
+" Color: dark0         #000000           16                black
 " Color: dark1         #d7005f           161               darkred
 " Color: dark2         #00af5f           35                darkgreen
 " Color: dark3         #d78700           172               darkyellow
@@ -669,13 +709,15 @@ endif
 " Color: uiamber       #ffaf00           214               darkyellow
 " Color: uiblack       #303030           236               darkgrey
 " Color: yasogrey      #1c1c1c           234               black
-" Color: linenrblack   #444444           238               darkgrey
+" Color: linenrblack   #585858           240               darkgrey
+" Color: uicursearch   #ff5fff           207               magenta
+" Color: invisigrey    #a8a8a8           248               darkgrey
 " Color: errorred      #ff005f           197               red
 " Term colors: dark0 dark1 dark2 dark3 dark4 dark5 dark6 dark7
 " Term colors: dark8 dark9 dark10 dark11 dark12 dark13 dark14 dark15
 " Background: light
 " Color: brightwhite   #eeeeee           255               grey
-" Color: light0        #080808           232               black
+" Color: light0        #000000           16                black
 " Color: light1        #af0000           124               darkred
 " Color: light2        #005f00           22                darkgreen
 " Color: light3        #af5f00           130               darkyellow
@@ -703,6 +745,7 @@ endif
 " Color: uiamber       #ffaf00           214               yellow
 " Color: invisigrey    #a8a8a8           248               darkgrey
 " Color: yasogrey      #e4e4e4           254               grey
+" Color: uicursearch   #ff5fff           207               magenta
 " Color: errorred      #ff005f           197               red
 " Term colors: light0 light1 light2 light3 light4 light5 light6 light7
 " Term colors: light8 light9 light10 light11 light12 light13 light14 light15