runtime(colors): improve catppuccin colorscheme

- fix readability issue with IncSearch/CurSearch
- add highlights to some of ftplugins distributed with vim

closes: #19295

Signed-off-by: Mao-Yining <mao.yining@outlook.com>
Signed-off-by: Maxim Kim <habamax@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/colors/catppuccin.vim b/runtime/colors/catppuccin.vim
index 625e706dba6c0dbd7885ffe15dae3da1cf837235..96e9c96350b099be2ac4eb2ef7af04184b39632e 100644 (file)
--- a/runtime/colors/catppuccin.vim
+++ b/runtime/colors/catppuccin.vim
@@ -3,7 +3,7 @@
 " Author:       The Catppuccin Community <catppuccin.com>
 " Maintainer:   Mao-Yining <mao.yining@outlook.com>
 " URL:          https://www.github.com/vim/colorschemes
-" Last Change:  2026 Jan 23
+" Last Change:  2026 Jan 31
 
 " Generated by Colortemplate v3.0.0-beta10
 
@@ -45,7 +45,7 @@ if &background == 'dark'
   hi Conceal guifg=#7f849c guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=NONE
   hi Conditional guifg=#cba6f7 guibg=NONE guisp=NONE gui=NONE ctermfg=183 ctermbg=NONE cterm=NONE term=NONE
   hi Constant guifg=#fab387 guibg=NONE guisp=NONE gui=NONE ctermfg=216 ctermbg=NONE cterm=NONE term=NONE
-  hi CurSearch guifg=NONE guibg=#89556b guisp=NONE gui=NONE ctermfg=126 ctermbg=189 cterm=reverse term=reverse
+  hi CurSearch guifg=#cdd6f4 guibg=#89556b guisp=NONE gui=NONE ctermfg=189 ctermbg=126 cterm=NONE term=reverse
   hi Cursor guifg=#1e1e2e guibg=#f5e0dc guisp=NONE gui=NONE ctermfg=233 ctermbg=224 cterm=NONE term=reverse
   hi CursorColumn guifg=NONE guibg=#181825 guisp=NONE gui=NONE ctermfg=NONE ctermbg=232 cterm=NONE term=NONE
   hi CursorIM guifg=#1e1e2e guibg=#cba6f7 guisp=NONE gui=NONE ctermfg=233 ctermbg=183 cterm=NONE term=NONE
@@ -120,13 +120,41 @@ if &background == 'dark'
   hi VisualNOS guifg=NONE guibg=#45475a guisp=NONE gui=bold ctermfg=NONE ctermbg=240 cterm=bold term=NONE
   hi WarningMsg guifg=#f9e2af guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=standout
   hi WildMenu guifg=NONE guibg=#6c7086 guisp=NONE gui=NONE ctermfg=NONE ctermbg=59 cterm=NONE term=bold
+  hi csvCol0 guifg=#f38ba8 guibg=NONE guisp=NONE gui=NONE ctermfg=211 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol1 guifg=#fab387 guibg=NONE guisp=NONE gui=NONE ctermfg=216 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol2 guifg=#f9e2af guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol3 guifg=#a6e3a1 guibg=NONE guisp=NONE gui=NONE ctermfg=114 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol4 guifg=#89dceb guibg=NONE guisp=NONE gui=NONE ctermfg=116 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol5 guifg=#89b4fa guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol6 guifg=#b4befe guibg=NONE guisp=NONE gui=NONE ctermfg=147 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol7 guifg=#cba6f7 guibg=NONE guisp=NONE gui=NONE ctermfg=183 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol8 guifg=#f5c2e7 guibg=NONE guisp=NONE gui=NONE ctermfg=225 ctermbg=NONE cterm=NONE term=NONE
   hi debugBreakpoint guifg=#6c7086 guibg=#1e1e2e guisp=NONE gui=NONE ctermfg=59 ctermbg=233 cterm=NONE term=NONE
   hi debugPC guifg=NONE guibg=#11111b guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=NONE
+  hi diffAdded guifg=#a6e3a1 guibg=NONE guisp=NONE gui=NONE ctermfg=114 ctermbg=NONE cterm=NONE term=NONE
+  hi diffChanged guifg=#89b4fa guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=NONE
+  hi diffFile guifg=#89b4fa guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=NONE
+  hi diffIndexLine guifg=#94e2d5 guibg=NONE guisp=NONE gui=NONE ctermfg=158 ctermbg=NONE cterm=NONE term=NONE
+  hi diffLine guifg=#6c7086 guibg=NONE guisp=NONE gui=NONE ctermfg=59 ctermbg=NONE cterm=NONE term=NONE
+  hi diffNewFile guifg=#fab387 guibg=NONE guisp=NONE gui=NONE ctermfg=216 ctermbg=NONE cterm=NONE term=NONE
+  hi diffOldFile guifg=#f9e2af guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=NONE
+  hi diffRemoved guifg=#f38ba8 guibg=NONE guisp=NONE gui=NONE ctermfg=211 ctermbg=NONE cterm=NONE term=NONE
   hi lCursor guifg=#1e1e2e guibg=#f38ba8 guisp=NONE gui=NONE ctermfg=233 ctermbg=211 cterm=NONE term=NONE
+  hi markdownCode guifg=#f2cdcd guibg=NONE guisp=NONE gui=NONE ctermfg=181 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownCodeBlock guifg=#f2cdcd guibg=NONE guisp=NONE gui=NONE ctermfg=181 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownH1 guifg=#f38ba8 guibg=NONE guisp=NONE gui=NONE ctermfg=211 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownH2 guifg=#fab387 guibg=NONE guisp=NONE gui=NONE ctermfg=216 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownH3 guifg=#f9e2af guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownH4 guifg=#a6e3a1 guibg=NONE guisp=NONE gui=NONE ctermfg=114 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownH5 guifg=#74c7ec guibg=NONE guisp=NONE gui=NONE ctermfg=117 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownH6 guifg=#b4befe guibg=NONE guisp=NONE gui=NONE ctermfg=147 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownHeadingDelimiter guifg=#fab387 guibg=NONE guisp=NONE gui=bold ctermfg=216 ctermbg=NONE cterm=bold term=bold
+  hi markdownLinkText guifg=#89b4fa guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+  hi qfFileName guifg=#89b4fa guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=NONE
+  hi qfLineNr guifg=#f9e2af guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=NONE
 
   if s:tgc || s:t_Co >= 256
     if s:tgc
-      hi CurSearch cterm=NONE
       hi QuickFixLine cterm=NONE
       hi Visual cterm=NONE
     endif
@@ -144,7 +172,7 @@ if &background == 'dark'
     hi Conceal ctermfg=Grey ctermbg=NONE cterm=NONE
     hi Conditional ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
     hi Constant ctermfg=DarkYellow ctermbg=NONE cterm=NONE
-    hi CurSearch ctermfg=Red ctermbg=White cterm=reverse
+    hi CurSearch ctermfg=White ctermbg=Red cterm=NONE
     hi Cursor ctermfg=Black ctermbg=Yellow cterm=NONE
     hi CursorColumn ctermfg=NONE ctermbg=DarkGrey cterm=NONE
     hi CursorIM ctermfg=Black ctermbg=DarkMagenta cterm=NONE
@@ -204,7 +232,7 @@ if &background == 'dark'
     hi Structure ctermfg=Yellow ctermbg=NONE cterm=NONE
     hi TabLine ctermfg=Grey ctermbg=Black cterm=NONE
     hi TabLineFill ctermfg=NONE ctermbg=DarkGrey cterm=NONE
-    hi TabLineSel ctermfg=White ctermbg=DarkGrey cterm=bold
+    hi TabLineSel ctermfg=White ctermbg=Black cterm=NONE
     hi Tag ctermfg=LightGrey ctermbg=NONE cterm=bold
     hi Title ctermfg=Blue ctermbg=NONE cterm=bold
     hi TitleBar ctermfg=White ctermbg=DarkGrey cterm=NONE
@@ -219,9 +247,38 @@ if &background == 'dark'
     hi VisualNOS ctermfg=NONE ctermbg=Black cterm=bold
     hi WarningMsg ctermfg=Yellow ctermbg=NONE cterm=NONE
     hi WildMenu ctermfg=NONE ctermbg=Grey cterm=NONE
+    hi csvCol0 ctermfg=Red ctermbg=NONE cterm=NONE
+    hi csvCol1 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    hi csvCol2 ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi csvCol3 ctermfg=Green ctermbg=NONE cterm=NONE
+    hi csvCol4 ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi csvCol5 ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi csvCol6 ctermfg=LightGrey ctermbg=NONE cterm=NONE
+    hi csvCol7 ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
+    hi csvCol8 ctermfg=Magenta ctermbg=NONE cterm=NONE
     hi debugBreakpoint ctermfg=Grey ctermbg=Black cterm=NONE
     hi debugPC ctermfg=NONE ctermbg=Black cterm=NONE
+    hi diffAdded ctermfg=Green ctermbg=NONE cterm=NONE
+    hi diffChanged ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi diffFile ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi diffIndexLine ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+    hi diffLine ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi diffNewFile ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    hi diffOldFile ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=Red ctermbg=NONE cterm=NONE
     hi lCursor ctermfg=Black ctermbg=Red cterm=NONE
+    hi markdownCode ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi markdownCodeBlock ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi markdownH1 ctermfg=Red ctermbg=NONE cterm=NONE
+    hi markdownH2 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    hi markdownH3 ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi markdownH4 ctermfg=Green ctermbg=NONE cterm=NONE
+    hi markdownH5 ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+    hi markdownH6 ctermfg=LightGrey ctermbg=NONE cterm=NONE
+    hi markdownHeadingDelimiter ctermfg=DarkYellow ctermbg=NONE cterm=bold
+    hi markdownLinkText ctermfg=Blue ctermbg=NONE cterm=underline
+    hi qfFileName ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi qfLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
     finish
   endif
 
@@ -236,7 +293,7 @@ if &background == 'dark'
     hi Conceal ctermfg=Grey ctermbg=NONE cterm=NONE
     hi Conditional ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
     hi Constant ctermfg=DarkYellow ctermbg=NONE cterm=NONE
-    hi CurSearch ctermfg=Red ctermbg=White cterm=reverse
+    hi CurSearch ctermfg=White ctermbg=Red cterm=NONE
     hi Cursor ctermfg=Black ctermbg=Yellow cterm=NONE
     hi CursorColumn ctermfg=NONE ctermbg=DarkGrey cterm=NONE
     hi CursorIM ctermfg=Black ctermbg=DarkMagenta cterm=NONE
@@ -311,9 +368,38 @@ if &background == 'dark'
     hi VisualNOS ctermfg=NONE ctermbg=Black cterm=bold
     hi WarningMsg ctermfg=Yellow ctermbg=NONE cterm=NONE
     hi WildMenu ctermfg=NONE ctermbg=Grey cterm=NONE
+    hi csvCol0 ctermfg=Red ctermbg=NONE cterm=NONE
+    hi csvCol1 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    hi csvCol2 ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi csvCol3 ctermfg=Green ctermbg=NONE cterm=NONE
+    hi csvCol4 ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi csvCol5 ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi csvCol6 ctermfg=LightGrey ctermbg=NONE cterm=NONE
+    hi csvCol7 ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
+    hi csvCol8 ctermfg=Magenta ctermbg=NONE cterm=NONE
     hi debugBreakpoint ctermfg=Grey ctermbg=Black cterm=NONE
     hi debugPC ctermfg=NONE ctermbg=Black cterm=NONE
+    hi diffAdded ctermfg=Green ctermbg=NONE cterm=NONE
+    hi diffChanged ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi diffFile ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi diffIndexLine ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+    hi diffLine ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi diffNewFile ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    hi diffOldFile ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=Red ctermbg=NONE cterm=NONE
     hi lCursor ctermfg=Black ctermbg=Red cterm=NONE
+    hi markdownCode ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi markdownCodeBlock ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi markdownH1 ctermfg=Red ctermbg=NONE cterm=NONE
+    hi markdownH2 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    hi markdownH3 ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi markdownH4 ctermfg=Green ctermbg=NONE cterm=NONE
+    hi markdownH5 ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+    hi markdownH6 ctermfg=LightGrey ctermbg=NONE cterm=NONE
+    hi markdownHeadingDelimiter ctermfg=DarkYellow ctermbg=NONE cterm=bold
+    hi markdownLinkText ctermfg=Blue ctermbg=NONE cterm=underline
+    hi qfFileName ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi qfLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
     finish
   endif
 
@@ -345,7 +431,7 @@ if &background == 'light'
   hi Conceal guifg=#8c8fa1 guibg=NONE guisp=NONE gui=NONE ctermfg=246 ctermbg=NONE cterm=NONE term=NONE
   hi Conditional guifg=#8839ef guibg=NONE guisp=NONE gui=NONE ctermfg=93 ctermbg=NONE cterm=NONE term=NONE
   hi Constant guifg=#fe640b guibg=NONE guisp=NONE gui=NONE ctermfg=202 ctermbg=NONE cterm=NONE term=NONE
-  hi CurSearch guifg=NONE guibg=#fc8fc3 guisp=NONE gui=NONE ctermfg=211 ctermbg=236 cterm=reverse term=reverse
+  hi CurSearch guifg=#4c4f69 guibg=#fc8fc3 guisp=NONE gui=NONE ctermfg=236 ctermbg=211 cterm=NONE term=reverse
   hi Cursor guifg=#eff1f5 guibg=#dc8a78 guisp=NONE gui=NONE ctermfg=231 ctermbg=174 cterm=NONE term=reverse
   hi CursorColumn guifg=NONE guibg=#e6e9ef guisp=NONE gui=NONE ctermfg=NONE ctermbg=255 cterm=NONE term=NONE
   hi CursorIM guifg=#eff1f5 guibg=#8839ef guisp=NONE gui=NONE ctermfg=231 ctermbg=93 cterm=NONE term=NONE
@@ -420,13 +506,41 @@ if &background == 'light'
   hi VisualNOS guifg=NONE guibg=#bcc0cc guisp=NONE gui=bold ctermfg=NONE ctermbg=250 cterm=bold term=NONE
   hi WarningMsg guifg=#df8e1d guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=standout
   hi WildMenu guifg=NONE guibg=#9ca0b0 guisp=NONE gui=NONE ctermfg=NONE ctermbg=247 cterm=NONE term=bold
+  hi csvCol0 guifg=#d20f39 guibg=NONE guisp=NONE gui=NONE ctermfg=161 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol1 guifg=#fe640b guibg=NONE guisp=NONE gui=NONE ctermfg=202 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol2 guifg=#df8e1d guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol3 guifg=#40a02b guibg=NONE guisp=NONE gui=NONE ctermfg=34 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol4 guifg=#04a5e5 guibg=NONE guisp=NONE gui=NONE ctermfg=39 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol5 guifg=#1e66f5 guibg=NONE guisp=NONE gui=NONE ctermfg=27 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol6 guifg=#7287fd guibg=NONE guisp=NONE gui=NONE ctermfg=69 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol7 guifg=#8839ef guibg=NONE guisp=NONE gui=NONE ctermfg=93 ctermbg=NONE cterm=NONE term=NONE
+  hi csvCol8 guifg=#ea76cb guibg=NONE guisp=NONE gui=NONE ctermfg=206 ctermbg=NONE cterm=NONE term=NONE
   hi debugBreakpoint guifg=#9ca0b0 guibg=#eff1f5 guisp=NONE gui=NONE ctermfg=247 ctermbg=231 cterm=NONE term=NONE
   hi debugPC guifg=NONE guibg=#dce0e8 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=NONE
+  hi diffAdded guifg=#40a02b guibg=NONE guisp=NONE gui=NONE ctermfg=34 ctermbg=NONE cterm=NONE term=NONE
+  hi diffChanged guifg=#1e66f5 guibg=NONE guisp=NONE gui=NONE ctermfg=27 ctermbg=NONE cterm=NONE term=NONE
+  hi diffFile guifg=#1e66f5 guibg=NONE guisp=NONE gui=NONE ctermfg=27 ctermbg=NONE cterm=NONE term=NONE
+  hi diffIndexLine guifg=#179299 guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+  hi diffLine guifg=#9ca0b0 guibg=NONE guisp=NONE gui=NONE ctermfg=247 ctermbg=NONE cterm=NONE term=NONE
+  hi diffNewFile guifg=#fe640b guibg=NONE guisp=NONE gui=NONE ctermfg=202 ctermbg=NONE cterm=NONE term=NONE
+  hi diffOldFile guifg=#df8e1d guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=NONE
+  hi diffRemoved guifg=#d20f39 guibg=NONE guisp=NONE gui=NONE ctermfg=161 ctermbg=NONE cterm=NONE term=NONE
   hi lCursor guifg=#eff1f5 guibg=#d20f39 guisp=NONE gui=NONE ctermfg=231 ctermbg=161 cterm=NONE term=NONE
+  hi markdownCode guifg=#dd7878 guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownCodeBlock guifg=#dd7878 guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownH1 guifg=#d20f39 guibg=NONE guisp=NONE gui=NONE ctermfg=161 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownH2 guifg=#fe640b guibg=NONE guisp=NONE gui=NONE ctermfg=202 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownH3 guifg=#df8e1d guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownH4 guifg=#40a02b guibg=NONE guisp=NONE gui=NONE ctermfg=34 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownH5 guifg=#209fb5 guibg=NONE guisp=NONE gui=NONE ctermfg=38 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownH6 guifg=#7287fd guibg=NONE guisp=NONE gui=NONE ctermfg=69 ctermbg=NONE cterm=NONE term=NONE
+  hi markdownHeadingDelimiter guifg=#fe640b guibg=NONE guisp=NONE gui=bold ctermfg=202 ctermbg=NONE cterm=bold term=bold
+  hi markdownLinkText guifg=#1e66f5 guibg=NONE guisp=NONE gui=underline ctermfg=27 ctermbg=NONE cterm=underline term=underline
+  hi qfFileName guifg=#1e66f5 guibg=NONE guisp=NONE gui=NONE ctermfg=27 ctermbg=NONE cterm=NONE term=NONE
+  hi qfLineNr guifg=#df8e1d guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=NONE
 
   if s:tgc || s:t_Co >= 256
     if s:tgc
-      hi CurSearch cterm=NONE
       hi QuickFixLine cterm=NONE
       hi Visual cterm=NONE
     endif
@@ -444,7 +558,7 @@ if &background == 'light'
     hi Conceal ctermfg=Grey ctermbg=NONE cterm=NONE
     hi Conditional ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
     hi Constant ctermfg=DarkYellow ctermbg=NONE cterm=NONE
-    hi CurSearch ctermfg=Red ctermbg=Black cterm=reverse
+    hi CurSearch ctermfg=Black ctermbg=Red cterm=NONE
     hi Cursor ctermfg=White ctermbg=Red cterm=NONE
     hi CursorColumn ctermfg=NONE ctermbg=Grey cterm=NONE
     hi CursorIM ctermfg=White ctermbg=DarkMagenta cterm=NONE
@@ -504,7 +618,7 @@ if &background == 'light'
     hi Structure ctermfg=Yellow ctermbg=NONE cterm=NONE
     hi TabLine ctermfg=DarkGrey ctermbg=Grey cterm=NONE
     hi TabLineFill ctermfg=NONE ctermbg=Grey cterm=NONE
-    hi TabLineSel ctermfg=Black ctermbg=Grey cterm=bold
+    hi TabLineSel ctermfg=Black ctermbg=White cterm=NONE
     hi Tag ctermfg=DarkBlue ctermbg=NONE cterm=bold
     hi Title ctermfg=Blue ctermbg=NONE cterm=bold
     hi TitleBar ctermfg=Black ctermbg=Grey cterm=NONE
@@ -519,9 +633,38 @@ if &background == 'light'
     hi VisualNOS ctermfg=NONE ctermbg=White cterm=bold
     hi WarningMsg ctermfg=Yellow ctermbg=NONE cterm=NONE
     hi WildMenu ctermfg=NONE ctermbg=DarkGrey cterm=NONE
+    hi csvCol0 ctermfg=Red ctermbg=NONE cterm=NONE
+    hi csvCol1 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    hi csvCol2 ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi csvCol3 ctermfg=Green ctermbg=NONE cterm=NONE
+    hi csvCol4 ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi csvCol5 ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi csvCol6 ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+    hi csvCol7 ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
+    hi csvCol8 ctermfg=Magenta ctermbg=NONE cterm=NONE
     hi debugBreakpoint ctermfg=DarkGrey ctermbg=White cterm=NONE
     hi debugPC ctermfg=NONE ctermbg=Grey cterm=NONE
+    hi diffAdded ctermfg=Green ctermbg=NONE cterm=NONE
+    hi diffChanged ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi diffFile ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi diffIndexLine ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+    hi diffLine ctermfg=DarkGrey ctermbg=NONE cterm=NONE
+    hi diffNewFile ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    hi diffOldFile ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=Red ctermbg=NONE cterm=NONE
     hi lCursor ctermfg=White ctermbg=Red cterm=NONE
+    hi markdownCode ctermfg=DarkRed ctermbg=NONE cterm=NONE
+    hi markdownCodeBlock ctermfg=DarkRed ctermbg=NONE cterm=NONE
+    hi markdownH1 ctermfg=Red ctermbg=NONE cterm=NONE
+    hi markdownH2 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    hi markdownH3 ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi markdownH4 ctermfg=Green ctermbg=NONE cterm=NONE
+    hi markdownH5 ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+    hi markdownH6 ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+    hi markdownHeadingDelimiter ctermfg=DarkYellow ctermbg=NONE cterm=bold
+    hi markdownLinkText ctermfg=Blue ctermbg=NONE cterm=underline
+    hi qfFileName ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi qfLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
     finish
   endif
 
@@ -536,7 +679,7 @@ if &background == 'light'
     hi Conceal ctermfg=Grey ctermbg=NONE cterm=NONE
     hi Conditional ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
     hi Constant ctermfg=DarkYellow ctermbg=NONE cterm=NONE
-    hi CurSearch ctermfg=Red ctermbg=Black cterm=reverse
+    hi CurSearch ctermfg=Black ctermbg=Red cterm=NONE
     hi Cursor ctermfg=White ctermbg=Red cterm=NONE
     hi CursorColumn ctermfg=NONE ctermbg=Grey cterm=NONE
     hi CursorIM ctermfg=White ctermbg=DarkMagenta cterm=NONE
@@ -611,9 +754,38 @@ if &background == 'light'
     hi VisualNOS ctermfg=NONE ctermbg=White cterm=bold
     hi WarningMsg ctermfg=Yellow ctermbg=NONE cterm=NONE
     hi WildMenu ctermfg=NONE ctermbg=DarkGrey cterm=NONE
+    hi csvCol0 ctermfg=Red ctermbg=NONE cterm=NONE
+    hi csvCol1 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    hi csvCol2 ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi csvCol3 ctermfg=Green ctermbg=NONE cterm=NONE
+    hi csvCol4 ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi csvCol5 ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi csvCol6 ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+    hi csvCol7 ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
+    hi csvCol8 ctermfg=Magenta ctermbg=NONE cterm=NONE
     hi debugBreakpoint ctermfg=DarkGrey ctermbg=White cterm=NONE
     hi debugPC ctermfg=NONE ctermbg=Grey cterm=NONE
+    hi diffAdded ctermfg=Green ctermbg=NONE cterm=NONE
+    hi diffChanged ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi diffFile ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi diffIndexLine ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+    hi diffLine ctermfg=DarkGrey ctermbg=NONE cterm=NONE
+    hi diffNewFile ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    hi diffOldFile ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=Red ctermbg=NONE cterm=NONE
     hi lCursor ctermfg=White ctermbg=Red cterm=NONE
+    hi markdownCode ctermfg=DarkRed ctermbg=NONE cterm=NONE
+    hi markdownCodeBlock ctermfg=DarkRed ctermbg=NONE cterm=NONE
+    hi markdownH1 ctermfg=Red ctermbg=NONE cterm=NONE
+    hi markdownH2 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    hi markdownH3 ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi markdownH4 ctermfg=Green ctermbg=NONE cterm=NONE
+    hi markdownH5 ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+    hi markdownH6 ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+    hi markdownHeadingDelimiter ctermfg=DarkYellow ctermbg=NONE cterm=bold
+    hi markdownLinkText ctermfg=Blue ctermbg=NONE cterm=underline
+    hi qfFileName ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi qfLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
     finish
   endif