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

1 files changed, 84 insertions, 131 deletions

diff --git a/runtime/colors/lunaperche.vim b/runtime/colors/lunaperche.vim
index 2954f622aa..44c75c40cb 100644
--- a/runtime/colors/lunaperche.vim
+++ b/runtime/colors/lunaperche.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Vim License (see `:help license`)
-" Last Updated: Fri 16 Sep 2022 13:15:33 MSK
+" Last Updated: Sun 26 Mar 2023 23:04:18 AEDT
 
 " Generated by Colortemplate v2.2.0
 
@@ -16,24 +16,8 @@ let s:t_Co = &t_Co
 hi! link helpVim Title
 hi! link helpHeader Title
 hi! link helpHyperTextJump Underlined
-hi! link fugitiveSymbolicRef PreProc
-hi! link fugitiveHeading Statement
-hi! link fugitiveStagedHeading Statement
-hi! link fugitiveUnstagedHeading Statement
-hi! link fugitiveUntrackedHeading Statement
-hi! link fugitiveStagedModifier PreProc
-hi! link fugitiveUnstagedModifier PreProc
-hi! link fugitiveHash Constant
 hi! link diffFile PreProc
 hi! link markdownHeadingDelimiter Special
-hi! link rstSectionDelimiter Statement
-hi! link rstDirective PreProc
-hi! link rstHyperlinkReference Special
-hi! link rstFieldName Constant
-hi! link rstDelimiter Special
-hi! link rstInterpretedText Special
-hi! link rstCodeBlock Normal
-hi! link rstLiteralBlock rstCodeBlock
 hi! link markdownUrl String
 hi! link colortemplateKey Statement
 hi! link xmlTagName Statement
@@ -51,30 +35,6 @@ hi! link vimParenSep Normal
 hi! link vimOption Normal
 hi! link vimCommentString Comment
 hi! link pythonInclude Statement
-hi! link elixirOperator Statement
-hi! link elixirKeyword Statement
-hi! link elixirBlockDefinition Statement
-hi! link elixirDefine Statement
-hi! link elixirPrivateDefine Statement
-hi! link elixirGuard Statement
-hi! link elixirPrivateGuard Statement
-hi! link elixirModuleDefine Statement
-hi! link elixirProtocolDefine Statement
-hi! link elixirImplDefine Statement
-hi! link elixirRecordDefine Statement
-hi! link elixirPrivateRecordDefine Statement
-hi! link elixirMacroDefine Statement
-hi! link elixirPrivateMacroDefine Statement
-hi! link elixirDelegateDefine Statement
-hi! link elixirOverridableDefine Statement
-hi! link elixirExceptionDefine Statement
-hi! link elixirCallbackDefine Statement
-hi! link elixirStructDefine Statement
-hi! link elixirExUnitMacro Statement
-hi! link elixirInclude Statement
-hi! link elixirVariable Special
-hi! link elixirAtom Constant
-hi! link elixirDocTest String
 hi! link shQuote Constant
 hi! link shNoQuote Normal
 hi! link shTestOpr Normal
@@ -138,12 +98,16 @@ if &background ==# 'dark'
   hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
   hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
   hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
   hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE
-  hi PmenuSel guifg=NONE guibg=#444444 gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuSel guifg=NONE guibg=#4e4e4e gui=NONE cterm=NONE
   hi PmenuThumb guifg=NONE guibg=#c6c6c6 gui=NONE cterm=NONE
   hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuKind guifg=#ff5f5f guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#ff5f5f guibg=#4e4e4e gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#767676 guibg=#4e4e4e gui=NONE cterm=NONE
   hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Error guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE
   hi ErrorMsg guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE
@@ -165,8 +129,8 @@ if &background ==# 'dark'
   hi VisualNOS guifg=#000000 guibg=#5fafaf gui=NONE cterm=NONE
   hi CursorLine guifg=NONE guibg=#262626 gui=NONE cterm=NONE
   hi CursorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
-  hi Folded guifg=#767676 guibg=#1c1c1c gui=NONE cterm=NONE
-  hi ColorColumn guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE
+  hi Folded guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
   hi SpellBad guifg=NONE guibg=NONE guisp=#ff5f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
   hi SpellCap guifg=NONE guibg=NONE guisp=#5fafaf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
   hi SpellLocal guifg=NONE guibg=NONE guisp=#5faf5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -184,9 +148,9 @@ if &background ==# 'dark'
   hi Directory guifg=#5fafff guibg=NONE gui=bold cterm=bold
   hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi DiffAdd guifg=#000000 guibg=#af87af gui=NONE cterm=NONE
-  hi DiffChange guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
-  hi DiffText guifg=#000000 guibg=#5fd7d7 gui=NONE cterm=NONE
+  hi DiffAdd guifg=#c6c6c6 guibg=#875f87 gui=NONE cterm=NONE
+  hi DiffChange guifg=#c6c6c6 guibg=#5f5f5f gui=NONE cterm=NONE
+  hi DiffText guifg=#afffff guibg=#5f8787 gui=NONE cterm=NONE
   hi DiffDelete guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
   hi diffAdded guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
   hi diffRemoved guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
@@ -230,10 +194,14 @@ else
   hi FoldColumn guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
   hi EndOfBuffer guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
   hi SpecialKey guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi Pmenu guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
   hi PmenuSel guifg=NONE guibg=#c6c6c6 gui=NONE cterm=NONE
   hi PmenuThumb guifg=NONE guibg=#767676 gui=NONE cterm=NONE
   hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuKind guifg=#af0000 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#af0000 guibg=#c6c6c6 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#767676 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#767676 guibg=#c6c6c6 gui=NONE cterm=NONE
   hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Error guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
   hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
@@ -253,10 +221,10 @@ else
   hi Visual guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
   hi MatchParen guifg=NONE guibg=#c5e7c5 gui=NONE cterm=NONE
   hi VisualNOS guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
-  hi CursorLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-  hi CursorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-  hi Folded guifg=#767676 guibg=#eeeeee gui=NONE cterm=NONE
-  hi ColorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi Folded guifg=#767676 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
   hi SpellBad guifg=NONE guibg=NONE guisp=#af0000 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
   hi SpellCap guifg=NONE guibg=NONE guisp=#005f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
   hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -302,24 +270,8 @@ if s:t_Co >= 256
   hi! link helpVim Title
   hi! link helpHeader Title
   hi! link helpHyperTextJump Underlined
-  hi! link fugitiveSymbolicRef PreProc
-  hi! link fugitiveHeading Statement
-  hi! link fugitiveStagedHeading Statement
-  hi! link fugitiveUnstagedHeading Statement
-  hi! link fugitiveUntrackedHeading Statement
-  hi! link fugitiveStagedModifier PreProc
-  hi! link fugitiveUnstagedModifier PreProc
-  hi! link fugitiveHash Constant
   hi! link diffFile PreProc
   hi! link markdownHeadingDelimiter Special
-  hi! link rstSectionDelimiter Statement
-  hi! link rstDirective PreProc
-  hi! link rstHyperlinkReference Special
-  hi! link rstFieldName Constant
-  hi! link rstDelimiter Special
-  hi! link rstInterpretedText Special
-  hi! link rstCodeBlock Normal
-  hi! link rstLiteralBlock rstCodeBlock
   hi! link markdownUrl String
   hi! link colortemplateKey Statement
   hi! link xmlTagName Statement
@@ -337,30 +289,6 @@ if s:t_Co >= 256
   hi! link vimOption Normal
   hi! link vimCommentString Comment
   hi! link pythonInclude Statement
-  hi! link elixirOperator Statement
-  hi! link elixirKeyword Statement
-  hi! link elixirBlockDefinition Statement
-  hi! link elixirDefine Statement
-  hi! link elixirPrivateDefine Statement
-  hi! link elixirGuard Statement
-  hi! link elixirPrivateGuard Statement
-  hi! link elixirModuleDefine Statement
-  hi! link elixirProtocolDefine Statement
-  hi! link elixirImplDefine Statement
-  hi! link elixirRecordDefine Statement
-  hi! link elixirPrivateRecordDefine Statement
-  hi! link elixirMacroDefine Statement
-  hi! link elixirPrivateMacroDefine Statement
-  hi! link elixirDelegateDefine Statement
-  hi! link elixirOverridableDefine Statement
-  hi! link elixirExceptionDefine Statement
-  hi! link elixirCallbackDefine Statement
-  hi! link elixirStructDefine Statement
-  hi! link elixirExUnitMacro Statement
-  hi! link elixirInclude Statement
-  hi! link elixirVariable Special
-  hi! link elixirAtom Constant
-  hi! link elixirDocTest String
   hi! link shQuote Constant
   hi! link shNoQuote Normal
   hi! link shTestOpr Normal
@@ -417,12 +345,16 @@ if s:t_Co >= 256
     hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
     hi NonText ctermfg=240 ctermbg=NONE cterm=NONE
     hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
     hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=NONE ctermbg=234 cterm=NONE
-    hi PmenuSel ctermfg=NONE ctermbg=238 cterm=NONE
+    hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=236 cterm=NONE
+    hi PmenuSel ctermfg=NONE ctermbg=239 cterm=NONE
     hi PmenuThumb ctermfg=NONE ctermbg=251 cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuKind ctermfg=203 ctermbg=236 cterm=NONE
+    hi PmenuKindSel ctermfg=203 ctermbg=239 cterm=NONE
+    hi PmenuExtra ctermfg=243 ctermbg=236 cterm=NONE
+    hi PmenuExtraSel ctermfg=243 ctermbg=239 cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=231 ctermbg=203 cterm=NONE
     hi ErrorMsg ctermfg=231 ctermbg=203 cterm=NONE
@@ -442,8 +374,8 @@ if s:t_Co >= 256
     hi VisualNOS ctermfg=16 ctermbg=73 cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=235 cterm=NONE
     hi CursorColumn ctermfg=NONE ctermbg=235 cterm=NONE
-    hi Folded ctermfg=243 ctermbg=234 cterm=NONE
-    hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE
+    hi Folded ctermfg=243 ctermbg=236 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=236 cterm=NONE
     hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=73 ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=77 ctermbg=NONE cterm=underline
@@ -461,9 +393,9 @@ if s:t_Co >= 256
     hi Directory ctermfg=75 ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=16 ctermbg=139 cterm=NONE
-    hi DiffChange ctermfg=16 ctermbg=252 cterm=NONE
-    hi DiffText ctermfg=16 ctermbg=80 cterm=NONE
+    hi DiffAdd ctermfg=251 ctermbg=96 cterm=NONE
+    hi DiffChange ctermfg=251 ctermbg=59 cterm=NONE
+    hi DiffText ctermfg=159 ctermbg=66 cterm=NONE
     hi DiffDelete ctermfg=174 ctermbg=NONE cterm=NONE
     hi diffAdded ctermfg=77 ctermbg=NONE cterm=NONE
     hi diffRemoved ctermfg=174 ctermbg=NONE cterm=NONE
@@ -500,10 +432,14 @@ if s:t_Co >= 256
     hi FoldColumn ctermfg=247 ctermbg=NONE cterm=NONE
     hi EndOfBuffer ctermfg=247 ctermbg=NONE cterm=NONE
     hi SpecialKey ctermfg=247 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=NONE ctermbg=255 cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=254 cterm=NONE
     hi PmenuSel ctermfg=NONE ctermbg=251 cterm=NONE
     hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuKind ctermfg=124 ctermbg=254 cterm=NONE
+    hi PmenuKindSel ctermfg=124 ctermbg=251 cterm=NONE
+    hi PmenuExtra ctermfg=243 ctermbg=254 cterm=NONE
+    hi PmenuExtraSel ctermfg=243 ctermbg=251 cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=231 ctermbg=160 cterm=NONE
     hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
@@ -521,10 +457,10 @@ if s:t_Co >= 256
     hi Visual ctermfg=231 ctermbg=67 cterm=NONE
     hi MatchParen ctermfg=30 ctermbg=231 cterm=reverse
     hi VisualNOS ctermfg=231 ctermbg=30 cterm=NONE
-    hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
-    hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE
-    hi Folded ctermfg=243 ctermbg=255 cterm=NONE
-    hi ColorColumn ctermfg=NONE ctermbg=255 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE
+    hi Folded ctermfg=243 ctermbg=254 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
     hi SpellBad ctermfg=124 ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=23 ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=28 ctermbg=NONE cterm=underline
@@ -585,12 +521,16 @@ if s:t_Co >= 16
     hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
     hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
     hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE
     hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=black ctermbg=darkgrey cterm=NONE
-    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
+    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=white ctermbg=red cterm=NONE
     hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
@@ -629,8 +569,8 @@ if s:t_Co >= 16
     hi Directory ctermfg=blue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
+    hi DiffAdd ctermfg=white ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=white ctermbg=darkgreen cterm=NONE
     hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
     hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
     hi diffAdded ctermfg=green ctermbg=NONE cterm=NONE
@@ -669,9 +609,13 @@ if s:t_Co >= 16
     hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
     hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
+    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=white ctermbg=red cterm=NONE
     hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
@@ -751,14 +695,18 @@ if s:t_Co >= 8
     hi QuickFixLine ctermfg=grey ctermbg=darkblue cterm=bold
     hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
     hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=black ctermbg=NONE cterm=NONE
-    hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=NONE ctermbg=grey cterm=NONE
+    hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
     hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
     hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
+    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=grey ctermbg=darkred cterm=NONE
     hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
@@ -796,8 +744,8 @@ if s:t_Co >= 8
     hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi DiffAdd ctermfg=white ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=white ctermbg=darkgreen cterm=NONE
     hi DiffText ctermfg=black ctermbg=grey cterm=NONE
     hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
   else
@@ -818,10 +766,14 @@ if s:t_Co >= 8
     hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
     hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
     hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=NONE ctermbg=black cterm=NONE
+    hi Pmenu ctermfg=grey ctermbg=black cterm=NONE
     hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
     hi PmenuSel ctermfg=NONE ctermbg=darkcyan cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=black cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
+    hi PmenuExtra ctermfg=grey ctermbg=black cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=grey ctermbg=darkred cterm=NONE
     hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
@@ -956,20 +908,21 @@ endif
 " Color: color15                 #FFFFFF        231            white
 " Color: colorDimWhite           #E4E4E4        254            grey
 " Color: colorLine               #262626        235            darkgrey
-" Color: colorB                  #1C1C1C        234            darkgrey
+" Color: colorB                  #303030        236            darkgrey
 " Color: colorNonT               #585858        240            grey
 " Color: colorTab                #585858        240            grey
 " Color: colorC                  #FFFFFF        231            white
 " Color: colorlC                 #FF5FFF        207            magenta
 " Color: colorV                  #005F87        24             darkblue
 " Color: colorMP                 #C5E7C5        30             darkcyan
-" Color: colorPMenuSel           #444444        238            darkcyan
+" Color: colorPMenuSel           #4e4e4e        239            darkcyan
 " Color: colorDim                #878787        102            grey
-" Color: diffAdd                 #AF87AF        139            darkmagenta
+" Color: diffAdd                 #875f87        96             darkmagenta
 " Color: diffDelete              #D78787        174            darkred
-" Color: diffChange              #D0D0D0        252            lightgray
-" Color: diffText                #5FD7D7        80             cyan
-" Color: fgDiff                  #000000        16             black
+" Color: diffChange              #5f5f5f        59             darkgreen
+" Color: diffText                #5f8787        66             cyan
+" Color: fgDiffText              #afffff        159            black
+" Color: fgDiff                  #C6C6C6        251            white
 " Term colors: color00 color01 color02 color03 color04 color05 color06 color07
 " Term colors: color08 color09 color10 color11 color12 color13 color14 color15
 " Background: light
@@ -989,8 +942,8 @@ endif
 " Color: color14                 #008787        30             cyan
 " Color: color07                 #808080        244            grey
 " Color: color15                 #FFFFFF        231            white
-" Color: colorLine               #E4E4E4        254            grey
-" Color: colorB                  #EEEEEE        255            grey
+" Color: colorLine               #EEEEEE        255            grey
+" Color: colorB                  #E4E4E4        254            grey
 " Color: colorNonT               #9E9E9E        247            darkgrey
 " Color: colorTab                #BCBCBC        250            lightgrey
 " Color: colorC                  #000000        16             black