Add cmp highlights

Signed-off-by: BonaBeavis <gordian.dziwis@gmail.com>

183 files changed, 11503 insertions, 4916 deletions

diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
index 1786a07..9f28316 100644
--- a/colors/base16-3024.vim
+++ b/colors/base16-3024.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim
index fbb84ca..c501b43 100644
--- a/colors/base16-apathy.vim
+++ b/colors/base16-apathy.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-apprentice.vim b/colors/base16-apprentice.vim
index 19bd6dd..087e3ee 100644
--- a/colors/base16-apprentice.vim
+++ b/colors/base16-apprentice.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim
index 2c6b42e..de47c5f 100644
--- a/colors/base16-ashes.vim
+++ b/colors/base16-ashes.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-cave-light.vim b/colors/base16-atelier-cave-light.vim
index 29d551a..27224a6 100644
--- a/colors/base16-atelier-cave-light.vim
+++ b/colors/base16-atelier-cave-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim
index ae70c12..5f91381 100644
--- a/colors/base16-atelier-cave.vim
+++ b/colors/base16-atelier-cave.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-dune-light.vim b/colors/base16-atelier-dune-light.vim
index dcea4cb..6000ab9 100644
--- a/colors/base16-atelier-dune-light.vim
+++ b/colors/base16-atelier-dune-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim
index 8a80d30..4ea0337 100644
--- a/colors/base16-atelier-dune.vim
+++ b/colors/base16-atelier-dune.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-estuary-light.vim b/colors/base16-atelier-estuary-light.vim
index 5e2db8e..4c11800 100644
--- a/colors/base16-atelier-estuary-light.vim
+++ b/colors/base16-atelier-estuary-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim
index 880c37e..33384d8 100644
--- a/colors/base16-atelier-estuary.vim
+++ b/colors/base16-atelier-estuary.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-forest-light.vim b/colors/base16-atelier-forest-light.vim
index 999c462..2a6fe5c 100644
--- a/colors/base16-atelier-forest-light.vim
+++ b/colors/base16-atelier-forest-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim
index 8887ffa..28904a8 100644
--- a/colors/base16-atelier-forest.vim
+++ b/colors/base16-atelier-forest.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-heath-light.vim b/colors/base16-atelier-heath-light.vim
index 76ee317..38230d5 100644
--- a/colors/base16-atelier-heath-light.vim
+++ b/colors/base16-atelier-heath-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim
index d042167..537a255 100644
--- a/colors/base16-atelier-heath.vim
+++ b/colors/base16-atelier-heath.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-lakeside-light.vim b/colors/base16-atelier-lakeside-light.vim
index a530a27..81a2cca 100644
--- a/colors/base16-atelier-lakeside-light.vim
+++ b/colors/base16-atelier-lakeside-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim
index 0a09d36..763acc3 100644
--- a/colors/base16-atelier-lakeside.vim
+++ b/colors/base16-atelier-lakeside.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-plateau-light.vim b/colors/base16-atelier-plateau-light.vim
index 37e65be..bc041f9 100644
--- a/colors/base16-atelier-plateau-light.vim
+++ b/colors/base16-atelier-plateau-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim
index db297ce..16ee740 100644
--- a/colors/base16-atelier-plateau.vim
+++ b/colors/base16-atelier-plateau.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-savanna-light.vim b/colors/base16-atelier-savanna-light.vim
index 5aa076f..c97e01f 100644
--- a/colors/base16-atelier-savanna-light.vim
+++ b/colors/base16-atelier-savanna-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim
index 61e9d3b..219f8a8 100644
--- a/colors/base16-atelier-savanna.vim
+++ b/colors/base16-atelier-savanna.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-seaside-light.vim b/colors/base16-atelier-seaside-light.vim
index 1151718..491adba 100644
--- a/colors/base16-atelier-seaside-light.vim
+++ b/colors/base16-atelier-seaside-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim
index 5848a04..e9d43e8 100644
--- a/colors/base16-atelier-seaside.vim
+++ b/colors/base16-atelier-seaside.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-sulphurpool-light.vim b/colors/base16-atelier-sulphurpool-light.vim
index e4bc3de..0555f6c 100644
--- a/colors/base16-atelier-sulphurpool-light.vim
+++ b/colors/base16-atelier-sulphurpool-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim
index 9a59ab9..a270d5d 100644
--- a/colors/base16-atelier-sulphurpool.vim
+++ b/colors/base16-atelier-sulphurpool.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-atlas.vim b/colors/base16-atlas.vim
index 92e5d85..50bf927 100644
--- a/colors/base16-atlas.vim
+++ b/colors/base16-atlas.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim
index 1c101e4..0daaf72 100644
--- a/colors/base16-bespin.vim
+++ b/colors/base16-bespin.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-black-metal-bathory.vim b/colors/base16-black-metal-bathory.vim
index 9289b2d..79a1674 100644
--- a/colors/base16-black-metal-bathory.vim
+++ b/colors/base16-black-metal-bathory.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-black-metal-burzum.vim b/colors/base16-black-metal-burzum.vim
index 1cc2026..549edfe 100644
--- a/colors/base16-black-metal-burzum.vim
+++ b/colors/base16-black-metal-burzum.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-black-metal-dark-funeral.vim b/colors/base16-black-metal-dark-funeral.vim
index 6399b79..c6a52cd 100644
--- a/colors/base16-black-metal-dark-funeral.vim
+++ b/colors/base16-black-metal-dark-funeral.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-black-metal-gorgoroth.vim b/colors/base16-black-metal-gorgoroth.vim
index 83e1ba7..362cf5f 100644
--- a/colors/base16-black-metal-gorgoroth.vim
+++ b/colors/base16-black-metal-gorgoroth.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-black-metal-immortal.vim b/colors/base16-black-metal-immortal.vim
index acf29c6..bd49939 100644
--- a/colors/base16-black-metal-immortal.vim
+++ b/colors/base16-black-metal-immortal.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-black-metal-khold.vim b/colors/base16-black-metal-khold.vim
index dccd3db..410e64d 100644
--- a/colors/base16-black-metal-khold.vim
+++ b/colors/base16-black-metal-khold.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-black-metal-marduk.vim b/colors/base16-black-metal-marduk.vim
index 4c0c780..f3b60f6 100644
--- a/colors/base16-black-metal-marduk.vim
+++ b/colors/base16-black-metal-marduk.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-black-metal-mayhem.vim b/colors/base16-black-metal-mayhem.vim
index 901593d..5c5f9f6 100644
--- a/colors/base16-black-metal-mayhem.vim
+++ b/colors/base16-black-metal-mayhem.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-black-metal-nile.vim b/colors/base16-black-metal-nile.vim
index f6a950f..e984c1c 100644
--- a/colors/base16-black-metal-nile.vim
+++ b/colors/base16-black-metal-nile.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-black-metal-venom.vim b/colors/base16-black-metal-venom.vim
index c0f0e09..244ae74 100644
--- a/colors/base16-black-metal-venom.vim
+++ b/colors/base16-black-metal-venom.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-black-metal.vim b/colors/base16-black-metal.vim
index 6bea8e7..fb8ed72 100644
--- a/colors/base16-black-metal.vim
+++ b/colors/base16-black-metal.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim
index 8c7b399..ae6917f 100644
--- a/colors/base16-brewer.vim
+++ b/colors/base16-brewer.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim
index 1f47c3d..0baacf2 100644
--- a/colors/base16-bright.vim
+++ b/colors/base16-bright.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-brogrammer.vim b/colors/base16-brogrammer.vim
index f0896af..c3bf998 100644
--- a/colors/base16-brogrammer.vim
+++ b/colors/base16-brogrammer.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-brushtrees-dark.vim b/colors/base16-brushtrees-dark.vim
index c534b7b..3c008c9 100644
--- a/colors/base16-brushtrees-dark.vim
+++ b/colors/base16-brushtrees-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-brushtrees.vim b/colors/base16-brushtrees.vim
index f5df42f..53c150a 100644
--- a/colors/base16-brushtrees.vim
+++ b/colors/base16-brushtrees.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index 769ee44..9c8df2c 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-circus.vim b/colors/base16-circus.vim
index 0cc6353..4f8a69a 100644
--- a/colors/base16-circus.vim
+++ b/colors/base16-circus.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-classic-dark.vim b/colors/base16-classic-dark.vim
index a797104..984c6ca 100644
--- a/colors/base16-classic-dark.vim
+++ b/colors/base16-classic-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-classic-light.vim b/colors/base16-classic-light.vim
index 91444a8..8ff3fbd 100644
--- a/colors/base16-classic-light.vim
+++ b/colors/base16-classic-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim
index 9613f18..214122b 100644
--- a/colors/base16-codeschool.vim
+++ b/colors/base16-codeschool.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-colors.vim b/colors/base16-colors.vim
index 00cf1b4..4d71119 100644
--- a/colors/base16-colors.vim
+++ b/colors/base16-colors.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-cupcake.vim b/colors/base16-cupcake.vim
index 8bc45b2..dda5911 100644
--- a/colors/base16-cupcake.vim
+++ b/colors/base16-cupcake.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-cupertino.vim b/colors/base16-cupertino.vim
index debf993..a0924eb 100644
--- a/colors/base16-cupertino.vim
+++ b/colors/base16-cupertino.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-danqing.vim b/colors/base16-danqing.vim
index a19ae6d..56b6b0f 100644
--- a/colors/base16-danqing.vim
+++ b/colors/base16-danqing.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-darcula.vim b/colors/base16-darcula.vim
index 590e618..a9a9bb5 100644
--- a/colors/base16-darcula.vim
+++ b/colors/base16-darcula.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-darkmoss.vim b/colors/base16-darkmoss.vim
index 07d880a..13942e4 100644
--- a/colors/base16-darkmoss.vim
+++ b/colors/base16-darkmoss.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim
index bc1e2ce..90c540f 100644
--- a/colors/base16-darktooth.vim
+++ b/colors/base16-darktooth.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-darkviolet.vim b/colors/base16-darkviolet.vim
index 1fc2773..3a9e8a2 100644
--- a/colors/base16-darkviolet.vim
+++ b/colors/base16-darkviolet.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-decaf.vim b/colors/base16-decaf.vim
index 86195d3..7180a56 100644
--- a/colors/base16-decaf.vim
+++ b/colors/base16-decaf.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim
index 265defd..8c18899 100644
--- a/colors/base16-default-dark.vim
+++ b/colors/base16-default-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim
index 04a1849..b84cfe9 100644
--- a/colors/base16-default-light.vim
+++ b/colors/base16-default-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-dirtysea.vim b/colors/base16-dirtysea.vim
index 99e948f..9ba1da1 100644
--- a/colors/base16-dirtysea.vim
+++ b/colors/base16-dirtysea.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-dracula.vim b/colors/base16-dracula.vim
index 19d467f..0310f9b 100644
--- a/colors/base16-dracula.vim
+++ b/colors/base16-dracula.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-edge-dark.vim b/colors/base16-edge-dark.vim
index b2a419a..3f55f53 100644
--- a/colors/base16-edge-dark.vim
+++ b/colors/base16-edge-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-edge-light.vim b/colors/base16-edge-light.vim
index 740eb40..8c60f01 100644
--- a/colors/base16-edge-light.vim
+++ b/colors/base16-edge-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index 610ba23..63746a0 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim
index 21dd34f..e938a3d 100644
--- a/colors/base16-embers.vim
+++ b/colors/base16-embers.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-equilibrium-dark.vim b/colors/base16-equilibrium-dark.vim
index 6e54795..e553f75 100644
--- a/colors/base16-equilibrium-dark.vim
+++ b/colors/base16-equilibrium-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-equilibrium-gray-dark.vim b/colors/base16-equilibrium-gray-dark.vim
index 177106b..db459c3 100644
--- a/colors/base16-equilibrium-gray-dark.vim
+++ b/colors/base16-equilibrium-gray-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-equilibrium-gray-light.vim b/colors/base16-equilibrium-gray-light.vim
index 91c1743..7a6c876 100644
--- a/colors/base16-equilibrium-gray-light.vim
+++ b/colors/base16-equilibrium-gray-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-equilibrium-light.vim b/colors/base16-equilibrium-light.vim
index f0b245c..01bca05 100644
--- a/colors/base16-equilibrium-light.vim
+++ b/colors/base16-equilibrium-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-espresso.vim b/colors/base16-espresso.vim
index 30c8451..b3da1f7 100644
--- a/colors/base16-espresso.vim
+++ b/colors/base16-espresso.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-eva-dim.vim b/colors/base16-eva-dim.vim
index e604805..424e8e6 100644
--- a/colors/base16-eva-dim.vim
+++ b/colors/base16-eva-dim.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-eva.vim b/colors/base16-eva.vim
index f9d296c..2c4c1c8 100644
--- a/colors/base16-eva.vim
+++ b/colors/base16-eva.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim
index 9d4629d..a05d387 100644
--- a/colors/base16-flat.vim
+++ b/colors/base16-flat.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-framer.vim b/colors/base16-framer.vim
index fcdf0d9..bd1d726 100644
--- a/colors/base16-framer.vim
+++ b/colors/base16-framer.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-fruit-soda.vim b/colors/base16-fruit-soda.vim
index f7c95b8..7a2cd88 100644
--- a/colors/base16-fruit-soda.vim
+++ b/colors/base16-fruit-soda.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-gigavolt.vim b/colors/base16-gigavolt.vim
index 686a997..36f0cb7 100644
--- a/colors/base16-gigavolt.vim
+++ b/colors/base16-gigavolt.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-github.vim b/colors/base16-github.vim
index 038e6fd..6421a89 100644
--- a/colors/base16-github.vim
+++ b/colors/base16-github.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-google-dark.vim b/colors/base16-google-dark.vim
index b81c11d..84ee45e 100644
--- a/colors/base16-google-dark.vim
+++ b/colors/base16-google-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-google-light.vim b/colors/base16-google-light.vim
index e7ccc7a..5794a1b 100644
--- a/colors/base16-google-light.vim
+++ b/colors/base16-google-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-grayscale-dark.vim b/colors/base16-grayscale-dark.vim
index 42869f5..663ad80 100644
--- a/colors/base16-grayscale-dark.vim
+++ b/colors/base16-grayscale-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-grayscale-light.vim b/colors/base16-grayscale-light.vim
index 6d25453..b5e6cb3 100644
--- a/colors/base16-grayscale-light.vim
+++ b/colors/base16-grayscale-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index bdaa824..510194b 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-gruvbox-dark-hard.vim b/colors/base16-gruvbox-dark-hard.vim
index 8d19293..d2f0a0b 100644
--- a/colors/base16-gruvbox-dark-hard.vim
+++ b/colors/base16-gruvbox-dark-hard.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-gruvbox-dark-medium.vim b/colors/base16-gruvbox-dark-medium.vim
index b001100..4cc8d0d 100644
--- a/colors/base16-gruvbox-dark-medium.vim
+++ b/colors/base16-gruvbox-dark-medium.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-gruvbox-dark-pale.vim b/colors/base16-gruvbox-dark-pale.vim
index c4944a4..d644324 100644
--- a/colors/base16-gruvbox-dark-pale.vim
+++ b/colors/base16-gruvbox-dark-pale.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-gruvbox-dark-soft.vim b/colors/base16-gruvbox-dark-soft.vim
index a6ef84a..0ed23c4 100644
--- a/colors/base16-gruvbox-dark-soft.vim
+++ b/colors/base16-gruvbox-dark-soft.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-gruvbox-light-hard.vim b/colors/base16-gruvbox-light-hard.vim
index 83fe019..a6c7aee 100644
--- a/colors/base16-gruvbox-light-hard.vim
+++ b/colors/base16-gruvbox-light-hard.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-gruvbox-light-medium.vim b/colors/base16-gruvbox-light-medium.vim
index 8971927..cc1ca3d 100644
--- a/colors/base16-gruvbox-light-medium.vim
+++ b/colors/base16-gruvbox-light-medium.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-gruvbox-light-soft.vim b/colors/base16-gruvbox-light-soft.vim
index a43ceb8..8b66bd5 100644
--- a/colors/base16-gruvbox-light-soft.vim
+++ b/colors/base16-gruvbox-light-soft.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-hardcore.vim b/colors/base16-hardcore.vim
index f229ff3..a2d2d0f 100644
--- a/colors/base16-hardcore.vim
+++ b/colors/base16-hardcore.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic-dark.vim
index a86890e..dce0369 100644
--- a/colors/base16-harmonic-dark.vim
+++ b/colors/base16-harmonic-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic-light.vim
index e9e9ec4..3d6651c 100644
--- a/colors/base16-harmonic-light.vim
+++ b/colors/base16-harmonic-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-heetch-light.vim b/colors/base16-heetch-light.vim
index 905edce..cec9bbb 100644
--- a/colors/base16-heetch-light.vim
+++ b/colors/base16-heetch-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-heetch.vim b/colors/base16-heetch.vim
index 5e8280e..86e6c52 100644
--- a/colors/base16-heetch.vim
+++ b/colors/base16-heetch.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-helios.vim b/colors/base16-helios.vim
index bfc6086..e3f629a 100644
--- a/colors/base16-helios.vim
+++ b/colors/base16-helios.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-hopscotch.vim b/colors/base16-hopscotch.vim
index 0c090d4..cadc615 100644
--- a/colors/base16-hopscotch.vim
+++ b/colors/base16-hopscotch.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-horizon-dark.vim b/colors/base16-horizon-dark.vim
index c4d770f..ef49f0e 100644
--- a/colors/base16-horizon-dark.vim
+++ b/colors/base16-horizon-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-horizon-light.vim b/colors/base16-horizon-light.vim
index 8dee68e..459dc81 100644
--- a/colors/base16-horizon-light.vim
+++ b/colors/base16-horizon-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-horizon-terminal-dark.vim b/colors/base16-horizon-terminal-dark.vim
index 44e43c8..dc8289d 100644
--- a/colors/base16-horizon-terminal-dark.vim
+++ b/colors/base16-horizon-terminal-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-horizon-terminal-light.vim b/colors/base16-horizon-terminal-light.vim
index 807f8cb..c1faf75 100644
--- a/colors/base16-horizon-terminal-light.vim
+++ b/colors/base16-horizon-terminal-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-humanoid-dark.vim b/colors/base16-humanoid-dark.vim
index c8115a5..9ca1253 100644
--- a/colors/base16-humanoid-dark.vim
+++ b/colors/base16-humanoid-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-humanoid-light.vim b/colors/base16-humanoid-light.vim
index 8e51a2c..aff3f38 100644
--- a/colors/base16-humanoid-light.vim
+++ b/colors/base16-humanoid-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-ia-dark.vim b/colors/base16-ia-dark.vim
index bbba8ce..ed183d4 100644
--- a/colors/base16-ia-dark.vim
+++ b/colors/base16-ia-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-ia-light.vim b/colors/base16-ia-light.vim
index 9c21f33..b4a7feb 100644
--- a/colors/base16-ia-light.vim
+++ b/colors/base16-ia-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-icy.vim b/colors/base16-icy.vim
index 6586d87..9eacea5 100644
--- a/colors/base16-icy.vim
+++ b/colors/base16-icy.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-irblack.vim b/colors/base16-irblack.vim
index f34384a..1dc3174 100644
--- a/colors/base16-irblack.vim
+++ b/colors/base16-irblack.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim
index e031cb9..ef2f189 100644
--- a/colors/base16-isotope.vim
+++ b/colors/base16-isotope.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-kimber.vim b/colors/base16-kimber.vim
index 20f00df..b04a941 100644
--- a/colors/base16-kimber.vim
+++ b/colors/base16-kimber.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim
index 72db4fc..159bfc9 100644
--- a/colors/base16-macintosh.vim
+++ b/colors/base16-macintosh.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim
index 4503a89..e39de30 100644
--- a/colors/base16-marrakesh.vim
+++ b/colors/base16-marrakesh.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-materia.vim b/colors/base16-materia.vim
index c6f1075..295bd2f 100644
--- a/colors/base16-materia.vim
+++ b/colors/base16-materia.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-material-darker.vim b/colors/base16-material-darker.vim
index 436af59..dd28074 100644
--- a/colors/base16-material-darker.vim
+++ b/colors/base16-material-darker.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-material-lighter.vim b/colors/base16-material-lighter.vim
index f473af9..728ef44 100644
--- a/colors/base16-material-lighter.vim
+++ b/colors/base16-material-lighter.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-material-palenight.vim b/colors/base16-material-palenight.vim
index 3ab2bfb..5d39ee4 100644
--- a/colors/base16-material-palenight.vim
+++ b/colors/base16-material-palenight.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-material-vivid.vim b/colors/base16-material-vivid.vim
index 2849f84..a16003d 100644
--- a/colors/base16-material-vivid.vim
+++ b/colors/base16-material-vivid.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-material.vim b/colors/base16-material.vim
index e63a789..77ffad9 100644
--- a/colors/base16-material.vim
+++ b/colors/base16-material.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-mellow-purple.vim b/colors/base16-mellow-purple.vim
index 84c84cb..c51d65c 100644
--- a/colors/base16-mellow-purple.vim
+++ b/colors/base16-mellow-purple.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-mexico-light.vim b/colors/base16-mexico-light.vim
index f4bf97d..a27051a 100644
--- a/colors/base16-mexico-light.vim
+++ b/colors/base16-mexico-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index 7265f01..0bf753f 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index 57e1894..6bdc7ea 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-nebula.vim b/colors/base16-nebula.vim
index d379e05..7b72391 100644
--- a/colors/base16-nebula.vim
+++ b/colors/base16-nebula.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-nord.vim b/colors/base16-nord.vim
index 0a29df3..66989cc 100644
--- a/colors/base16-nord.vim
+++ b/colors/base16-nord.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-nova.vim b/colors/base16-nova.vim
index 50de96e..6d33ddc 100644
--- a/colors/base16-nova.vim
+++ b/colors/base16-nova.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index 72d4cf6..65dc1a5 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim
index 0cbfe3c..3cee39a 100644
--- a/colors/base16-oceanicnext.vim
+++ b/colors/base16-oceanicnext.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-one-light.vim b/colors/base16-one-light.vim
index b2f73b0..bd30912 100644
--- a/colors/base16-one-light.vim
+++ b/colors/base16-one-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-onedark.vim b/colors/base16-onedark.vim
index 03c5ae5..3e552e2 100644
--- a/colors/base16-onedark.vim
+++ b/colors/base16-onedark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-outrun-dark.vim b/colors/base16-outrun-dark.vim
index 81fe66b..1905a8c 100644
--- a/colors/base16-outrun-dark.vim
+++ b/colors/base16-outrun-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-papercolor-dark.vim b/colors/base16-papercolor-dark.vim
index af44002..3e3ec8e 100644
--- a/colors/base16-papercolor-dark.vim
+++ b/colors/base16-papercolor-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-papercolor-light.vim b/colors/base16-papercolor-light.vim
index 677bcd5..5563692 100644
--- a/colors/base16-papercolor-light.vim
+++ b/colors/base16-papercolor-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim
index d034998..7aee4c6 100644
--- a/colors/base16-paraiso.vim
+++ b/colors/base16-paraiso.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-pasque.vim b/colors/base16-pasque.vim
index 1f6cb81..7837788 100644
--- a/colors/base16-pasque.vim
+++ b/colors/base16-pasque.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim
index ace94ea..078deaf 100644
--- a/colors/base16-phd.vim
+++ b/colors/base16-phd.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim
index 3e12feb..9bdb4ca 100644
--- a/colors/base16-pico.vim
+++ b/colors/base16-pico.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-pinky.vim b/colors/base16-pinky.vim
index 3334651..b3744b3 100644
--- a/colors/base16-pinky.vim
+++ b/colors/base16-pinky.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim
index cf0b441..6975f04 100644
--- a/colors/base16-pop.vim
+++ b/colors/base16-pop.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-porple.vim b/colors/base16-porple.vim
index d8ee289..68193f0 100644
--- a/colors/base16-porple.vim
+++ b/colors/base16-porple.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-qualia.vim b/colors/base16-qualia.vim
index ba06f85..7f010bb 100644
--- a/colors/base16-qualia.vim
+++ b/colors/base16-qualia.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index 649bf12..23a669d 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-rebecca.vim b/colors/base16-rebecca.vim
index 94823e4..d6ed2c6 100644
--- a/colors/base16-rebecca.vim
+++ b/colors/base16-rebecca.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-rose-pine-dawn.vim b/colors/base16-rose-pine-dawn.vim
index f2dea5f..3c3719e 100644
--- a/colors/base16-rose-pine-dawn.vim
+++ b/colors/base16-rose-pine-dawn.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-rose-pine-moon.vim b/colors/base16-rose-pine-moon.vim
index 519abcc..3adbdf7 100644
--- a/colors/base16-rose-pine-moon.vim
+++ b/colors/base16-rose-pine-moon.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-rose-pine.vim b/colors/base16-rose-pine.vim
index f3b5c09..f16c373 100644
--- a/colors/base16-rose-pine.vim
+++ b/colors/base16-rose-pine.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-sagelight.vim b/colors/base16-sagelight.vim
index 5a11fa8..ae1617d 100644
--- a/colors/base16-sagelight.vim
+++ b/colors/base16-sagelight.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-sakura.vim b/colors/base16-sakura.vim
index 3ebaa4a..bea61f0 100644
--- a/colors/base16-sakura.vim
+++ b/colors/base16-sakura.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-sandcastle.vim b/colors/base16-sandcastle.vim
index 1564c14..70e482d 100644
--- a/colors/base16-sandcastle.vim
+++ b/colors/base16-sandcastle.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-seti.vim b/colors/base16-seti.vim
index f57d9b1..42cdfac 100644
--- a/colors/base16-seti.vim
+++ b/colors/base16-seti.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-shades-of-purple.vim b/colors/base16-shades-of-purple.vim
index 4ff0709..ee3adc0 100644
--- a/colors/base16-shades-of-purple.vim
+++ b/colors/base16-shades-of-purple.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim
index eacb1d2..0f6e4b2 100644
--- a/colors/base16-shapeshifter.vim
+++ b/colors/base16-shapeshifter.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-silk-dark.vim b/colors/base16-silk-dark.vim
index 21425d1..dbad545 100644
--- a/colors/base16-silk-dark.vim
+++ b/colors/base16-silk-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-silk-light.vim b/colors/base16-silk-light.vim
index 9ce8a6b..6b26b90 100644
--- a/colors/base16-silk-light.vim
+++ b/colors/base16-silk-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-snazzy.vim b/colors/base16-snazzy.vim
index b9ab233..287b47f 100644
--- a/colors/base16-snazzy.vim
+++ b/colors/base16-snazzy.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-solarflare-light.vim b/colors/base16-solarflare-light.vim
index c7ab82c..5686b37 100644
--- a/colors/base16-solarflare-light.vim
+++ b/colors/base16-solarflare-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-solarflare.vim b/colors/base16-solarflare.vim
index 5bbcc43..770ac4a 100644
--- a/colors/base16-solarflare.vim
+++ b/colors/base16-solarflare.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-solarized-dark.vim b/colors/base16-solarized-dark.vim
index 533b86a..2dc803b 100644
--- a/colors/base16-solarized-dark.vim
+++ b/colors/base16-solarized-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-solarized-light.vim b/colors/base16-solarized-light.vim
index 46c22a8..abcdf72 100644
--- a/colors/base16-solarized-light.vim
+++ b/colors/base16-solarized-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim
index 7ff1540..bc193bc 100644
--- a/colors/base16-spacemacs.vim
+++ b/colors/base16-spacemacs.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-summercamp.vim b/colors/base16-summercamp.vim
index 1f8b8f1..b4e0d41 100644
--- a/colors/base16-summercamp.vim
+++ b/colors/base16-summercamp.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-summerfruit-dark.vim b/colors/base16-summerfruit-dark.vim
index 587f28b..09952f8 100644
--- a/colors/base16-summerfruit-dark.vim
+++ b/colors/base16-summerfruit-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-summerfruit-light.vim b/colors/base16-summerfruit-light.vim
index 4aa96df..915d656 100644
--- a/colors/base16-summerfruit-light.vim
+++ b/colors/base16-summerfruit-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-synth-midnight-dark.vim b/colors/base16-synth-midnight-dark.vim
index c09d45c..585dd85 100644
--- a/colors/base16-synth-midnight-dark.vim
+++ b/colors/base16-synth-midnight-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-synth-midnight-light.vim b/colors/base16-synth-midnight-light.vim
index b94030d..b11ea7a 100644
--- a/colors/base16-synth-midnight-light.vim
+++ b/colors/base16-synth-midnight-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-tango.vim b/colors/base16-tango.vim
index ebd4ef7..607982d 100644
--- a/colors/base16-tango.vim
+++ b/colors/base16-tango.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-tender.vim b/colors/base16-tender.vim
index 9ba53b7..05025e1 100644
--- a/colors/base16-tender.vim
+++ b/colors/base16-tender.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-tomorrow-night-eighties.vim b/colors/base16-tomorrow-night-eighties.vim
index d0db087..f0ed0c3 100644
--- a/colors/base16-tomorrow-night-eighties.vim
+++ b/colors/base16-tomorrow-night-eighties.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-tomorrow-night.vim b/colors/base16-tomorrow-night.vim
index 7be30b0..16a97c1 100644
--- a/colors/base16-tomorrow-night.vim
+++ b/colors/base16-tomorrow-night.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 9b37c3b..cfa0803 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-tube.vim b/colors/base16-tube.vim
index bb694d8..0d9eb35 100644
--- a/colors/base16-tube.vim
+++ b/colors/base16-tube.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim
index 85f2d28..a304b76 100644
--- a/colors/base16-twilight.vim
+++ b/colors/base16-twilight.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-unikitty-dark.vim b/colors/base16-unikitty-dark.vim
index d2a46dc..af47a15 100644
--- a/colors/base16-unikitty-dark.vim
+++ b/colors/base16-unikitty-dark.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-unikitty-light.vim b/colors/base16-unikitty-light.vim
index 050f561..72060ec 100644
--- a/colors/base16-unikitty-light.vim
+++ b/colors/base16-unikitty-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-vulcan.vim b/colors/base16-vulcan.vim
index 97518cc..9607d65 100644
--- a/colors/base16-vulcan.vim
+++ b/colors/base16-vulcan.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-windows-10-light.vim b/colors/base16-windows-10-light.vim
index 4d595a7..3137aba 100644
--- a/colors/base16-windows-10-light.vim
+++ b/colors/base16-windows-10-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-windows-10.vim b/colors/base16-windows-10.vim
index 331c9a7..7c258c2 100644
--- a/colors/base16-windows-10.vim
+++ b/colors/base16-windows-10.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-windows-95-light.vim b/colors/base16-windows-95-light.vim
index 4de4b17..49256f0 100644
--- a/colors/base16-windows-95-light.vim
+++ b/colors/base16-windows-95-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-windows-95.vim b/colors/base16-windows-95.vim
index c0f8da7..0b5decb 100644
--- a/colors/base16-windows-95.vim
+++ b/colors/base16-windows-95.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-windows-highcontrast-light.vim b/colors/base16-windows-highcontrast-light.vim
index 3cb0d4f..b2c0e8f 100644
--- a/colors/base16-windows-highcontrast-light.vim
+++ b/colors/base16-windows-highcontrast-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-windows-highcontrast.vim b/colors/base16-windows-highcontrast.vim
index 9dc412e..19b0802 100644
--- a/colors/base16-windows-highcontrast.vim
+++ b/colors/base16-windows-highcontrast.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-windows-nt-light.vim b/colors/base16-windows-nt-light.vim
index 5724008..7dd586a 100644
--- a/colors/base16-windows-nt-light.vim
+++ b/colors/base16-windows-nt-light.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-windows-nt.vim b/colors/base16-windows-nt.vim
index 71e0140..e96b05b 100644
--- a/colors/base16-windows-nt.vim
+++ b/colors/base16-windows-nt.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-woodland.vim b/colors/base16-woodland.vim
index 363bffd..86e2613 100644
--- a/colors/base16-woodland.vim
+++ b/colors/base16-woodland.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-xcode-dusk.vim b/colors/base16-xcode-dusk.vim
index 3691d66..677a1ee 100644
--- a/colors/base16-xcode-dusk.vim
+++ b/colors/base16-xcode-dusk.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-zenburn.vim b/colors/base16-zenburn.vim
index dbfe20a..9021cb0 100644
--- a/colors/base16-zenburn.vim
+++ b/colors/base16-zenburn.vim
@@ -234,13 +234,15 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm05, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -299,11 +304,11 @@ call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
 call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
 
-" C highlighting
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -312,7 +317,7 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" Clap highlighting
+" Clap
 hi! link ClapInput             ColorColumn
 hi! link ClapSpinner           ColorColumn
 hi! link ClapDisplay           Default
@@ -320,7 +325,7 @@ hi! link ClapPreview           ColorColumn
 hi! link ClapCurrentSelection  CursorLine
 hi! link ClapNoMatchesFound    ErrorFloat
 
-" Coc highlighting
+" Coc
 hi! link CocErrorSign         ErrorSign
 hi! link CocWarningSign       WarningSign
 hi! link CocInfoSign          InfoSign
@@ -393,12 +398,43 @@ call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bol
 call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
 call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
 
-" CSS highlighting
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+" call <sid>hi("CmpItemKindDefault",  s:gui0A, "", s:cterm0A, "", "", "")
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
 call <sid>hi("DiffDelete",   s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -409,7 +445,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -426,23 +462,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
+" GitGutter
 hi! link GitGutterAdd            GitAddSign
 hi! link GitGutterChange         GitChangeSign  
 hi! link GitGutterDelete         GitDeleteSign
 hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
+" HTML
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
 call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -459,7 +495,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -469,29 +505,29 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -499,19 +535,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
+" Signify
 hi! link SignifySignAdd    GitAddSign
 hi! link SignifySignChange GitChangeSign
 hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -523,16 +559,16 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Treesitter highlighting
+" Treesitter
 hi! link TSVariable Identifier
 
-" Treesitter-refactor highlighting
+" Treesitter-refactor
 if has("nvim")
   call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
   call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
 endif
 
-" LSP highlighting
+" LSP
 if has("nvim")
   hi! link DiagnosticError  ErrorSign
   hi! link DiagnosticWarn   WarningSign
@@ -580,7 +616,7 @@ if has("nvim")
   hi! link LspReferenceWrite  ReferenceWrite
 endif
 
-" Java highlighting
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/templates/default.mustache b/templates/default.mustache
index 83d9ddc..2cd0e6b 100644
--- a/templates/default.mustache
+++ b/templates/default.mustache
@@ -234,8 +234,10 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui05, s:gui02, s:cterm02, s:cterm02, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
@@ -270,6 +272,9 @@ call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
 " Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
 call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
 call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
@@ -398,6 +403,36 @@ call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
 " Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")