patch 9.1.1671: configure: missing comment about AC_CONFIG_SRCDIR

Problem:  configure: missing comment about AC_CONFIG_SRCDIR
Solution: Add comment explaining the use of AC_CONFIG_SRCDIR
          (Damien Lejay)

closes: #18071

Signed-off-by: Damien Lejay <damien@lejay.be>
Signed-off-by: Christian Brabandt <cb@256bit.org>

runtime/colors/blue.vim

@@ -2,107 +2,30 @@
 " Description:  Colorscheme with a blue background
 " Author:       Original author Steven Vertigan <steven@vertigan.wattle.id.au>
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'blue'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi Normal guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#005faf gui=NONE cterm=NONE
-hi Pmenu guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
-hi PmenuSel guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ffd700 guibg=#008787 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff7f50 guibg=#ffffff gui=NONE cterm=NONE
-hi QuickFixLine guifg=#000000 guibg=#d787d7 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#870087 gui=NONE cterm=NONE
-hi Conceal guifg=#008787 guibg=NONE gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#005faf gui=NONE cterm=NONE
-hi CursorIM guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffd700 guibg=#005faf gui=bold cterm=NONE
-hi EndOfBuffer guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE
-hi Error guifg=#ff7f50 guibg=#000087 gui=reverse cterm=reverse
-hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
-hi FoldColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#000087 guibg=#878700 gui=NONE cterm=NONE
-hi IncSearch guifg=#d787d7 guibg=#000000 gui=standout cterm=reverse
-hi LineNr guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi ModeMsg guifg=#000087 guibg=#00ff00 gui=NONE cterm=NONE
-hi MoreMsg guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
-hi NonText guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi Question guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Search guifg=#ffd700 guibg=#000000 gui=reverse cterm=reverse
-hi SignColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
-hi SpellBad guifg=#d70000 guibg=NONE guisp=#d70000 gui=undercurl cterm=underline
-hi SpellCap guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl cterm=underline
-hi SpellLocal guifg=#ffffff guibg=NONE guisp=#ffffff gui=undercurl cterm=underline
-hi SpellRare guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl cterm=underline
-hi StatusLine guifg=#000087 guibg=#5fffff gui=NONE cterm=NONE
-hi StatusLineNC guifg=#000087 guibg=#008787 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#ffffff guibg=#005faf gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi VertSplit guifg=#008787 guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
-hi VisualNOS guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE
-hi WarningMsg guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#000087 guibg=#ffd700 gui=NONE cterm=NONE
-hi debugBreakpoint guifg=#00ff00 guibg=#000087 gui=reverse cterm=reverse
-hi debugPC guifg=#5fffff guibg=#000087 gui=reverse cterm=reverse
-hi Directory guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
-hi Title guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
-hi Comment guifg=#878787 guibg=NONE gui=bold cterm=NONE
-hi Constant guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#878787 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi Type guifg=#ffa500 guibg=NONE gui=bold cterm=NONE
-hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
-hi Label guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE
-hi! link Terminal Normal
-hi! link PopupSelected PmenuSel
-hi! link Debug Special
 hi! link Added String
-hi! link Removed WarningMsg
-hi! link diffOnly WarningMsg
-hi! link diffNoEOL WarningMsg
-hi! link diffIsA WarningMsg
-hi! link diffIdentical WarningMsg
-hi! link diffDiffer WarningMsg
-hi! link diffCommon WarningMsg
-hi! link diffBDiffer WarningMsg
-hi! link lCursor Cursor
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link CurSearch Search
-hi! link CursorLineNr CursorLine
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
-hi! link StatusLineTerm StatusLine
-hi! link StatusLineTermNC StatusLineNC
-hi! link TabLine StatusLineNC
-hi! link TabLineFill StatusLineNC
-hi! link TabLineSel StatusLine
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Statement
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
+hi! link Debug Special
 hi! link Define PreProc
 hi! link Delimiter Special
 hi! link Exception Statement
@@ -110,181 +33,162 @@ hi! link Float Constant
 hi! link Function Identifier
 hi! link Include PreProc
 hi! link Keyword Statement
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link Macro PreProc
+hi! link MessageWindow Pmenu
 hi! link Number Constant
 hi! link Operator Type
+hi! link PopupNotification Todo
 hi! link PreCondit PreProc
+hi! link Removed WarningMsg
 hi! link Repeat Statement
 hi! link SpecialChar Special
 hi! link SpecialComment Special
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
 hi! link StorageClass Type
 hi! link String Constant
 hi! link Structure Type
+hi! link TabLine StatusLineNC
+hi! link TabLineFill StatusLineNC
+hi! link TabLineSel StatusLine
 hi! link Tag Special
-hi! link Typedef Type
 hi! link Terminal Normal
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link Typedef Type
+hi! link diffBDiffer WarningMsg
+hi! link diffCommon WarningMsg
+hi! link diffDiffer WarningMsg
+hi! link diffIdentical WarningMsg
+hi! link diffIsA WarningMsg
+hi! link diffNoEOL WarningMsg
+hi! link diffOnly WarningMsg
+hi! link lCursor Cursor
 
-if s:t_Co >= 256
-  hi Normal ctermfg=220 ctermbg=18 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=25 cterm=NONE
-  hi Pmenu ctermfg=231 ctermbg=30 cterm=NONE
-  hi PmenuSel ctermfg=30 ctermbg=231 cterm=NONE
-  hi PmenuMatch ctermfg=220 ctermbg=30 cterm=NONE
-  hi PmenuMatchSel ctermfg=209 ctermbg=231 cterm=NONE
-  hi QuickFixLine ctermfg=16 ctermbg=176 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=90 cterm=NONE
-  hi Conceal ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=46 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=25 cterm=NONE
-  hi CursorIM ctermfg=16 ctermbg=220 cterm=NONE
-  hi CursorLineNr ctermfg=220 ctermbg=25 cterm=NONE
-  hi EndOfBuffer ctermfg=220 ctermbg=18 cterm=NONE
-  hi Error ctermfg=209 ctermbg=18 cterm=reverse
-  hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
-  hi FoldColumn ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=18 ctermbg=100 cterm=NONE
-  hi IncSearch ctermfg=176 ctermbg=16 cterm=reverse
-  hi LineNr ctermfg=87 ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi ModeMsg ctermfg=18 ctermbg=46 cterm=NONE
-  hi MoreMsg ctermfg=87 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=176 ctermbg=NONE cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi Question ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Search ctermfg=220 ctermbg=16 cterm=reverse
-  hi SignColumn ctermfg=30 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=87 ctermbg=NONE cterm=NONE
-  hi SpellBad ctermfg=160 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=46 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=231 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=176 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=18 ctermbg=87 cterm=NONE
-  hi StatusLineNC ctermfg=18 ctermbg=30 cterm=NONE
-  hi ToolbarButton ctermfg=231 ctermbg=25 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=231 ctermbg=30 cterm=NONE
-  hi VisualNOS ctermfg=30 ctermbg=231 cterm=NONE
-  hi WarningMsg ctermfg=176 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=18 ctermbg=220 cterm=NONE
-  hi debugBreakpoint ctermfg=46 ctermbg=18 cterm=reverse
-  hi debugPC ctermfg=87 ctermbg=18 cterm=reverse
-  hi Directory ctermfg=87 ctermbg=NONE cterm=NONE
-  hi Title ctermfg=176 ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=102 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=87 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=250 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=102 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=176 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=231 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=214 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Label ctermfg=220 ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link PopupSelected PmenuSel
-  hi! link Debug Special
-  hi! link Added String
-  hi! link Removed WarningMsg
-  hi! link diffOnly WarningMsg
-  hi! link diffNoEOL WarningMsg
-  hi! link diffIsA WarningMsg
-  hi! link diffIdentical WarningMsg
-  hi! link diffDiffer WarningMsg
-  hi! link diffCommon WarningMsg
-  hi! link diffBDiffer WarningMsg
-  hi! link lCursor Cursor
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
+hi Normal guifg=#ffd700 guibg=#000087 guisp=NONE gui=NONE ctermfg=220 ctermbg=18 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#870087 guisp=NONE gui=NONE ctermfg=NONE ctermbg=90 cterm=NONE term=reverse
+hi Comment guifg=#878787 guibg=NONE guisp=NONE gui=bold ctermfg=102 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#008787 guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#5fffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#00ff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=46 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#005faf guisp=NONE gui=NONE ctermfg=NONE ctermbg=25 cterm=NONE term=NONE
+hi CursorIM guifg=#000000 guibg=#ffd700 guisp=NONE gui=NONE ctermfg=16 ctermbg=220 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#005faf guisp=NONE gui=NONE ctermfg=NONE ctermbg=25 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffd700 guibg=#005faf guisp=NONE gui=bold ctermfg=220 ctermbg=25 cterm=NONE term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#5fffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=NONE
+hi EndOfBuffer guifg=#ffd700 guibg=#000087 guisp=NONE gui=NONE ctermfg=220 ctermbg=18 cterm=NONE term=NONE
+hi Error guifg=#ff7f50 guibg=#000087 guisp=NONE gui=reverse ctermfg=209 ctermbg=18 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#ffffff guibg=#d70000 guisp=NONE gui=NONE ctermfg=231 ctermbg=160 cterm=NONE term=bold,reverse
+hi FoldColumn guifg=#008787 guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#000087 guibg=#878700 guisp=NONE gui=NONE ctermfg=18 ctermbg=100 cterm=NONE term=NONE
+hi Identifier guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#878787 guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#d787d7 guibg=#000000 guisp=NONE gui=standout ctermfg=176 ctermbg=16 cterm=reverse term=bold,reverse,underline
+hi Label guifg=#ffd700 guibg=NONE guisp=NONE gui=NONE ctermfg=220 ctermbg=NONE cterm=NONE term=NONE
+hi LineNr guifg=#5fffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=bold,underline
+hi ModeMsg guifg=#000087 guibg=#00ff00 guisp=NONE gui=NONE ctermfg=18 ctermbg=46 cterm=NONE term=bold
+hi MoreMsg guifg=#5fffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=NONE
+hi NonText guifg=#d787d7 guibg=NONE guisp=NONE gui=NONE ctermfg=176 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#ffffff guibg=#008787 guisp=NONE gui=NONE ctermfg=231 ctermbg=30 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ffd700 guibg=#008787 guisp=NONE gui=NONE ctermfg=220 ctermbg=30 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff7f50 guibg=#ffffff guisp=NONE gui=NONE ctermfg=209 ctermbg=231 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi PmenuSel guifg=#008787 guibg=#ffffff guisp=NONE gui=NONE ctermfg=30 ctermbg=231 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=NONE
+hi PreProc guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=standout
+hi QuickFixLine guifg=#000000 guibg=#d787d7 guisp=NONE gui=NONE ctermfg=16 ctermbg=176 cterm=NONE term=NONE
+hi Search guifg=#ffd700 guibg=#000000 guisp=NONE gui=reverse ctermfg=220 ctermbg=16 cterm=reverse term=reverse
+hi SignColumn guifg=#008787 guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#d787d7 guibg=NONE guisp=NONE gui=NONE ctermfg=176 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#5fffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#d70000 guibg=NONE guisp=#d70000 gui=undercurl ctermfg=160 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl ctermfg=46 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ffffff guibg=NONE guisp=#ffffff gui=undercurl ctermfg=231 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl ctermfg=176 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#ffffff guibg=NONE guisp=NONE gui=NONE ctermfg=231 ctermbg=NONE cterm=NONE term=NONE
+hi StatusLine guifg=#000087 guibg=#5fffff guisp=NONE gui=NONE ctermfg=18 ctermbg=87 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#000087 guibg=#008787 guisp=NONE gui=NONE ctermfg=18 ctermbg=30 cterm=NONE term=bold,underline
+hi Title guifg=#d787d7 guibg=NONE guisp=NONE gui=NONE ctermfg=176 ctermbg=NONE cterm=NONE term=NONE
+hi Todo guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=bold,reverse
+hi ToolbarButton guifg=#ffffff guibg=#005faf guisp=NONE gui=NONE ctermfg=231 ctermbg=25 cterm=NONE term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#ffa500 guibg=NONE guisp=NONE gui=bold ctermfg=214 ctermbg=NONE cterm=NONE term=NONE
+hi Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#008787 guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Visual guifg=#ffffff guibg=#008787 guisp=NONE gui=NONE ctermfg=231 ctermbg=30 cterm=NONE term=reverse
+hi VisualNOS guifg=#008787 guibg=#ffffff guisp=NONE gui=NONE ctermfg=30 ctermbg=231 cterm=NONE term=NONE
+hi WarningMsg guifg=#d787d7 guibg=NONE guisp=NONE gui=NONE ctermfg=176 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#000087 guibg=#ffd700 guisp=NONE gui=NONE ctermfg=18 ctermbg=220 cterm=NONE term=bold
+hi debugBreakpoint guifg=#00ff00 guibg=#000087 guisp=NONE gui=reverse ctermfg=46 ctermbg=18 cterm=reverse term=reverse
+hi debugPC guifg=#5fffff guibg=#000087 guisp=NONE gui=reverse ctermfg=87 ctermbg=18 cterm=reverse term=reverse
+
+if s:tgc || s:t_Co >= 256
   hi! link CursorLineNr CursorLine
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Type
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link Terminal Normal
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 16
+  hi! link CursorLineNr CursorLine
   hi Normal ctermfg=yellow ctermbg=darkblue cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=white cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=white cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
   hi ColorColumn ctermfg=NONE ctermbg=darkmagenta cterm=NONE
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
   hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
-  hi CursorLineNr ctermfg=yellow ctermbg=blue cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=yellow ctermbg=darkblue cterm=NONE
   hi Error ctermfg=red ctermbg=darkblue cterm=reverse
   hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
   hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=magenta ctermbg=black cterm=reverse
+  hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
   hi LineNr ctermfg=cyan ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ModeMsg ctermfg=darkblue ctermbg=green cterm=NONE
   hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
   hi NonText ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=white cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=white cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
   hi Search ctermfg=yellow ctermbg=black cterm=reverse
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=white ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=white ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=darkblue ctermbg=cyan cterm=NONE
   hi StatusLineNC ctermfg=darkblue ctermbg=darkcyan cterm=NONE
+  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ToolbarButton ctermfg=white ctermbg=blue cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Visual ctermfg=white ctermbg=darkcyan cterm=NONE
   hi VisualNOS ctermfg=darkcyan ctermbg=white cterm=NONE
@@ -292,114 +196,65 @@ if s:t_Co >= 16
   hi WildMenu ctermfg=darkblue ctermbg=yellow cterm=NONE
   hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
   hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
-  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=white ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link PopupSelected PmenuSel
-  hi! link Debug Special
-  hi! link Added String
-  hi! link Removed WarningMsg
-  hi! link diffOnly WarningMsg
-  hi! link diffNoEOL WarningMsg
-  hi! link diffIsA WarningMsg
-  hi! link diffIdentical WarningMsg
-  hi! link diffDiffer WarningMsg
-  hi! link diffCommon WarningMsg
-  hi! link diffBDiffer WarningMsg
-  hi! link lCursor Cursor
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineNr CursorLine
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Type
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link Terminal Normal
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 8
+  hi! link CursorLineNr CursorLine
   hi Normal ctermfg=darkyellow ctermbg=blue cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Pmenu ctermfg=black ctermbg=cyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=cyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
   hi ColorColumn ctermfg=NONE ctermbg=magenta cterm=NONE
+  hi Comment ctermfg=black ctermbg=NONE cterm=bold
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi CursorColumn ctermfg=blue ctermbg=yellow cterm=bold,reverse
   hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=yellow ctermbg=blue cterm=NONE
   hi Error ctermfg=red ctermbg=blue cterm=reverse
   hi ErrorMsg ctermfg=gray ctermbg=red cterm=NONE
   hi FoldColumn ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Folded ctermfg=blue ctermbg=yellow cterm=NONE
+  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=magenta ctermbg=black cterm=reverse
+  hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
   hi LineNr ctermfg=cyan ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ModeMsg ctermfg=blue ctermbg=green cterm=NONE
   hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
   hi NonText ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=cyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=cyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
   hi Search ctermfg=yellow ctermbg=black cterm=reverse
   hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=yellow cterm=reverse
   hi SpellCap ctermfg=green ctermbg=NONE cterm=reverse
   hi SpellLocal ctermfg=gray ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=magenta ctermbg=yellow cterm=reverse
+  hi Statement ctermfg=gray ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=cyan ctermbg=blue cterm=bold,reverse
   hi StatusLineNC ctermfg=blue ctermbg=cyan cterm=NONE
+  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ToolbarButton ctermfg=blue ctermbg=gray cterm=bold,reverse
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=red ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Visual ctermfg=black ctermbg=cyan cterm=NONE
   hi VisualNOS ctermfg=cyan ctermbg=gray cterm=NONE
@@ -407,192 +262,23 @@ if s:t_Co >= 8
   hi WildMenu ctermfg=blue ctermbg=yellow cterm=NONE
   hi debugBreakpoint ctermfg=green ctermbg=blue cterm=reverse
   hi debugPC ctermfg=cyan ctermbg=blue cterm=reverse
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=black ctermbg=NONE cterm=bold
-  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
-  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=gray ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=red ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi! link Terminal Normal
-  hi! link PopupSelected PmenuSel
-  hi! link Debug Special
-  hi! link Added String
-  hi! link Removed WarningMsg
-  hi! link diffOnly WarningMsg
-  hi! link diffNoEOL WarningMsg
-  hi! link diffIsA WarningMsg
-  hi! link diffIdentical WarningMsg
-  hi! link diffDiffer WarningMsg
-  hi! link diffCommon WarningMsg
-  hi! link diffBDiffer WarningMsg
-  hi! link lCursor Cursor
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineNr CursorLine
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Type
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link Terminal Normal
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: x_black       #000000           16                black
-" Color: x_darkred     #cd0000           160               darkred
-" Color: x_darkgreen   #00cd00           40                darkgreen
-" Color: x_darkyellow  #cdcd00           184               darkyellow
-" Color: x_darkblue    #0000ee           21                darkblue
-" Color: x_darkmagenta #cd00cd           164               darkmagenta
-" Color: x_darkcyan    #00cdcd           44                darkcyan
-" Color: x_gray        #e5e5e5           254               gray
-" Color: x_darkgray    #7f7f7f           244               darkgray
-" Color: x_red         #ff0000           196               red
-" Color: x_green       #00ff00           46                green
-" Color: x_yellow      #ffff00           226               yellow
-" Color: x_blue        #5c5cff           63                blue
-" Color: x_magenta     #ff00ff           201               magenta
-" Color: x_cyan        #00ffff           51                cyan
-" Color: x_white       #ffffff           231               white
-" Color: black         #000000           16                black
-" Color: darkred       #870000           88                darkred
-" Color: darkyellow    #878700           100               darkyellow
-" Color: darkblue      #000087           18                darkblue
-" Color: darkmagenta   #870087           90                darkmagenta
-" Color: darkcyan      #008787           30                darkcyan
-" Color: gray          #bcbcbc           250               gray
-" Color: comment       #878787           102               darkgray
-" Color: darkgray      #878787           102               darkgray
-" Color: red           #d70000           160               red
-" Color: green         #00ff00           46                green
-" Color: yellow        #ffd700           220               yellow
-" Color: blue          #005faf           25                blue
-" Color: magenta       #d787d7           176               magenta
-" Color: cyan          #5fffff           87                cyan
-" Color: white         #ffffff           231               white
-" Color: xtermblue     #5fafff           75                blue
-" Color: xtermdarkblue #0087af           31                darkblue
-" Color: orange        #ffa500           214               darkyellow
-" Color: darkgreen     #006400           22                darkgreen
-" Color: coral         #ff7f50           209               red
-" Color: olivedrab     #6b8e23           64                green
-" Color: slateblue     #6a5acd           62                darkmagenta
-" Term colors: x_black x_darkred x_darkgreen x_darkyellow x_darkblue x_darkmagenta x_darkcyan x_gray
-" Term colors: x_darkgray x_red x_green x_yellow x_blue x_magenta x_cyan x_white
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/darkblue.vim

@@ -1,256 +1,158 @@
 " Name:         darkblue
 " Description:  For those who prefer dark background
 " Author:       Original author Bohdan Vlasyuk <bohdan@vstu.edu.ua>
-" Maintainer:   Original author Bohdan Vlasyuk <bohdan@vstu.edu.ua>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'darkblue'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#8b0000', '#90f020', '#ffa500', '#00008b', '#8b008b', '#008b8b', '#c0c0c0', '#808080', '#ffa0a0', '#90f020', '#ffff60', '#0030ff', '#ff00ff', '#90fff0', '#ffffff']
-endif
-hi! link Terminal Normal
-hi! link PopupSelected PmenuSel
-hi! link CursorColumn CursorLine
-hi! link CursorIM Cursor
-hi! link EndOfBuffer NonText
-hi! link ErrorMsg Error
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link StatusLineTerm StatusLine
-hi! link StatusLineTermNC StatusLineNC
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
-hi! link TabLineFill TabLine
+let g:terminal_ansi_colors = ['#000000', '#8b0000', '#90f020', '#ffa500', '#00008b', '#8b008b', '#008b8b', '#c0c0c0', '#808080', '#ffa0a0', '#90f020', '#ffff60', '#0030ff', '#ff00ff', '#90fff0', '#ffffff']
+
+hi! link Added String
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Statement
+hi! link CurSearch Search
+hi! link CursorIM Cursor
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
+hi! link Debug Special
 hi! link Define PreProc
 hi! link Delimiter Special
+hi! link EndOfBuffer NonText
+hi! link ErrorMsg Error
 hi! link Exception Statement
 hi! link Float Constant
 hi! link Function Identifier
 hi! link Include PreProc
 hi! link Keyword Statement
 hi! link Label Statement
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link Macro PreProc
+hi! link MessageWindow Pmenu
 hi! link Number Constant
 hi! link Operator Statement
+hi! link PopupNotification Todo
 hi! link PreCondit PreProc
+hi! link Removed WarningMsg
 hi! link Repeat Statement
 hi! link SpecialChar Special
 hi! link SpecialComment Special
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
 hi! link StorageClass Type
 hi! link String Constant
 hi! link Structure Type
+hi! link TabLineFill TabLine
+hi! link TabPanel Normal
+hi! link TabPanelFill Normal
 hi! link Tag Special
+hi! link Terminal Normal
 hi! link Typedef Type
-hi! link Debug Special
-hi! link Added String
-hi! link Removed WarningMsg
-hi! link diffOnly WarningMsg
-hi! link diffNoEOL WarningMsg
-hi! link diffIsA WarningMsg
-hi! link diffIdentical WarningMsg
-hi! link diffDiffer WarningMsg
-hi! link diffCommon WarningMsg
 hi! link diffBDiffer WarningMsg
+hi! link diffCommon WarningMsg
+hi! link diffDiffer WarningMsg
+hi! link diffIdentical WarningMsg
+hi! link diffIsA WarningMsg
+hi! link diffNoEOL WarningMsg
+hi! link diffOnly WarningMsg
 hi! link lCursor Cursor
-hi! link CurSearch Search
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
-hi Normal guifg=#c0c0c0 guibg=#000040 gui=NONE cterm=NONE
-hi Conceal guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi ColorColumn guifg=#c0c0c0 guibg=#8b0000 gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#ffff60 gui=NONE cterm=NONE
-hi QuickFixLine guifg=#000000 guibg=#ff80ff gui=NONE cterm=NONE
-hi Error guifg=#ffa0a0 guibg=NONE gui=reverse cterm=reverse
-hi FoldColumn guifg=#808080 guibg=NONE gui=bold cterm=NONE
-hi Folded guifg=#808080 guibg=NONE gui=bold cterm=NONE
-hi IncSearch guifg=#ffffff guibg=#0030ff gui=reverse cterm=reverse
-hi LineNr guifg=#90f020 guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi ModeMsg guifg=#90fff0 guibg=NONE gui=NONE cterm=NONE
-hi MoreMsg guifg=#006400 guibg=NONE gui=NONE cterm=NONE
-hi NonText guifg=#0030ff guibg=NONE gui=NONE cterm=NONE
-hi Pmenu guifg=#ffffff guibg=#0030ff gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuSel guifg=#0030ff guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ff80ff guibg=#0030ff gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff00ff guibg=#ffffff gui=NONE cterm=NONE
-hi Question guifg=#90f020 guibg=NONE gui=NONE cterm=NONE
-hi SignColumn guifg=#808080 guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#90f020 guibg=NONE guisp=#90f020 gui=undercurl cterm=underline
-hi SpellLocal guifg=#90fff0 guibg=NONE guisp=#90fff0 gui=undercurl cterm=underline
-hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi StatusLine guifg=#000040 guibg=#c0c0c0 gui=NONE cterm=NONE
-hi StatusLineNC guifg=#000000 guibg=#808080 gui=NONE cterm=NONE
-hi TabLine guifg=#000000 guibg=#808080 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#ffffff guibg=#0030ff gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi VertSplit guifg=#000000 guibg=#808080 gui=NONE cterm=NONE
-hi Visual guifg=#8080ff guibg=#ffffff gui=reverse cterm=reverse
-hi VisualNOS guifg=#8080ff guibg=#c0c0c0 gui=reverse,underline cterm=reverse,underline
-hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#ffff60 guibg=#000000 gui=NONE cterm=NONE
-hi debugBreakpoint guifg=#90f020 guibg=#00008b gui=reverse cterm=reverse
-hi debugPC guifg=#90fff0 guibg=#00008b gui=reverse cterm=reverse
-hi Directory guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
-hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#90fff0 guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#000040 guibg=#c0c0c0 gui=NONE cterm=NONE
-hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffff60 guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi Type guifg=#90f020 guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
-hi TabLineSel guifg=#000040 guibg=#c0c0c0 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff60 guibg=#666666 gui=NONE cterm=NONE
-hi Search guifg=#90fff0 guibg=#0030ff gui=NONE cterm=NONE
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link PopupSelected PmenuSel
-  hi! link CursorColumn CursorLine
-  hi! link CursorIM Cursor
-  hi! link EndOfBuffer NonText
-  hi! link ErrorMsg Error
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link TabLineFill TabLine
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Label Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Statement
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link Debug Special
-  hi! link Added String
-  hi! link Removed WarningMsg
-  hi! link diffOnly WarningMsg
-  hi! link diffNoEOL WarningMsg
-  hi! link diffIsA WarningMsg
-  hi! link diffIdentical WarningMsg
-  hi! link diffDiffer WarningMsg
-  hi! link diffCommon WarningMsg
-  hi! link diffBDiffer WarningMsg
-  hi! link lCursor Cursor
-  hi! link CurSearch Search
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi Normal ctermfg=252 ctermbg=17 cterm=NONE
-  hi Conceal ctermfg=30 ctermbg=NONE cterm=NONE
-  hi ColorColumn ctermfg=252 ctermbg=88 cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=227 cterm=NONE
-  hi QuickFixLine ctermfg=16 ctermbg=213 cterm=NONE
-  hi Error ctermfg=217 ctermbg=NONE cterm=reverse
-  hi FoldColumn ctermfg=102 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=102 ctermbg=NONE cterm=NONE
-  hi IncSearch ctermfg=231 ctermbg=27 cterm=reverse
-  hi LineNr ctermfg=118 ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi ModeMsg ctermfg=123 ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=22 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=27 ctermbg=NONE cterm=NONE
-  hi Pmenu ctermfg=231 ctermbg=27 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=27 ctermbg=231 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi PmenuMatch ctermfg=213 ctermbg=27 cterm=NONE
-  hi PmenuMatchSel ctermfg=201 ctermbg=231 cterm=NONE
-  hi Question ctermfg=118 ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=102 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=30 ctermbg=NONE cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=118 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=123 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=17 ctermbg=252 cterm=NONE
-  hi StatusLineNC ctermfg=16 ctermbg=102 cterm=NONE
-  hi TabLine ctermfg=16 ctermbg=102 cterm=NONE
-  hi ToolbarButton ctermfg=231 ctermbg=27 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit ctermfg=16 ctermbg=102 cterm=NONE
-  hi Visual ctermfg=105 ctermbg=231 cterm=reverse
-  hi VisualNOS ctermfg=105 ctermbg=252 cterm=reverse,underline
-  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=227 ctermbg=16 cterm=NONE
-  hi debugBreakpoint ctermfg=118 ctermbg=18 cterm=reverse
-  hi debugPC ctermfg=123 ctermbg=18 cterm=reverse
-  hi Directory ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=123 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=17 ctermbg=252 cterm=NONE
-  hi PreProc ctermfg=213 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=214 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=227 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=118 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi TabLineSel ctermfg=17 ctermbg=252 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=59 cterm=NONE
-  hi CursorLineNr ctermfg=227 ctermbg=59 cterm=NONE
-  hi Search ctermfg=123 ctermbg=27 cterm=NONE
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#c0c0c0 guibg=#000040 guisp=NONE gui=NONE ctermfg=252 ctermbg=17 cterm=NONE term=NONE
+hi ColorColumn guifg=#c0c0c0 guibg=#8b0000 guisp=NONE gui=NONE ctermfg=252 ctermbg=88 cterm=NONE term=reverse
+hi Comment guifg=#80a0ff guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#008b8b guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ffa0a0 guibg=NONE guisp=NONE gui=NONE ctermfg=217 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#ffff60 guisp=NONE gui=NONE ctermfg=16 ctermbg=227 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=59 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=59 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffff60 guibg=#666666 guisp=NONE gui=NONE ctermfg=227 ctermbg=59 cterm=NONE term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#008b8b guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=#ffa0a0 guibg=NONE guisp=NONE gui=reverse ctermfg=217 ctermbg=NONE cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#808080 guibg=NONE guisp=NONE gui=bold ctermfg=102 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#808080 guibg=NONE guisp=NONE gui=bold ctermfg=102 ctermbg=NONE cterm=NONE term=NONE
+hi Identifier guifg=#90fff0 guibg=NONE guisp=NONE gui=NONE ctermfg=123 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#000040 guibg=#c0c0c0 guisp=NONE gui=NONE ctermfg=17 ctermbg=252 cterm=NONE term=NONE
+hi IncSearch guifg=#ffffff guibg=#0030ff guisp=NONE gui=reverse ctermfg=231 ctermbg=27 cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#90f020 guibg=NONE guisp=NONE gui=NONE ctermfg=118 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=bold,underline
+hi ModeMsg guifg=#90fff0 guibg=NONE guisp=NONE gui=NONE ctermfg=123 ctermbg=NONE cterm=NONE term=bold
+hi MoreMsg guifg=#006400 guibg=NONE guisp=NONE gui=NONE ctermfg=22 ctermbg=NONE cterm=NONE term=NONE
+hi NonText guifg=#0030ff guibg=NONE guisp=NONE gui=NONE ctermfg=27 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#ffffff guibg=#0030ff guisp=NONE gui=NONE ctermfg=231 ctermbg=27 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ff80ff guibg=#0030ff guisp=NONE gui=NONE ctermfg=213 ctermbg=27 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#ffffff guisp=NONE gui=NONE ctermfg=201 ctermbg=231 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi PmenuSel guifg=#0030ff guibg=#ffffff guisp=NONE gui=NONE ctermfg=27 ctermbg=231 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=NONE
+hi PreProc guifg=#ff80ff guibg=NONE guisp=NONE gui=NONE ctermfg=213 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#90f020 guibg=NONE guisp=NONE gui=NONE ctermfg=118 ctermbg=NONE cterm=NONE term=standout
+hi QuickFixLine guifg=#000000 guibg=#ff80ff guisp=NONE gui=NONE ctermfg=16 ctermbg=213 cterm=NONE term=NONE
+hi Search guifg=#90fff0 guibg=#0030ff guisp=NONE gui=NONE ctermfg=123 ctermbg=27 cterm=NONE term=reverse
+hi SignColumn guifg=#808080 guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ffa500 guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#008b8b guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#90f020 guibg=NONE guisp=#90f020 gui=undercurl ctermfg=118 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#90fff0 guibg=NONE guisp=#90fff0 gui=undercurl ctermfg=123 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=201 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#ffff60 guibg=NONE guisp=NONE gui=NONE ctermfg=227 ctermbg=NONE cterm=NONE term=NONE
+hi StatusLine guifg=#000040 guibg=#c0c0c0 guisp=NONE gui=NONE ctermfg=17 ctermbg=252 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#000000 guibg=#808080 guisp=NONE gui=NONE ctermfg=16 ctermbg=102 cterm=NONE term=bold,underline
+hi TabLine guifg=#000000 guibg=#808080 guisp=NONE gui=NONE ctermfg=16 ctermbg=102 cterm=NONE term=bold,underline
+hi TabLineSel guifg=#000040 guibg=#c0c0c0 guisp=NONE gui=NONE ctermfg=17 ctermbg=252 cterm=NONE term=bold,reverse
+hi Title guifg=#ff00ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE
+hi Todo guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=bold,reverse
+hi ToolbarButton guifg=#ffffff guibg=#0030ff guisp=NONE gui=NONE ctermfg=231 ctermbg=27 cterm=NONE term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#90f020 guibg=NONE guisp=NONE gui=NONE ctermfg=118 ctermbg=NONE cterm=NONE term=NONE
+hi Underlined guifg=#80a0ff guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#000000 guibg=#808080 guisp=NONE gui=NONE ctermfg=16 ctermbg=102 cterm=NONE term=NONE
+hi Visual guifg=#8080ff guibg=#ffffff guisp=NONE gui=reverse ctermfg=105 ctermbg=231 cterm=reverse term=reverse
+hi VisualNOS guifg=#8080ff guibg=#c0c0c0 guisp=NONE gui=reverse,underline ctermfg=105 ctermbg=252 cterm=reverse,underline term=NONE
+hi WarningMsg guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#ffff60 guibg=#000000 guisp=NONE gui=NONE ctermfg=227 ctermbg=16 cterm=NONE term=bold
+hi debugBreakpoint guifg=#90f020 guibg=#00008b guisp=NONE gui=reverse ctermfg=118 ctermbg=18 cterm=reverse term=reverse
+hi debugPC guifg=#90fff0 guibg=#00008b guisp=NONE gui=reverse ctermfg=123 ctermbg=18 cterm=reverse term=reverse
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
-  hi Conceal ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=red ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
-  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Error ctermfg=red ctermbg=NONE cterm=reverse
   hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=grey cterm=NONE
   hi IncSearch ctermfg=white ctermbg=blue cterm=reverse
   hi LineNr ctermfg=green ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
@@ -258,23 +160,33 @@ if s:t_Co >= 16
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=white ctermbg=blue cterm=NONE
+  hi PmenuMatch ctermfg=magenta ctermbg=blue cterm=NONE
+  hi PmenuMatchSel ctermfg=darkmagenta ctermbg=white cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=blue ctermbg=white cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
-  hi PmenuMatch ctermfg=magenta ctermbg=blue cterm=NONE
-  hi PmenuMatchSel ctermfg=darkmagenta ctermbg=white cterm=NONE
+  hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
+  hi Search ctermfg=white ctermbg=blue cterm=NONE
   hi SignColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=cyan ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=yellow ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=black ctermbg=grey cterm=NONE
   hi StatusLineNC ctermfg=black ctermbg=darkgrey cterm=NONE
   hi TabLine ctermfg=black ctermbg=darkgrey cterm=NONE
+  hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ToolbarButton ctermfg=white ctermbg=blue cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=green ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=black ctermbg=darkgrey cterm=NONE
   hi Visual ctermfg=blue ctermbg=white cterm=reverse
   hi VisualNOS ctermfg=blue ctermbg=grey cterm=reverse,underline
@@ -282,40 +194,29 @@ if s:t_Co >= 16
   hi WildMenu ctermfg=yellow ctermbg=black cterm=NONE
   hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
   hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=red ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=black ctermbg=grey cterm=NONE
-  hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=green ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
-  hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
-  hi Search ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=grey ctermbg=darkmagenta cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Error ctermfg=darkred ctermbg=grey cterm=reverse
   hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=NONE cterm=bold,reverse
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=grey ctermbg=darkblue cterm=reverse
   hi LineNr ctermfg=green ctermbg=NONE cterm=bold
   hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
@@ -323,158 +224,58 @@ if s:t_Co >= 8
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=grey ctermbg=blue cterm=NONE
+  hi PmenuMatch ctermfg=grey ctermbg=blue cterm=bold
+  hi PmenuMatchSel ctermfg=blue ctermbg=grey cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=blue ctermbg=grey cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
-  hi PmenuMatch ctermfg=grey ctermbg=blue cterm=bold
-  hi PmenuMatchSel ctermfg=blue ctermbg=grey cterm=bold
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=grey ctermbg=darkmagenta cterm=NONE
   hi Search ctermfg=darkcyan ctermbg=blue cterm=NONE
   hi SignColumn ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse
   hi SpellLocal ctermfg=darkcyan ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi StatusLine ctermfg=darkblue ctermbg=grey cterm=bold,reverse
   hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
-  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
   hi TabLine ctermfg=grey ctermbg=black cterm=reverse
   hi TabLineSel ctermfg=darkblue ctermbg=grey cterm=bold,reverse
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ToolbarButton ctermfg=darkblue ctermbg=grey cterm=bold,reverse
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
   hi Visual ctermfg=blue ctermbg=grey cterm=reverse
   hi VisualNOS ctermfg=blue ctermbg=grey cterm=reverse,underline
   hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=yellow ctermbg=black cterm=NONE
   hi debugBreakpoint ctermfg=darkgreen ctermbg=darkblue cterm=reverse
   hi debugPC ctermfg=darkcyan ctermbg=darkblue cterm=reverse
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: white         #FFFFFF           231               white
-" Color: black         #000000           16                black
-" Color: diffc         #0087af           31                darkcyan
-" Color: difft         #005f87           24                cyan
-" Color: cursorl       #666666           59                darkgrey
-" Color: ogDeepBlue    #000040           17                black
-" Color: ogDarkBlue    #00008b           18                darkblue
-" Color: ogBlue        #0030ff           27                blue
-" Color: ogLightBlue   #287eff           33                blue
-" Color: ogDarkGrey    #a9a9a9           248               grey
-" Color: ogGrey        #808080           102               darkgrey
-" Color: ogLightGrey   #c0c0c0           252               grey
-" Color: ogDarkViolet  #404080           61                darkblue
-" Color: ogViolet      #8080ff           105               blue
-" Color: ogLightViolet #80a0ff           111               blue
-" Color: ogDarkGreen   #006400           22                darkgreen
-" Color: ogGreen       #90f020           118               green
-" Color: ogDarkCyan    #008b8b           30                darkcyan
-" Color: ogCyan        #90fff0           123               cyan
-" Color: ogLightCyan   #b0ffff           159               cyan
-" Color: ogDarkerRed   #8b0000           88                darkred
-" Color: ogDarkRed     #d14a14           166               darkred
-" Color: ogRed         #ff0000           196               red
-" Color: ogLightRed    #ffa0a0           217               red
-" Color: ogDarkMag     #8b008b           90                darkmagenta
-" Color: ogMagenta     #ff00ff           201               darkmagenta
-" Color: ogLightMag    #ff80ff           213               magenta
-" Color: ogOrange      #ffa500           214               darkyellow
-" Color: ogYellow      #ffff60           227               yellow
-" Term colors: black  ogDarkerRed ogGreen ogOrange ogDarkBlue ogDarkMag ogDarkCyan ogLightGrey
-" Term colors: ogGrey ogLightRed  ogGreen ogYellow ogBlue     ogMagenta    ogCyan     white
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/delek.vim

@@ -2,421 +2,255 @@
 " Description:  Light background colorscheme.
 " Author:       Original author David Schweikert <david@schweikert.ch>
 " Maintainer:   Original maintainer David Schweikert <david@schweikert.ch>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=light
 
 hi clear
 let g:colors_name = 'delek'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#ffffff', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#bcbcbc', '#ee0000', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#000000']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#ffffff', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#bcbcbc', '#ee0000', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#000000']
-endif
-hi! link Terminal Normal
-hi! link PopupSelected PmenuSel
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
 hi! link CurSearch Search
+hi! link CursorIM Cursor
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link ErrorMsg Error
+hi! link Float Number
+hi! link Function Identifier
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
+hi! link Number Constant
 hi! link PopupNotification Todo
-hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi StatusLine guifg=#ffff00 guibg=#00008b gui=bold cterm=bold
-hi StatusLineNC guifg=#ffd700 guibg=#00008b gui=NONE cterm=NONE
-hi StatusLineTerm guifg=#ffff00 guibg=#0000ff gui=bold cterm=bold
-hi StatusLineTermNC guifg=#e4e4e4 guibg=#0000ff gui=NONE cterm=NONE
-hi VertSplit guifg=#e4e4e4 guibg=#00008b gui=NONE cterm=NONE
-hi Pmenu guifg=#000000 guibg=#add8e6 gui=NONE cterm=NONE
-hi PmenuSel guifg=#ffffff guibg=#00008b gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
-hi PmenuMatch guifg=#cd00cd guibg=#add8e6 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff87ff guibg=#00008b gui=NONE cterm=NONE
-hi TabLine guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
-hi TabLineFill guifg=NONE guibg=#bcbcbc gui=NONE cterm=NONE
-hi TabLineSel guifg=#000000 guibg=#ffffff gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#ffffff guibg=#bcbcbc gui=bold cterm=bold
-hi NonText guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi Conceal guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#00008b guibg=#e4e4e4 gui=NONE cterm=NONE
-hi Visual guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
-hi VisualNOS guifg=NONE guibg=#ee0000 gui=NONE cterm=NONE
-hi LineNr guifg=#a52a2a guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#00008b guibg=NONE gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#a52a2a guibg=NONE gui=bold cterm=bold
-hi QuickFixLine guifg=#ffffff guibg=#008b8b gui=NONE cterm=NONE
-hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Underlined guifg=#6a5acd guibg=NONE gui=underline cterm=underline
-hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi WarningMsg guifg=#cd00cd guibg=#ffffff gui=NONE cterm=NONE
-hi MoreMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
-hi ModeMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
-hi Question guifg=#008700 guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi MatchParen guifg=#ffffff guibg=#ff1493 gui=NONE cterm=NONE
-hi Search guifg=#ffffff guibg=#cd00cd gui=NONE cterm=NONE
-hi IncSearch guifg=#00cd00 guibg=NONE gui=reverse cterm=reverse
-hi WildMenu guifg=#00008b guibg=#ffd700 gui=bold cterm=bold
-hi ColorColumn guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
-hi Cursor guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
-hi lCursor guifg=#000000 guibg=#00cd00 gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#008b8b guibg=NONE guisp=#008b8b gui=undercurl cterm=underline
-hi SpellLocal guifg=#0000ff guibg=NONE guisp=#0000ff gui=undercurl cterm=underline
-hi SpellRare guifg=#cd00cd guibg=NONE guisp=#cd00cd gui=undercurl cterm=underline
-hi debugBreakpoint guifg=#ffff00 guibg=#0000ff gui=NONE cterm=NONE
-hi debugPC guifg=#ff1493 guibg=#0000ff gui=NONE cterm=NONE
-hi Comment guifg=#ee0000 guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#00cd00 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#0000ff guibg=NONE gui=bold cterm=bold
-hi PreProc guifg=#cd00cd guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#0000ff guibg=NONE gui=bold cterm=bold
-hi Special guifg=#ff1493 guibg=NONE gui=NONE cterm=NONE
-hi Directory guifg=#008b8b guibg=NONE gui=bold cterm=bold
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#cd00cd guibg=NONE gui=bold cterm=bold
-hi CursorLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link PopupSelected PmenuSel
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link ErrorMsg Error
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi Normal ctermfg=16 ctermbg=231 cterm=NONE
-  hi EndOfBuffer ctermfg=250 ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=226 ctermbg=18 cterm=bold
-  hi StatusLineNC ctermfg=220 ctermbg=18 cterm=NONE
-  hi StatusLineTerm ctermfg=226 ctermbg=21 cterm=bold
-  hi StatusLineTermNC ctermfg=254 ctermbg=21 cterm=NONE
-  hi VertSplit ctermfg=254 ctermbg=18 cterm=NONE
-  hi Pmenu ctermfg=16 ctermbg=152 cterm=NONE
-  hi PmenuSel ctermfg=231 ctermbg=18 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=231 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=30 cterm=NONE
-  hi PmenuMatch ctermfg=164 ctermbg=152 cterm=NONE
-  hi PmenuMatchSel ctermfg=213 ctermbg=18 cterm=NONE
-  hi TabLine ctermfg=16 ctermbg=254 cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=250 cterm=NONE
-  hi TabLineSel ctermfg=16 ctermbg=231 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=254 cterm=NONE
-  hi ToolbarButton ctermfg=231 ctermbg=250 cterm=bold
-  hi NonText ctermfg=250 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=250 ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=250 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=18 ctermbg=254 cterm=NONE
-  hi Visual ctermfg=16 ctermbg=252 cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=196 cterm=NONE
-  hi LineNr ctermfg=124 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=18 ctermbg=NONE cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE
-  hi CursorLineNr ctermfg=124 ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=231 ctermbg=30 cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=62 ctermbg=NONE cterm=underline
-  hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi WarningMsg ctermfg=164 ctermbg=231 cterm=NONE
-  hi MoreMsg ctermfg=16 ctermbg=231 cterm=bold
-  hi ModeMsg ctermfg=16 ctermbg=231 cterm=bold
-  hi Question ctermfg=28 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=16 ctermbg=226 cterm=NONE
-  hi MatchParen ctermfg=231 ctermbg=198 cterm=NONE
-  hi Search ctermfg=231 ctermbg=164 cterm=NONE
-  hi IncSearch ctermfg=40 ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=18 ctermbg=220 cterm=bold
-  hi ColorColumn ctermfg=16 ctermbg=254 cterm=NONE
-  hi Cursor ctermfg=231 ctermbg=16 cterm=NONE
-  hi lCursor ctermfg=16 ctermbg=40 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=30 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=21 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=164 ctermbg=NONE cterm=underline
-  hi debugBreakpoint ctermfg=226 ctermbg=21 cterm=NONE
-  hi debugPC ctermfg=198 ctermbg=21 cterm=NONE
-  hi Comment ctermfg=196 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=40 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=21 ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=164 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=21 ctermbg=NONE cterm=bold
-  hi Special ctermfg=198 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=30 ctermbg=NONE cterm=bold
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=164 ctermbg=NONE cterm=bold
-  hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=NONE
+hi ColorColumn guifg=#000000 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 cterm=NONE term=reverse
+hi Comment guifg=#ee0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#00cd00 guibg=NONE guisp=NONE gui=NONE ctermfg=40 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=underline
+hi CursorLineNr guifg=#a52a2a guibg=NONE guisp=NONE gui=bold ctermfg=124 ctermbg=NONE cterm=bold term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#008b8b guibg=NONE guisp=NONE gui=bold ctermfg=30 ctermbg=NONE cterm=bold term=NONE
+hi EndOfBuffer guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#00008b guibg=NONE guisp=NONE gui=NONE ctermfg=18 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00008b guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=18 ctermbg=254 cterm=NONE term=NONE
+hi Identifier guifg=#008b8b guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#00cd00 guibg=NONE guisp=NONE gui=reverse ctermfg=40 ctermbg=NONE cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#a52a2a guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#ffffff guibg=#ff1493 guisp=NONE gui=NONE ctermfg=231 ctermbg=198 cterm=NONE term=bold,underline
+hi ModeMsg guifg=#000000 guibg=#ffffff guisp=NONE gui=bold ctermfg=16 ctermbg=231 cterm=bold term=bold
+hi MoreMsg guifg=#000000 guibg=#ffffff guisp=NONE gui=bold ctermfg=16 ctermbg=231 cterm=bold term=NONE
+hi NonText guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#000000 guibg=#add8e6 guisp=NONE gui=NONE ctermfg=16 ctermbg=152 cterm=NONE term=reverse
+hi PmenuMatch guifg=#cd00cd guibg=#add8e6 guisp=NONE gui=NONE ctermfg=164 ctermbg=152 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff87ff guibg=#00008b guisp=NONE gui=NONE ctermfg=213 ctermbg=18 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=reverse
+hi PmenuSel guifg=#ffffff guibg=#00008b guisp=NONE gui=NONE ctermfg=231 ctermbg=18 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#008b8b guisp=NONE gui=NONE ctermfg=NONE ctermbg=30 cterm=NONE term=NONE
+hi PreProc guifg=#cd00cd guibg=NONE guisp=NONE gui=NONE ctermfg=164 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#008700 guibg=NONE guisp=NONE gui=bold ctermfg=28 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#ffffff guibg=#008b8b guisp=NONE gui=NONE ctermfg=231 ctermbg=30 cterm=NONE term=NONE
+hi Search guifg=#ffffff guibg=#cd00cd guisp=NONE gui=NONE ctermfg=231 ctermbg=164 cterm=NONE term=reverse
+hi SignColumn guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ff1493 guibg=NONE guisp=NONE gui=NONE ctermfg=198 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#008b8b guibg=NONE guisp=#008b8b gui=undercurl ctermfg=30 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#0000ff guibg=NONE guisp=#0000ff gui=undercurl ctermfg=21 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#cd00cd guibg=NONE guisp=#cd00cd gui=undercurl ctermfg=164 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=21 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#ffff00 guibg=#00008b guisp=NONE gui=bold ctermfg=226 ctermbg=18 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#ffd700 guibg=#00008b guisp=NONE gui=NONE ctermfg=220 ctermbg=18 cterm=NONE term=bold,underline
+hi StatusLineTerm guifg=#ffff00 guibg=#0000ff guisp=NONE gui=bold ctermfg=226 ctermbg=21 cterm=bold term=bold,reverse
+hi StatusLineTermNC guifg=#e4e4e4 guibg=#0000ff guisp=NONE gui=NONE ctermfg=254 ctermbg=21 cterm=NONE term=bold,underline
+hi TabLine guifg=#000000 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 cterm=NONE term=bold,underline
+hi TabLineFill guifg=NONE guibg=#bcbcbc guisp=NONE gui=NONE ctermfg=NONE ctermbg=250 cterm=NONE term=NONE
+hi TabLineSel guifg=#000000 guibg=#ffffff guisp=NONE gui=bold ctermfg=16 ctermbg=231 cterm=bold term=bold,reverse
+hi Title guifg=#cd00cd guibg=NONE guisp=NONE gui=bold ctermfg=164 ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=#ffffff guibg=#bcbcbc guisp=NONE gui=bold ctermfg=231 ctermbg=250 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=reverse
+hi Type guifg=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=21 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#6a5acd guibg=NONE guisp=NONE gui=underline ctermfg=62 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#e4e4e4 guibg=#00008b guisp=NONE gui=NONE ctermfg=254 ctermbg=18 cterm=NONE term=NONE
+hi Visual guifg=#000000 guibg=#d0d0d0 guisp=NONE gui=NONE ctermfg=16 ctermbg=252 cterm=NONE term=reverse
+hi VisualNOS guifg=NONE guibg=#ee0000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=196 cterm=NONE term=NONE
+hi WarningMsg guifg=#cd00cd guibg=#ffffff guisp=NONE gui=NONE ctermfg=164 ctermbg=231 cterm=NONE term=standout
+hi WildMenu guifg=#00008b guibg=#ffd700 guisp=NONE gui=bold ctermfg=18 ctermbg=220 cterm=bold term=bold
+hi debugBreakpoint guifg=#ffff00 guibg=#0000ff guisp=NONE gui=NONE ctermfg=226 ctermbg=21 cterm=NONE term=NONE
+hi debugPC guifg=#ff1493 guibg=#0000ff guisp=NONE gui=NONE ctermfg=198 ctermbg=21 cterm=NONE term=NONE
+hi lCursor guifg=#000000 guibg=#00cd00 guisp=NONE gui=NONE ctermfg=16 ctermbg=40 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=black ctermbg=white cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=grey cterm=NONE
+  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=white ctermbg=black cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=grey cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkgrey ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=yellow ctermbg=darkblue cterm=bold
-  hi StatusLineNC ctermfg=darkyellow ctermbg=darkblue cterm=NONE
-  hi StatusLineTerm ctermfg=yellow ctermbg=blue cterm=bold
-  hi StatusLineTermNC ctermfg=grey ctermbg=blue cterm=NONE
-  hi VertSplit ctermfg=grey ctermbg=darkblue cterm=NONE
+  hi Error ctermfg=red ctermbg=white cterm=reverse
+  hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=grey cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=white ctermbg=magenta cterm=NONE
+  hi ModeMsg ctermfg=black ctermbg=white cterm=bold
+  hi MoreMsg ctermfg=black ctermbg=white cterm=bold
+  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-  hi PmenuSel ctermfg=white ctermbg=darkblue cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=darkcyan cterm=NONE
   hi PmenuMatch ctermfg=darkmagenta ctermbg=grey cterm=NONE
   hi PmenuMatchSel ctermfg=magenta ctermbg=darkblue cterm=NONE
-  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
-  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=grey cterm=NONE
-  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold
-  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=grey cterm=NONE
-  hi Visual ctermfg=black ctermbg=darkgrey cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=darkred cterm=NONE
-  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=grey cterm=NONE
-  hi CursorLineNr ctermfg=darkgrey ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=white ctermbg=darkcyan cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
-  hi Error ctermfg=red ctermbg=white cterm=reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=NONE
-  hi MoreMsg ctermfg=black ctermbg=white cterm=bold
-  hi ModeMsg ctermfg=black ctermbg=white cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE
+  hi PmenuSel ctermfg=white ctermbg=darkblue cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkcyan cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
-  hi MatchParen ctermfg=white ctermbg=magenta cterm=NONE
+  hi QuickFixLine ctermfg=white ctermbg=darkcyan cterm=NONE
   hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE
-  hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=darkblue ctermbg=darkyellow cterm=bold
-  hi ColorColumn ctermfg=black ctermbg=grey cterm=NONE
-  hi Cursor ctermfg=white ctermbg=black cterm=NONE
-  hi lCursor ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=darkblue ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=yellow ctermbg=darkblue cterm=bold
+  hi StatusLineNC ctermfg=darkyellow ctermbg=darkblue cterm=NONE
+  hi StatusLineTerm ctermfg=yellow ctermbg=blue cterm=bold
+  hi StatusLineTermNC ctermfg=grey ctermbg=blue cterm=NONE
+  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
+  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=grey cterm=NONE
+  hi Type ctermfg=blue ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=grey ctermbg=darkblue cterm=NONE
+  hi Visual ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=darkred cterm=NONE
+  hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=NONE
+  hi WildMenu ctermfg=darkblue ctermbg=darkyellow cterm=bold
   hi debugBreakpoint ctermfg=yellow ctermbg=darkblue cterm=NONE
   hi debugPC ctermfg=magenta ctermbg=darkblue cterm=NONE
-  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=blue ctermbg=NONE cterm=bold
-  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Visual ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi lCursor ctermfg=black ctermbg=darkgreen cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=black ctermbg=gray cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=white ctermbg=black cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=grey cterm=NONE
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=darkblue ctermbg=darkyellow cterm=bold,reverse
-  hi StatusLineNC ctermfg=darkblue ctermbg=darkyellow cterm=reverse
-  hi StatusLineTerm ctermfg=darkblue ctermbg=darkyellow cterm=bold,reverse
-  hi StatusLineTermNC ctermfg=darkblue ctermbg=darkyellow cterm=reverse
-  hi VertSplit ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi Error ctermfg=red ctermbg=gray cterm=reverse
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MatchParen ctermfg=black ctermbg=darkmagenta cterm=bold
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
   hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
   hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi TabLine ctermfg=gray ctermbg=black cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=black cterm=NONE
-  hi TabLineSel ctermfg=black ctermbg=gray cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
-  hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi LineNr ctermfg=NONE ctermbg=NONE cterm=bold
-  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
-  hi Error ctermfg=red ctermbg=gray cterm=reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkmagenta cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
   hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
-  hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
   hi SpellCap ctermfg=darkcyan ctermbg=black cterm=reverse
   hi SpellLocal ctermfg=darkblue ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=darkblue ctermbg=darkyellow cterm=bold,reverse
+  hi StatusLineNC ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi StatusLineTerm ctermfg=darkblue ctermbg=darkyellow cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi TabLine ctermfg=gray ctermbg=black cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=black cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=gray cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=darkblue ctermbg=darkyellow cterm=reverse
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
   hi debugBreakpoint ctermfg=darkyellow ctermbg=darkblue cterm=NONE
   hi debugPC ctermfg=darkmagenta ctermbg=darkblue cterm=NONE
-  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi lCursor ctermfg=black ctermbg=darkgreen cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi ErrorMsg term=bold,reverse
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: light
-" Color: comment     #ee0000        196            darkred
-" Color: constant    #00cd00        40             darkgreen
-" Color: identifier  #008b8b        30             darkcyan
-" Color: statement   #0000ff        21             darkblue
-" Color: preproc     #cd00cd        164            darkmagenta
-" Color: type        #0000ff        21             blue
-" Color: special     #ff1493        198            magenta
-" Color: fg0         #000000        16             black
-" Color: bg0         #ffffff        231            white
-" Color: bg1         #bcbcbc        250            darkgrey
-" Color: visual      #d0d0d0        252            darkgrey
-" Color: folded      #e4e4e4        254            grey
-" Color: pmenu       #add8e6        152            grey
-" Color: wildmenu    #00008b        18             darkblue
-" Color: error       #ff0000        196            red
-" Color: status_fg   #ffd700        220            darkyellow
-" Color: linenr      #a52a2a        124            darkgrey
-" Color: Yellow      #ffff00        226            yellow
-" Color: SlateBlue   #6a5acd        62             blue
-" Color: black       #000000        16             black
-" Color: darkred     #870000        88             darkred
-" Color: darkgreen   #008700        28             darkgreen
-" Color: darkyellow  #878700        100            darkyellow
-" Color: darkblue    #000087        18             darkblue
-" Color: darkmagenta #870087        18             darkmagenta
-" Color: darkcyan    #008787        30             darkcyan
-" Color: gray        #878787        102            gray
-" Color: magenta     #ff87ff        213            magenta
-" Term colors: bg0     statement constant preproc identifier type special bg1
-" Term colors: comment statement constant preproc identifier type special fg0
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/desert.vim

@@ -2,409 +2,256 @@
 " Description:  Light background colorscheme.
 " Author:       Original author Hans Fugal <hans@fugal.net>
 " Maintainer:   Original maintainer Hans Fugal <hans@fugal.net>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'desert'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#7f7f8c', '#cd5c5c', '#9acd32', '#bdb76b', '#75a0ff', '#eeee00', '#cd853f', '#666666', '#8a7f7f', '#ff0000', '#89fb98', '#f0e68c', '#6dceeb', '#ffde9b', '#ffa0a0', '#c2bfa5']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#7f7f8c', '#cd5c5c', '#9acd32', '#bdb76b', '#75a0ff', '#eeee00', '#cd853f', '#666666', '#8a7f7f', '#ff0000', '#89fb98', '#f0e68c', '#6dceeb', '#ffde9b', '#ffa0a0', '#c2bfa5']
-endif
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link EndOfBuffer NonText
+hi! link Float Number
+hi! link Function Identifier
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
+hi! link Number Constant
 hi! link PopupNotification Todo
-hi! link PopupSelected PmenuSel
-hi Normal guifg=#ffffff guibg=#333333 gui=NONE cterm=NONE
-hi StatusLine guifg=#333333 guibg=#c2bfa5 gui=NONE cterm=NONE
-hi StatusLineNC guifg=#7f7f8c guibg=#c2bfa5 gui=NONE cterm=NONE
-hi StatusLineTerm guifg=#333333 guibg=#c2bfa5 gui=NONE cterm=NONE
-hi StatusLineTermNC guifg=#ffffff guibg=#c2bfa5 gui=NONE cterm=NONE
-hi VertSplit guifg=#7f7f8c guibg=#c2bfa5 gui=NONE cterm=NONE
-hi Pmenu guifg=#ffffff guibg=#666666 gui=NONE cterm=NONE
-hi PmenuSel guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#333333 gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#c2bfa5 gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ffa0a0 guibg=#666666 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#cd5c5c guibg=#f0e68c gui=NONE cterm=NONE
-hi TabLine guifg=#333333 guibg=#c2bfa5 gui=NONE cterm=NONE
-hi TabLineFill guifg=NONE guibg=#c2bfa5 gui=NONE cterm=NONE
-hi TabLineSel guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#333333 guibg=#ffde9b gui=bold cterm=bold
-hi NonText guifg=#6dceeb guibg=#4d4d4d gui=NONE cterm=NONE
-hi SpecialKey guifg=#9acd32 guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#eeee00 guibg=#4d4d4d gui=NONE cterm=NONE
-hi Visual guifg=#f0e68c guibg=#6b8e24 gui=NONE cterm=NONE
-hi VisualNOS guifg=#f0e68c guibg=#6dceeb gui=NONE cterm=NONE
-hi LineNr guifg=#eeee00 guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#eeee00 guibg=#4d4d4d gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#eeee00 guibg=NONE gui=bold cterm=bold
-hi QuickFixLine guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
-hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Underlined guifg=#75a0ff guibg=NONE gui=underline cterm=underline
-hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi ErrorMsg guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi ModeMsg guifg=#ffde9b guibg=NONE gui=bold cterm=bold
-hi WarningMsg guifg=#cd5c5c guibg=NONE gui=bold cterm=bold
-hi MoreMsg guifg=#9acd32 guibg=NONE gui=bold cterm=bold
-hi Question guifg=#89fb98 guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#ff0000 guibg=#eeee00 gui=NONE cterm=NONE
-hi MatchParen guifg=#7f7f8c guibg=#bdb76b gui=NONE cterm=NONE
-hi Search guifg=#f0e68c guibg=#7f7f8c gui=NONE cterm=NONE
-hi IncSearch guifg=#f0e68c guibg=#cd853f gui=NONE cterm=NONE
-hi WildMenu guifg=#333333 guibg=#eeee00 gui=NONE cterm=NONE
-hi ColorColumn guifg=#ffffff guibg=#cd5c5c gui=NONE cterm=NONE
-hi Cursor guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
-hi lCursor guifg=#333333 guibg=#ff0000 gui=NONE cterm=NONE
-hi debugPC guifg=#666666 guibg=NONE gui=reverse cterm=reverse
-hi debugBreakpoint guifg=#ffa0a0 guibg=NONE gui=reverse cterm=reverse
-hi SpellBad guifg=#cd5c5c guibg=NONE guisp=#cd5c5c gui=undercurl cterm=underline
-hi SpellCap guifg=#75a0ff guibg=NONE guisp=#75a0ff gui=undercurl cterm=underline
-hi SpellLocal guifg=#ffde9b guibg=NONE guisp=#ffde9b gui=undercurl cterm=underline
-hi SpellRare guifg=#9acd32 guibg=NONE guisp=#9acd32 gui=undercurl cterm=underline
-hi Comment guifg=#6dceeb guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#89fb98 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#f0e68c guibg=NONE gui=bold cterm=bold
-hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#cd5c5c guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#bdb76b guibg=NONE gui=bold cterm=bold
-hi Special guifg=#ffde9b guibg=NONE gui=NONE cterm=NONE
-hi Directory guifg=#6dceeb guibg=NONE gui=NONE cterm=NONE
-hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#cd5c5c guibg=NONE gui=bold cterm=bold
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link TabPanel Normal
+hi! link TabPanelFill EndOfBuffer
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link EndOfBuffer NonText
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi! link PopupSelected PmenuSel
-  hi Normal ctermfg=231 ctermbg=236 cterm=NONE
-  hi StatusLine ctermfg=236 ctermbg=144 cterm=NONE
-  hi StatusLineNC ctermfg=242 ctermbg=144 cterm=NONE
-  hi StatusLineTerm ctermfg=236 ctermbg=144 cterm=NONE
-  hi StatusLineTermNC ctermfg=231 ctermbg=144 cterm=NONE
-  hi VertSplit ctermfg=242 ctermbg=144 cterm=NONE
-  hi Pmenu ctermfg=231 ctermbg=241 cterm=NONE
-  hi PmenuSel ctermfg=236 ctermbg=186 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=236 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=144 cterm=NONE
-  hi PmenuMatch ctermfg=217 ctermbg=241 cterm=NONE
-  hi PmenuMatchSel ctermfg=167 ctermbg=186 cterm=NONE
-  hi TabLine ctermfg=236 ctermbg=144 cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=144 cterm=NONE
-  hi TabLineSel ctermfg=236 ctermbg=186 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=241 cterm=NONE
-  hi ToolbarButton ctermfg=236 ctermbg=222 cterm=bold
-  hi NonText ctermfg=81 ctermbg=239 cterm=NONE
-  hi SpecialKey ctermfg=112 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=226 ctermbg=239 cterm=NONE
-  hi Visual ctermfg=186 ctermbg=64 cterm=NONE
-  hi VisualNOS ctermfg=186 ctermbg=81 cterm=NONE
-  hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=226 ctermbg=239 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=241 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=241 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=236 ctermbg=186 cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi ErrorMsg ctermfg=196 ctermbg=231 cterm=reverse
-  hi ModeMsg ctermfg=222 ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=167 ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=112 ctermbg=NONE cterm=bold
-  hi Question ctermfg=120 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=196 ctermbg=226 cterm=NONE
-  hi MatchParen ctermfg=242 ctermbg=143 cterm=NONE
-  hi Search ctermfg=186 ctermbg=242 cterm=NONE
-  hi IncSearch ctermfg=186 ctermbg=172 cterm=NONE
-  hi WildMenu ctermfg=236 ctermbg=226 cterm=NONE
-  hi ColorColumn ctermfg=231 ctermbg=167 cterm=NONE
-  hi debugPC ctermfg=241 ctermbg=NONE cterm=reverse
-  hi debugBreakpoint ctermfg=217 ctermbg=NONE cterm=reverse
-  hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=111 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=222 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=112 ctermbg=NONE cterm=underline
-  hi Comment ctermfg=81 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=120 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=186 ctermbg=NONE cterm=bold
-  hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=167 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=143 ctermbg=NONE cterm=bold
-  hi Special ctermfg=222 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=81 ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=241 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=167 ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#ffffff guibg=#333333 guisp=NONE gui=NONE ctermfg=231 ctermbg=236 cterm=NONE term=NONE
+hi ColorColumn guifg=#ffffff guibg=#cd5c5c guisp=NONE gui=NONE ctermfg=231 ctermbg=167 cterm=NONE term=reverse
+hi Comment guifg=#6dceeb guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ffa0a0 guibg=NONE guisp=NONE gui=NONE ctermfg=217 ctermbg=NONE cterm=NONE term=NONE
+hi CursorColumn guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=241 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=241 cterm=NONE term=underline
+hi CursorLineNr guifg=#eeee00 guibg=NONE guisp=NONE gui=bold ctermfg=226 ctermbg=NONE cterm=bold term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#6dceeb guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#eeee00 guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=226 ctermbg=239 cterm=NONE term=NONE
+hi Folded guifg=#eeee00 guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=226 ctermbg=239 cterm=NONE term=NONE
+hi Identifier guifg=#89fb98 guibg=NONE guisp=NONE gui=NONE ctermfg=120 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#f0e68c guibg=#cd853f guisp=NONE gui=NONE ctermfg=186 ctermbg=172 cterm=NONE term=bold,reverse,underline
+hi LineNr guifg=#eeee00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#7f7f8c guibg=#bdb76b guisp=NONE gui=NONE ctermfg=242 ctermbg=143 cterm=NONE term=bold,underline
+hi ModeMsg guifg=#ffde9b guibg=NONE guisp=NONE gui=bold ctermfg=222 ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#9acd32 guibg=NONE guisp=NONE gui=bold ctermfg=112 ctermbg=NONE cterm=bold term=NONE
+hi NonText guifg=#6dceeb guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=81 ctermbg=239 cterm=NONE term=NONE
+hi Pmenu guifg=#ffffff guibg=#666666 guisp=NONE gui=NONE ctermfg=231 ctermbg=241 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ffa0a0 guibg=#666666 guisp=NONE gui=NONE ctermfg=217 ctermbg=241 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#cd5c5c guibg=#f0e68c guisp=NONE gui=NONE ctermfg=167 ctermbg=186 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=#333333 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=reverse
+hi PmenuSel guifg=#333333 guibg=#f0e68c guisp=NONE gui=NONE ctermfg=236 ctermbg=186 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=NONE ctermbg=144 cterm=NONE term=NONE
+hi PreProc guifg=#cd5c5c guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#89fb98 guibg=NONE guisp=NONE gui=bold ctermfg=120 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#333333 guibg=#f0e68c guisp=NONE gui=NONE ctermfg=236 ctermbg=186 cterm=NONE term=NONE
+hi Search guifg=#f0e68c guibg=#7f7f8c guisp=NONE gui=NONE ctermfg=186 ctermbg=242 cterm=NONE term=reverse
+hi SignColumn guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ffde9b guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#9acd32 guibg=NONE guisp=NONE gui=NONE ctermfg=112 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#cd5c5c guibg=NONE guisp=#cd5c5c gui=undercurl ctermfg=167 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#75a0ff guibg=NONE guisp=#75a0ff gui=undercurl ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ffde9b guibg=NONE guisp=#ffde9b gui=undercurl ctermfg=222 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#9acd32 guibg=NONE guisp=#9acd32 gui=undercurl ctermfg=112 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#f0e68c guibg=NONE guisp=NONE gui=bold ctermfg=186 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#333333 guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=236 ctermbg=144 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#7f7f8c guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=242 ctermbg=144 cterm=NONE term=bold,underline
+hi StatusLineTerm guifg=#333333 guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=236 ctermbg=144 cterm=NONE term=bold,reverse
+hi StatusLineTermNC guifg=#ffffff guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=231 ctermbg=144 cterm=NONE term=bold,underline
+hi TabLine guifg=#333333 guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=236 ctermbg=144 cterm=NONE term=bold,underline
+hi TabLineFill guifg=NONE guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=NONE ctermbg=144 cterm=NONE term=NONE
+hi TabLineSel guifg=#333333 guibg=#f0e68c guisp=NONE gui=NONE ctermfg=236 ctermbg=186 cterm=NONE term=bold,reverse
+hi Title guifg=#cd5c5c guibg=NONE guisp=NONE gui=bold ctermfg=167 ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#ff0000 guibg=#eeee00 guisp=NONE gui=NONE ctermfg=196 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=#333333 guibg=#ffde9b guisp=NONE gui=bold ctermfg=236 ctermbg=222 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=241 cterm=NONE term=reverse
+hi Type guifg=#bdb76b guibg=NONE guisp=NONE gui=bold ctermfg=143 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#75a0ff guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#7f7f8c guibg=#c2bfa5 guisp=NONE gui=NONE ctermfg=242 ctermbg=144 cterm=NONE term=NONE
+hi Visual guifg=#f0e68c guibg=#6b8e24 guisp=NONE gui=NONE ctermfg=186 ctermbg=64 cterm=NONE term=reverse
+hi VisualNOS guifg=#f0e68c guibg=#6dceeb guisp=NONE gui=NONE ctermfg=186 ctermbg=81 cterm=NONE term=NONE
+hi WarningMsg guifg=#cd5c5c guibg=NONE guisp=NONE gui=bold ctermfg=167 ctermbg=NONE cterm=bold term=standout
+hi WildMenu guifg=#333333 guibg=#eeee00 guisp=NONE gui=NONE ctermfg=236 ctermbg=226 cterm=NONE term=bold
+hi debugBreakpoint guifg=#ffa0a0 guibg=NONE guisp=NONE gui=reverse ctermfg=217 ctermbg=NONE cterm=reverse term=reverse
+hi debugPC guifg=#666666 guibg=NONE guisp=NONE gui=reverse ctermfg=241 ctermbg=NONE cterm=reverse term=reverse
+
+if has('gui_running') || s:tgc
+  hi Cursor guifg=#333333 guibg=#f0e68c guisp=NONE gui=NONE cterm=NONE
+  hi lCursor guifg=#333333 guibg=#ff0000 guisp=NONE gui=NONE cterm=NONE
+endif
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineNC ctermfg=darkgrey ctermbg=grey cterm=NONE
-  hi StatusLineTerm ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineTermNC ctermfg=darkgrey ctermbg=grey cterm=NONE
-  hi VertSplit ctermfg=darkgrey ctermbg=grey cterm=NONE
-  hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
-  hi PmenuMatch ctermfg=NONE ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
-  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=white cterm=NONE
-  hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkyellow ctermbg=darkgrey cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=blue ctermbg=NONE cterm=NONE
   hi Error ctermfg=red ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=red ctermbg=white cterm=reverse
-  hi ModeMsg ctermfg=magenta ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Question ctermfg=green ctermbg=NONE cterm=bold
-  hi Todo ctermfg=red ctermbg=darkmagenta cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi FoldColumn ctermfg=darkyellow ctermbg=darkgrey cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=green ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=black ctermbg=yellow cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkmagenta cterm=NONE
-  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
-  hi debugPC ctermfg=grey ctermbg=NONE cterm=reverse
-  hi debugBreakpoint ctermfg=cyan ctermbg=NONE cterm=reverse
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ModeMsg ctermfg=magenta ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=NONE ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PreProc ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Question ctermfg=green ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE
+  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkblue ctermbg=grey cterm=reverse
   hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi Comment ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=green ctermbg=NONE cterm=NONE
   hi Statement ctermfg=yellow ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=black ctermbg=grey cterm=NONE
+  hi StatusLineNC ctermfg=darkgrey ctermbg=grey cterm=NONE
+  hi StatusLineTerm ctermfg=black ctermbg=grey cterm=NONE
+  hi StatusLineTermNC ctermfg=darkgrey ctermbg=grey cterm=NONE
+  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=white cterm=NONE
+  hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
   hi Title ctermfg=darkred ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=red ctermbg=darkmagenta cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=darkgrey ctermbg=grey cterm=NONE
+  hi Visual ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
+  hi WildMenu ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi debugBreakpoint ctermfg=cyan ctermbg=NONE cterm=reverse
+  hi debugPC ctermfg=grey ctermbg=NONE cterm=reverse
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
-  hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
-  hi StatusLineTerm ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi StatusLineTermNC ctermfg=grey ctermbg=black cterm=reverse
-  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
-  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
   hi Error ctermfg=darkred ctermbg=grey cterm=reverse
   hi ErrorMsg ctermfg=darkred ctermbg=grey cterm=reverse
-  hi ModeMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Todo ctermfg=darkred ctermbg=darkmagenta cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi FoldColumn ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkmagenta cterm=NONE
-  hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
-  hi debugPC ctermfg=grey ctermbg=NONE cterm=reverse
-  hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ModeMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PreProc ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkblue ctermbg=grey cterm=reverse
   hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Special ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
+  hi StatusLineTerm ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=grey ctermbg=black cterm=reverse
+  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
   hi Title ctermfg=darkred ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=darkred ctermbg=darkmagenta cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
+  hi WildMenu ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi debugPC ctermfg=grey ctermbg=NONE cterm=reverse
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi Cursor term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi EndOfBuffer term=NONE
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: foreground  #ffffff        231            white
-" Color: background  #333333        236            black
-" Color: color00     #7f7f8c        242            black
-" Color: color08     #8a7f7f        244            darkgrey
-" Color: color01     #cd5c5c        167            darkred
-" Color: color09     #ff0000        196            red
-" Color: color02     #9acd32        112            darkgreen
-" Color: color10     #89fb98        120            green
-" Color: color03     #bdb76b        143            darkyellow
-" Color: color11     #f0e68c        186            yellow
-" Color: color04     #75a0ff        111            darkblue
-" Color: color12     #6dceeb        81             blue
-" Color: color05     #eeee00        226            darkmagenta
-" Color: color13     #ffde9b        222            magenta
-" Color: color06     #cd853f        172            darkcyan
-" Color: color14     #ffa0a0        217            cyan
-" Color: color07     #666666        241            grey
-" Color: color15     #c2bfa5        144            white
-" Color: color16     #6b8e24        64             darkgreen
-" Color: color17     #4d4d4d        239            grey
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/elflord.vim

@@ -1,23 +1,28 @@
 " Name:         elflord
 " Author:       original author Ron Aaron <ron@ronware.org>
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
-" Website:      https://www.github.com/vim/colorschemes
+" URL:          https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2024 Aug 15
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'elflord'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 
-hi! link Terminal Normal
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Repeat
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
 hi! link Debug Special
 hi! link Define PreProc
 hi! link Delimiter Special
@@ -26,9 +31,12 @@ hi! link Float Number
 hi! link Include PreProc
 hi! link Keyword Statement
 hi! link Label Statement
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link Macro PreProc
+hi! link MessageWindow Pmenu
 hi! link Number Constant
-hi! link PopupSelected PmenuSel
+hi! link PopupNotification Todo
 hi! link PreCondit PreProc
 hi! link SpecialChar Special
 hi! link SpecialComment Special
@@ -37,194 +45,133 @@ hi! link StatusLineTermNC StatusLineNC
 hi! link StorageClass Type
 hi! link String Constant
 hi! link Structure Type
+hi! link TabPanel Normal
+hi! link TabPanelFill Normal
 hi! link Tag Special
 hi! link Typedef Type
 hi! link lCursor Cursor
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi Normal guifg=#00ffff guibg=#000000 gui=NONE cterm=NONE
-hi QuickFixLine guifg=#ffffff guibg=#2e8b57 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#cd0000 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=bold
-hi Folded guifg=#00ffff guibg=#666666 gui=NONE cterm=NONE
-hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#00ffff gui=NONE cterm=NONE
-hi Directory guifg=#00ffff guibg=#000000 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#0000ff guibg=#000000 gui=bold cterm=NONE
-hi ErrorMsg guifg=#ffffff guibg=#cd0000 gui=NONE cterm=NONE
-hi FoldColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi IncSearch guifg=NONE guibg=#000000 gui=reverse cterm=reverse
-hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
-hi NonText guifg=#0000ff guibg=NONE gui=bold cterm=bold
-hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#bebebe gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ff00ff guibg=#444444 gui=bold cterm=bold
-hi PmenuMatchSel guifg=#ff00ff guibg=#00cdcd gui=bold cterm=bold
-hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold
-hi Search guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#0000ff guibg=NONE guisp=#0000ff gui=undercurl cterm=underline
-hi SpellLocal guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl cterm=underline
-hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi StatusLine guifg=#000000 guibg=#00ffff gui=bold cterm=bold
-hi StatusLineNC guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
-hi TabLine guifg=#000000 guibg=#008b8b gui=NONE cterm=NONE
-hi TabLineFill guifg=NONE guibg=#000000 gui=reverse cterm=reverse
-hi TabLineSel guifg=#00ffff guibg=#000000 gui=bold cterm=bold
-hi Terminal guifg=#00ffff guibg=#000000 gui=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
-hi VertSplit guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
-hi Visual guifg=#000000 guibg=#a9a9a9 gui=NONE cterm=NONE
-hi VisualNOS guifg=NONE guibg=#000000 gui=bold,underline cterm=underline
-hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
-hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi Function guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#40ffff guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#000000 guibg=#000000 gui=NONE cterm=NONE
-hi Operator guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
-hi Repeat guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#aa4444 guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#0000ff guibg=#ffff00 gui=NONE cterm=NONE
-hi Type guifg=#60ff60 guibg=NONE gui=bold cterm=bold
-hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
-hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=bold
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi Normal guifg=#00ffff guibg=#000000 guisp=NONE gui=NONE ctermfg=51 ctermbg=16 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#cd0000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=160 cterm=NONE term=reverse
+hi Comment guifg=#80a0ff guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=59 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ff00ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#00ffff guisp=NONE gui=NONE ctermfg=16 ctermbg=51 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=NONE
+hi CursorIM guifg=NONE guibg=fg guisp=NONE gui=NONE ctermfg=NONE ctermbg=fg cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=bold ctermfg=226 ctermbg=NONE cterm=bold term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#00ffff guibg=#000000 guisp=NONE gui=NONE ctermfg=51 ctermbg=16 cterm=NONE term=NONE
+hi EndOfBuffer guifg=#0000ff guibg=#000000 guisp=NONE gui=bold ctermfg=21 ctermbg=16 cterm=NONE term=NONE
+hi Error guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 cterm=NONE term=bold,reverse
+hi ErrorMsg guifg=#ffffff guibg=#cd0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=160 cterm=NONE term=bold,reverse
+hi FoldColumn guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00ffff guibg=#666666 guisp=NONE gui=NONE ctermfg=51 ctermbg=59 cterm=NONE term=NONE
+hi Function guifg=#ffffff guibg=NONE guisp=NONE gui=NONE ctermfg=231 ctermbg=NONE cterm=NONE term=NONE
+hi Identifier guifg=#40ffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#000000 guibg=#000000 guisp=NONE gui=NONE ctermfg=16 ctermbg=16 cterm=NONE term=NONE
+hi IncSearch guifg=NONE guibg=#000000 guisp=NONE gui=reverse ctermfg=NONE ctermbg=16 cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=NONE guibg=#008b8b guisp=NONE gui=NONE ctermfg=NONE ctermbg=30 cterm=NONE term=bold,underline
+hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=bold term=NONE
+hi NonText guifg=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=21 ctermbg=NONE cterm=bold term=NONE
+hi Operator guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#ffffff guibg=#444444 guisp=NONE gui=NONE ctermfg=231 ctermbg=238 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ff00ff guibg=#444444 guisp=NONE gui=bold ctermfg=201 ctermbg=238 cterm=bold term=bold
+hi PmenuMatchSel guifg=#ff00ff guibg=#00cdcd guisp=NONE gui=bold ctermfg=201 ctermbg=44 cterm=bold term=bold
+hi PmenuSbar guifg=NONE guibg=#bebebe guisp=NONE gui=NONE ctermfg=NONE ctermbg=250 cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=NONE
+hi PreProc guifg=#ff80ff guibg=NONE guisp=NONE gui=NONE ctermfg=213 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#00ff00 guibg=NONE guisp=NONE gui=bold ctermfg=46 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#ffffff guibg=#2e8b57 guisp=NONE gui=NONE ctermfg=231 ctermbg=29 cterm=NONE term=NONE
+hi Repeat guifg=#ffffff guibg=NONE guisp=NONE gui=NONE ctermfg=231 ctermbg=NONE cterm=NONE term=NONE
+hi Search guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=reverse
+hi SignColumn guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#0000ff guibg=NONE guisp=#0000ff gui=undercurl ctermfg=21 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl ctermfg=226 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=201 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#aa4444 guibg=NONE guisp=NONE gui=bold ctermfg=131 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#000000 guibg=#00ffff guisp=NONE gui=bold ctermfg=16 ctermbg=51 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#000000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=bold,underline
+hi TabLine guifg=#000000 guibg=#008b8b guisp=NONE gui=NONE ctermfg=16 ctermbg=30 cterm=NONE term=bold,underline
+hi TabLineFill guifg=NONE guibg=#000000 guisp=NONE gui=reverse ctermfg=NONE ctermbg=16 cterm=reverse term=NONE
+hi TabLineSel guifg=#00ffff guibg=#000000 guisp=NONE gui=bold ctermfg=51 ctermbg=16 cterm=bold term=bold,reverse
+hi Terminal guifg=#00ffff guibg=#000000 guisp=NONE gui=NONE ctermfg=51 ctermbg=16 cterm=NONE term=NONE
+hi Title guifg=#ff00ff guibg=NONE guisp=NONE gui=bold ctermfg=201 ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#0000ff guibg=#ffff00 guisp=NONE gui=NONE ctermfg=21 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=#000000 guibg=#e5e5e5 guisp=NONE gui=bold ctermfg=16 ctermbg=254 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#60ff60 guibg=NONE guisp=NONE gui=bold ctermfg=83 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#80a0ff guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#000000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=NONE
+hi Visual guifg=#000000 guibg=#a9a9a9 guisp=NONE gui=NONE ctermfg=16 ctermbg=145 cterm=NONE term=reverse
+hi VisualNOS guifg=NONE guibg=#000000 guisp=NONE gui=bold,underline ctermfg=NONE ctermbg=16 cterm=underline term=NONE
+hi WarningMsg guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
 
-if s:t_Co >= 256
-  hi Normal ctermfg=51 ctermbg=16 cterm=NONE
-  hi QuickFixLine ctermfg=231 ctermbg=29 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=160 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
-  hi Folded ctermfg=51 ctermbg=59 cterm=NONE
-  hi Conceal ctermfg=59 ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=51 cterm=NONE
-  hi Directory ctermfg=51 ctermbg=16 cterm=NONE
-  hi EndOfBuffer ctermfg=21 ctermbg=16 cterm=NONE
-  hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
-  hi FoldColumn ctermfg=51 ctermbg=NONE cterm=NONE
-  hi IncSearch ctermfg=NONE ctermbg=16 cterm=reverse
-  hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=NONE ctermbg=30 cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=bold
-  hi NonText ctermfg=21 ctermbg=NONE cterm=bold
-  hi Pmenu ctermfg=231 ctermbg=238 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=250 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=44 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi PmenuMatch ctermfg=201 ctermbg=238 cterm=bold
-  hi PmenuMatchSel ctermfg=201 ctermbg=44 cterm=bold
-  hi Question ctermfg=46 ctermbg=NONE cterm=bold
-  hi Search ctermfg=16 ctermbg=226 cterm=NONE
-  hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=51 ctermbg=NONE cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=21 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=226 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=16 ctermbg=51 cterm=bold
-  hi StatusLineNC ctermfg=16 ctermbg=44 cterm=NONE
-  hi TabLine ctermfg=16 ctermbg=30 cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=16 cterm=reverse
-  hi TabLineSel ctermfg=51 ctermbg=16 cterm=bold
-  hi Terminal ctermfg=51 ctermbg=16 cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=bold
-  hi VertSplit ctermfg=16 ctermbg=44 cterm=NONE
-  hi Visual ctermfg=16 ctermbg=145 cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=16 cterm=underline
-  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
-  hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Error ctermfg=231 ctermbg=196 cterm=NONE
-  hi Function ctermfg=231 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=87 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=16 ctermbg=16 cterm=NONE
-  hi Operator ctermfg=196 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=213 ctermbg=NONE cterm=NONE
-  hi Repeat ctermfg=231 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=196 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=131 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=21 ctermbg=226 cterm=NONE
-  hi Type ctermfg=83 ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=bold
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=cyan ctermbg=black cterm=NONE
-  hi QuickFixLine ctermfg=white ctermbg=darkgreen cterm=NONE
   hi ColorColumn ctermfg=cyan ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=cyan cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=black ctermbg=cyan cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
   hi Directory ctermfg=cyan ctermbg=black cterm=NONE
   hi EndOfBuffer ctermfg=darkblue ctermbg=black cterm=NONE
+  hi Error ctermfg=white ctermbg=red cterm=NONE
   hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
   hi FoldColumn ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Function ctermfg=white ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=black cterm=NONE
   hi IncSearch ctermfg=NONE ctermbg=black cterm=reverse
   hi LineNr ctermfg=yellow ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
   hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Operator ctermfg=red ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=magenta ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=magenta ctermbg=darkcyan cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=grey cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
-  hi PmenuMatch ctermfg=magenta ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=magenta ctermbg=darkcyan cterm=bold
+  hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi Repeat ctermfg=white ctermbg=NONE cterm=NONE
   hi Search ctermfg=black ctermbg=yellow cterm=NONE
   hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=red ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=yellow ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
   hi StatusLine ctermfg=black ctermbg=cyan cterm=bold
   hi StatusLineNC ctermfg=black ctermbg=darkcyan cterm=NONE
   hi TabLine ctermfg=black ctermbg=darkcyan cterm=NONE
@@ -232,71 +179,71 @@ if s:t_Co >= 16
   hi TabLineSel ctermfg=cyan ctermbg=black cterm=bold
   hi Terminal ctermfg=cyan ctermbg=black cterm=NONE
   hi Title ctermfg=magenta ctermbg=NONE cterm=bold
+  hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=green ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=black ctermbg=darkcyan cterm=NONE
   hi Visual ctermfg=black ctermbg=darkgrey cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
   hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
-  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Error ctermfg=white ctermbg=red cterm=NONE
-  hi Function ctermfg=white ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=black ctermbg=black cterm=NONE
-  hi Operator ctermfg=red ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Repeat ctermfg=white ctermbg=NONE cterm=NONE
-  hi Special ctermfg=red ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
-  hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
-  hi Type ctermfg=green ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 8
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
   hi Normal ctermfg=darkcyan ctermbg=black cterm=NONE
-  hi QuickFixLine ctermfg=grey ctermbg=darkgreen cterm=NONE
   hi ColorColumn ctermfg=darkcyan ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=cyan cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=underline
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
   hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Error ctermfg=grey ctermbg=darkred cterm=NONE
   hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
   hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Function ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=NONE ctermbg=NONE cterm=reverse
   hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=black ctermbg=darkcyan cterm=NONE
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Operator ctermfg=darkred ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=grey ctermbg=NONE cterm=NONE
+  hi PmenuMatch ctermfg=grey ctermbg=NONE cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
   hi PmenuSbar ctermfg=grey ctermbg=grey cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkcyan cterm=NONE
-  hi PmenuMatch ctermfg=grey ctermbg=NONE cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=grey ctermbg=darkgreen cterm=NONE
+  hi Repeat ctermfg=grey ctermbg=NONE cterm=NONE
   hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkblue ctermbg=darkyellow cterm=reverse
   hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi Statement ctermfg=darkred ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=darkcyan ctermbg=NONE cterm=bold,reverse
   hi StatusLineNC ctermfg=black ctermbg=darkcyan cterm=NONE
   hi TabLine ctermfg=black ctermbg=darkcyan cterm=NONE
@@ -304,154 +251,28 @@ if s:t_Co >= 8
   hi TabLineSel ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Terminal ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=black ctermbg=darkcyan cterm=NONE
   hi Visual ctermfg=black ctermbg=grey cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
   hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Error ctermfg=grey ctermbg=darkred cterm=NONE
-  hi Function ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=black ctermbg=NONE cterm=NONE
-  hi Operator ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Repeat ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
   finish
 endif
 
-" Background: dark
-" Color: xterm0         #000000          16                black
-" Color: xterm1         #cd0000          160               darkred
-" Color: xterm2         #00cd00          40                darkgreen
-" Color: xterm3         #cdcd00          184               darkyellow
-" Color: xterm4         #0000ee          20                darkblue
-" Color: xterm5         #cd00cd          164               darkmagenta
-" Color: xterm6         #00cdcd          44                darkcyan
-" Color: xterm7         #e5e5e5          254               grey
-" Color: xterm8         #7f7f7f          102               darkgrey
-" Color: xterm9         #ff0000          196               red
-" Color: xterm10        #00ff00          46                green
-" Color: xterm11        #ffff00          226               yellow
-" Color: xterm12        #5c5cff          63                blue
-" Color: xterm13        #ff00ff          201               magenta
-" Color: xterm14        #00ffff          51                cyan
-" Color: xterm15        #ffffff          231               white
-" Color: Pmenu          #444444          238               darkgrey
-" Color: CursorLine     #3a3a3a          237               darkgrey
-" Color: rgbGrey40      #666666          59                darkgrey
-" Color: rgbDarkGrey    #a9a9a9          145               darkgrey
-" Color: rgbBlue        #0000ff          21                darkblue
-" Color: rgbDarkCyan    #008b8b          30                darkcyan
-" Color: Directory      #00ffff          51                cyan
-" Color: rgbSeaGreen    #2e8b57          29                darkgreen
-" Color: rgbGrey        #bebebe          250               grey
-" Color: Question       #00ff00          46                green
-" Color: SignColumn     #a9a9a9          248               grey
-" Color: SpecialKey     #00ffff          51                cyan
-" Color: Title          #ff00ff          201               magenta
-" Color: WarningMsg     #ff0000          196               red
-" Color: ToolbarLine    #7f7f7f          244               darkgrey
-" Color: Underlined     #80a0ff          111               blue
-" Color: elfComment     #80a0ff          111               blue
-" Color: elfIdentifier  #40ffff          87                cyan
-" Color: elfStatement   #aa4444          131               darkred
-" Color: elfPreProc     #ff80ff          213               magenta
-" Color: elfType        #60ff60          83                green
-" Color: elfBlue        #0000ff          21                blue
-" Term colors: xterm0 xterm1 xterm2 xterm3 xterm4 xterm5 xterm6 xterm7
-" Term colors: xterm8 xterm9 xterm10 xterm11 xterm12 xterm13
-" Term colors: xterm14 xterm15
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/evening.vim

@@ -2,49 +2,32 @@
 " Description:  This color scheme uses a dark grey background.
 " Author:       Original author Bram Moolenaar <Bram@vim.org>
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'evening'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0087ff', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0087ff', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi! link VertSplit StatusLineNC
-hi! link PopupSelected PmenuSel
-hi! link StatusLineTerm StatusLine
-hi! link StatusLineTermNC StatusLineNC
-hi! link TabLineFill TabLine
-hi! link Terminal Normal
-hi! link CursorColumn CursorLine
-hi! link CursorIM Cursor
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link Debug Special
 hi! link Added String
-hi! link Removed WarningMsg
-hi! link diffOnly WarningMsg
-hi! link diffNoEOL WarningMsg
-hi! link diffIsA WarningMsg
-hi! link diffIdentical WarningMsg
-hi! link diffDiffer WarningMsg
-hi! link diffCommon WarningMsg
-hi! link diffBDiffer WarningMsg
-hi! link lCursor Cursor
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Statement
+hi! link CurSearch Search
+hi! link CursorColumn CursorLine
+hi! link CursorIM Cursor
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
+hi! link Debug Special
 hi! link Define PreProc
 hi! link Delimiter Special
 hi! link Exception Statement
@@ -53,490 +36,247 @@ hi! link Function Identifier
 hi! link Include PreProc
 hi! link Keyword Statement
 hi! link Label Statement
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link Macro PreProc
+hi! link MessageWindow Pmenu
 hi! link Number Constant
 hi! link Operator Statement
+hi! link PopupNotification Todo
 hi! link PreCondit PreProc
+hi! link Removed WarningMsg
 hi! link Repeat Statement
 hi! link SpecialChar Special
 hi! link SpecialComment Special
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
 hi! link StorageClass Type
 hi! link String Constant
 hi! link Structure Type
+hi! link TabLineFill TabLine
+hi! link TabPanel Normal
+hi! link TabPanelFill EndOfBuffer
 hi! link Tag Special
+hi! link Terminal Normal
 hi! link Typedef Type
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
-hi Normal guifg=#ffffff guibg=#333333 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#8b0000 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=#666666 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#add8e6 guibg=#4d4d4d gui=NONE cterm=NONE
-hi StatusLine guifg=#333333 guibg=#ffffff gui=bold cterm=bold
-hi StatusLineNC guifg=#333333 guibg=#d3d3d3 gui=NONE cterm=NONE
-hi TabLineSel guifg=#333333 guibg=#ffffff gui=bold cterm=bold
-hi TabLine guifg=#333333 guibg=#d3d3d3 gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ff80ff guibg=#4d4d4d gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#8b008b guibg=#bebebe gui=NONE cterm=NONE
-hi Pmenu guifg=#ffffff guibg=#4d4d4d gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#bebebe gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi QuickFixLine guifg=#ffffff guibg=#8b008b gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
-hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi ErrorMsg guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#add8e6 guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#00008b guibg=#d3d3d3 gui=bold cterm=bold
-hi IncSearch guifg=#00ff00 guibg=NONE gui=reverse cterm=reverse
-hi MatchParen guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-hi MoreMsg guifg=#2e8b57 guibg=NONE gui=NONE cterm=NONE
-hi NonText guifg=#add8e6 guibg=#4d4d4d gui=NONE cterm=NONE
-hi Question guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Search guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi SignColumn guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi ToolbarButton guifg=NONE guibg=#999999 gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Visual guifg=#ffffff guibg=#999999 gui=NONE cterm=NONE
-hi VisualNOS guifg=NONE guibg=NONE gui=bold,underline ctermfg=NONE ctermbg=NONE cterm=bold,underline
-hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold
-hi debugBreakpoint guifg=#00008b guibg=#ff0000 gui=NONE cterm=NONE
-hi debugPC guifg=#00008b guibg=#0000ff gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl cterm=underline
-hi SpellLocal guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl cterm=underline
-hi SpellRare guifg=#ff80ff guibg=NONE guisp=#ff80ff gui=undercurl cterm=underline
-hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi Title guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
-hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#333333 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffff60 guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#ffff00 guibg=#0000ff gui=reverse cterm=reverse
-hi Type guifg=#00ff00 guibg=NONE gui=bold cterm=bold
-hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link VertSplit StatusLineNC
+hi! link diffBDiffer WarningMsg
+hi! link diffCommon WarningMsg
+hi! link diffDiffer WarningMsg
+hi! link diffIdentical WarningMsg
+hi! link diffIsA WarningMsg
+hi! link diffNoEOL WarningMsg
+hi! link diffOnly WarningMsg
+hi! link lCursor Cursor
 
-if s:t_Co >= 256
-  hi! link VertSplit StatusLineNC
-  hi! link PopupSelected PmenuSel
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLineFill TabLine
-  hi! link Terminal Normal
-  hi! link CursorColumn CursorLine
-  hi! link CursorIM Cursor
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link Debug Special
-  hi! link Added String
-  hi! link Removed WarningMsg
-  hi! link diffOnly WarningMsg
-  hi! link diffNoEOL WarningMsg
-  hi! link diffIsA WarningMsg
-  hi! link diffIdentical WarningMsg
-  hi! link diffDiffer WarningMsg
-  hi! link diffCommon WarningMsg
-  hi! link diffBDiffer WarningMsg
-  hi! link lCursor Cursor
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Label Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Statement
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi Normal ctermfg=231 ctermbg=236 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=88 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=241 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=241 cterm=NONE
-  hi EndOfBuffer ctermfg=153 ctermbg=239 cterm=NONE
-  hi StatusLine ctermfg=236 ctermbg=231 cterm=bold
-  hi StatusLineNC ctermfg=236 ctermbg=252 cterm=NONE
-  hi TabLineSel ctermfg=236 ctermbg=231 cterm=bold
-  hi TabLine ctermfg=236 ctermbg=252 cterm=NONE
-  hi PmenuMatch ctermfg=201 ctermbg=239 cterm=NONE
-  hi PmenuMatchSel ctermfg=90 ctermbg=250 cterm=NONE
-  hi Pmenu ctermfg=231 ctermbg=239 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=250 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi QuickFixLine ctermfg=231 ctermbg=90 cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=46 cterm=NONE
-  hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi ErrorMsg ctermfg=231 ctermbg=196 cterm=NONE
-  hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=241 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=153 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=18 ctermbg=252 cterm=bold
-  hi IncSearch ctermfg=46 ctermbg=NONE cterm=reverse
-  hi MatchParen ctermfg=NONE ctermbg=30 cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=153 ctermbg=239 cterm=NONE
-  hi Question ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Search ctermfg=16 ctermbg=226 cterm=NONE
-  hi SignColumn ctermfg=30 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=51 ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=246 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=231 ctermbg=246 cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline
-  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=bold
-  hi debugBreakpoint ctermfg=18 ctermbg=196 cterm=NONE
-  hi debugPC ctermfg=18 ctermbg=21 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=46 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=51 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
-  hi Directory ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=236 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=214 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=227 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=226 ctermbg=21 cterm=reverse
-  hi Type ctermfg=46 ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#ffffff guibg=#333333 guisp=NONE gui=NONE ctermfg=231 ctermbg=236 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#8b0000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=88 cterm=NONE term=reverse
+hi Comment guifg=#80a0ff guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ffa0a0 guibg=NONE guisp=NONE gui=NONE ctermfg=217 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#00ff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=46 cterm=NONE term=reverse
+hi CursorLine guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=241 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffff00 guibg=#666666 guisp=NONE gui=NONE ctermfg=226 ctermbg=241 cterm=NONE term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi EndOfBuffer guifg=#add8e6 guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=153 ctermbg=239 cterm=NONE term=NONE
+hi Error guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 cterm=NONE term=bold,reverse
+hi FoldColumn guifg=#add8e6 guibg=NONE guisp=NONE gui=NONE ctermfg=153 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00008b guibg=#d3d3d3 guisp=NONE gui=bold ctermfg=18 ctermbg=252 cterm=bold term=NONE
+hi Identifier guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#333333 guibg=NONE guisp=NONE gui=NONE ctermfg=236 ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#00ff00 guibg=NONE guisp=NONE gui=reverse ctermfg=46 ctermbg=NONE cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=NONE guibg=#008b8b guisp=NONE gui=NONE ctermfg=NONE ctermbg=30 cterm=NONE term=bold,underline
+hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#2e8b57 guibg=NONE guisp=NONE gui=NONE ctermfg=29 ctermbg=NONE cterm=NONE term=NONE
+hi NonText guifg=#add8e6 guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=153 ctermbg=239 cterm=NONE term=NONE
+hi Pmenu guifg=#ffffff guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=231 ctermbg=239 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ff80ff guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=201 ctermbg=239 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#8b008b guibg=#bebebe guisp=NONE gui=NONE ctermfg=90 ctermbg=250 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#bebebe guisp=NONE gui=NONE ctermfg=16 ctermbg=250 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=NONE
+hi PreProc guifg=#ff80ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=standout
+hi QuickFixLine guifg=#ffffff guibg=#8b008b guisp=NONE gui=NONE ctermfg=231 ctermbg=90 cterm=NONE term=NONE
+hi Search guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=reverse
+hi SignColumn guifg=#008b8b guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ffa500 guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl ctermfg=46 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl ctermfg=51 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#ff80ff guibg=NONE guisp=#ff80ff gui=undercurl ctermfg=201 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#ffff60 guibg=NONE guisp=NONE gui=bold ctermfg=227 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#333333 guibg=#ffffff guisp=NONE gui=bold ctermfg=236 ctermbg=231 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#333333 guibg=#d3d3d3 guisp=NONE gui=NONE ctermfg=236 ctermbg=252 cterm=NONE term=bold,underline
+hi TabLine guifg=#333333 guibg=#d3d3d3 guisp=NONE gui=NONE ctermfg=236 ctermbg=252 cterm=NONE term=bold,underline
+hi TabLineSel guifg=#333333 guibg=#ffffff guisp=NONE gui=bold ctermfg=236 ctermbg=231 cterm=bold term=bold,reverse
+hi Title guifg=#ff80ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE
+hi Todo guifg=#ffff00 guibg=#0000ff guisp=NONE gui=reverse ctermfg=226 ctermbg=21 cterm=reverse term=bold,reverse
+hi ToolbarButton guifg=NONE guibg=#999999 guisp=NONE gui=bold ctermfg=NONE ctermbg=246 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#00ff00 guibg=NONE guisp=NONE gui=bold ctermfg=46 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#80a0ff guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi Visual guifg=#ffffff guibg=#999999 guisp=NONE gui=NONE ctermfg=231 ctermbg=246 cterm=NONE term=reverse
+hi VisualNOS guifg=NONE guibg=NONE guisp=NONE gui=bold,underline ctermfg=NONE ctermbg=NONE cterm=bold,underline term=NONE
+hi WarningMsg guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=bold ctermfg=16 ctermbg=226 cterm=bold term=bold
+hi debugBreakpoint guifg=#00008b guibg=#ff0000 guisp=NONE gui=NONE ctermfg=18 ctermbg=196 cterm=NONE term=NONE
+hi debugPC guifg=#00008b guibg=#0000ff guisp=NONE gui=NONE ctermfg=18 ctermbg=21 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
-  hi! link VertSplit StatusLineNC
-  hi! link PopupSelected PmenuSel
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLineFill TabLine
-  hi! link Terminal Normal
-  hi! link CursorColumn CursorLine
-  hi! link CursorIM Cursor
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link Debug Special
-  hi! link Added String
-  hi! link Removed WarningMsg
-  hi! link diffOnly WarningMsg
-  hi! link diffNoEOL WarningMsg
-  hi! link diffIsA WarningMsg
-  hi! link diffIdentical WarningMsg
-  hi! link diffDiffer WarningMsg
-  hi! link diffCommon WarningMsg
-  hi! link diffBDiffer WarningMsg
-  hi! link lCursor Cursor
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Label Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Statement
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
   hi Normal ctermfg=white ctermbg=black cterm=NONE
   hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=lightblue ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=lightblue ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=white cterm=NONE
-  hi StatusLineNC ctermfg=black ctermbg=gray cterm=NONE
-  hi TabLineSel ctermfg=black ctermbg=white cterm=NONE
-  hi TabLine ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuMatch ctermfg=white ctermbg=darkgray cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
-  hi Pmenu ctermfg=white ctermbg=darkgray cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
-  hi QuickFixLine ctermfg=white ctermbg=darkmagenta cterm=NONE
-  hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi Error ctermfg=red ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
-  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=darkgray ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=lightblue ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=gray cterm=bold
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=green ctermbg=NONE cterm=reverse
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=lightblue ctermbg=darkgray cterm=NONE
+  hi Pmenu ctermfg=white ctermbg=darkgray cterm=NONE
+  hi PmenuMatch ctermfg=white ctermbg=darkgray cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=white ctermbg=darkmagenta cterm=NONE
   hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=cyan ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=yellow ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=black ctermbg=white cterm=NONE
+  hi StatusLineNC ctermfg=black ctermbg=gray cterm=NONE
+  hi TabLine ctermfg=black ctermbg=gray cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=white cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkyellow ctermbg=blue cterm=reverse
   hi ToolbarButton ctermfg=NONE ctermbg=darkgray cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=green ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=lightblue ctermbg=NONE cterm=underline
   hi Visual ctermfg=white ctermbg=darkgray cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline
   hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
   hi debugBreakpoint ctermfg=darkblue ctermbg=red cterm=NONE
   hi debugPC ctermfg=darkblue ctermbg=blue cterm=NONE
-  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=cyan ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=underline
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=lightblue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=yellow ctermbg=NONE cterm=bold
-  hi Todo ctermfg=darkyellow ctermbg=blue cterm=reverse
-  hi Type ctermfg=green ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=lightblue ctermbg=NONE cterm=underline
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=gray ctermbg=black cterm=NONE
   hi ColorColumn ctermfg=gray ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=bold
-  hi StatusLine ctermfg=gray ctermbg=black cterm=bold,reverse
-  hi StatusLineNC ctermfg=gray ctermbg=black cterm=reverse
-  hi TabLineSel ctermfg=gray ctermbg=black cterm=bold,reverse
-  hi TabLine ctermfg=gray ctermbg=black cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
-  hi QuickFixLine ctermfg=gray ctermbg=darkmagenta cterm=NONE
   hi Error ctermfg=red ctermbg=gray cterm=reverse
   hi ErrorMsg ctermfg=gray ctermbg=red cterm=NONE
-  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=gray cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=blue ctermbg=NONE cterm=bold
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=black cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=gray ctermbg=darkmagenta cterm=NONE
   hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=gray ctermbg=black cterm=reverse
+  hi TabLine ctermfg=gray ctermbg=black cterm=reverse
+  hi TabLineSel ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkyellow ctermbg=blue cterm=reverse
   hi ToolbarButton ctermfg=gray ctermbg=black cterm=bold,reverse
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
   hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
   hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
   hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
   hi debugBreakpoint ctermfg=darkblue ctermbg=darkred cterm=NONE
   hi debugPC ctermfg=darkblue ctermbg=darkyellow cterm=NONE
-  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
-  hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi SpellLocal ctermfg=darkcyan ctermbg=NONE cterm=reverse
-  hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=gray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Todo ctermfg=darkyellow ctermbg=blue cterm=reverse
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi CursorColumn term=NONE
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi VertSplit term=NONE
   finish
 endif
 
-" Background: dark
-" Color: lightmagenta  #ffa0a0           217               magenta
-" Color: blue          #0000ff           21                blue
-" Color: cyan          #00ffff           51                cyan
-" Color: yellow        #ffff00           226               darkyellow
-" Color: white         #ffffff           231               white
-" Color: black         #000000           16                black
-" Color: green         #00ff00           46                green
-" Color: magenta       #ff80ff           201               darkmagenta
-" Color: red           #ff0000           196               red
-" Color: lightyellow   #ffff60           227               yellow
-" Color: darkblue      #00008b           18                darkblue
-" Color: darkcyan      #008b8b           30                darkcyan
-" Color: darkmagenta   #8b008b           90                darkmagenta
-" Color: lightblue     #add8e6           153               lightblue
-" Color: orange        #ffa500           214               darkred
-" Color: seagreen      #2e8b57           29                darkgreen
-" Color: lightgrey     #d3d3d3           252               gray
-" Color: grey          #bebebe           250               gray
-" Color: grey20        #333333           236               gray
-" Color: grey30        #4d4d4d           239               darkgray
-" Color: grey40        #666666           241               darkgray
-" Color: grey60        #999999           246               darkgray
-" Color: comment       #80a0ff           111               lightblue
-" Color: darkred       #8b0000           88                darkred
-" Color: x_black       #000000           16                black
-" Color: x_darkred     #cd0000           160               darkred
-" Color: x_darkgreen   #00cd00           40                darkgreen
-" Color: x_darkyellow  #cdcd00           184               darkyellow
-" Color: x_darkblue_m  #0087ff           33                darkblue
-" Color: x_darkmagenta #cd00cd           164               darkmagenta
-" Color: x_darkcyan    #00cdcd           44                darkcyan
-" Color: x_gray        #e5e5e5           254               gray
-" Color: x_darkgray    #7f7f7f           244               darkgray
-" Color: x_red         #ff0000           196               red
-" Color: x_green       #00ff00           46                green
-" Color: x_yellow      #ffff00           226               yellow
-" Color: x_blue        #5c5cff           63                blue
-" Color: x_magenta     #ff00ff           201               magenta
-" Color: x_cyan        #00ffff           51                cyan
-" Color: x_white       #ffffff           231               white
-" Term colors: x_black x_darkred x_darkgreen x_darkyellow x_darkblue_m x_darkmagenta x_darkcyan x_gray
-" Term colors: x_darkgray x_red x_green x_yellow x_blue x_magenta x_cyan x_white
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/habamax.vim

@@ -1,477 +1,325 @@
 " Name:         habamax
 " Description:  Hubba hubba hubba.
 " Author:       Maxim Kim <habamax@gmail.com>
-" Maintainer:   Maxim Kim <habamax@gmail.com>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 18
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'habamax'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#1c1c1c', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d75f87', '#87d787', '#d7af87', '#5fafd7', '#d787d7', '#87afaf', '#bcbcbc']
-endif
-hi! link Terminal Normal
-hi! link StatuslineTerm Statusline
-hi! link StatuslineTermNC StatuslineNC
+let g:terminal_ansi_colors = ['#1c1c1c', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d75f87', '#87d787', '#d7af87', '#5fafd7', '#d787d7', '#87afaf', '#bcbcbc']
+
+hi! link CurSearch IncSearch
+hi! link CursorLineFold FoldColumn
+hi! link CursorLineSign FoldColumn
+hi! link Float Number
+hi! link Function Identifier
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
+hi! link Number Constant
+hi! link PopupNotification Todo
 hi! link PopupSelected PmenuSel
+hi! link Quote String
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link TabPanel Normal
+hi! link TabPanelFill Normal
+hi! link Terminal Normal
+hi! link asciidoctorBlock Special
+hi! link asciidoctorCode String
+hi! link asciidoctorH1Delimiter Statement
+hi! link asciidoctorH2Delimiter Statement
+hi! link asciidoctorH3Delimiter Statement
+hi! link asciidoctorH4Delimiter Statement
+hi! link asciidoctorH5Delimiter Statement
+hi! link asciidoctorH6Delimiter Statement
+hi! link asciidoctorListMarker Constant
+hi! link asciidoctorMacro Special
+hi! link asciidoctorOption Special
+hi! link asciidoctorSetextHeaderDelimiter Statement
+hi! link asciidoctorTitleDelimiter Statement
 hi! link javaScriptFunction Statement
 hi! link javaScriptIdentifier Statement
-hi! link sqlKeyword Statement
-hi! link yamlBlockMappingKey Statement
-hi! link rubyMacro Statement
-hi! link rubyDefine Statement
-hi! link vimVar Normal
-hi! link vimOper Normal
-hi! link vimSep Normal
-hi! link vimParenSep Normal
-hi! link vimCommentString Comment
+hi! link lspDiagSignErrorText Removed
+hi! link lspDiagSignHintText Added
+hi! link lspDiagSignInfoText Question
+hi! link lspDiagSignWarningText Changed
+hi! link lspDiagVirtualTextError Removed
+hi! link lspDiagVirtualTextHint Added
+hi! link lspDiagVirtualTextInfo Question
+hi! link lspDiagVirtualTextWarning Changed
 hi! link markdownUrl String
-hi Normal guifg=#bcbcbc guibg=#1c1c1c gui=NONE cterm=NONE
-hi Statusline guifg=#1c1c1c guibg=#9e9e9e gui=NONE cterm=NONE
-hi StatuslineNC guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
-hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
-hi TabLine guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
-hi TabLineFill guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
-hi TabLineSel guifg=#1c1c1c guibg=#9e9e9e gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=#767676 guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse
-hi QuickFixLine guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE
-hi CursorLineNr guifg=#dadada guibg=NONE gui=bold cterm=bold
-hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi LineNrAbove guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi LineNrBelow guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#87afaf guibg=#1c1c1c gui=reverse cterm=reverse
-hi VisualNOS guifg=#1c1c1c guibg=#5f8787 gui=NONE cterm=NONE
-hi Pmenu guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#767676 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuSel guifg=NONE guibg=#585858 gui=NONE cterm=NONE
-hi PmenuKind guifg=#5f8787 guibg=#3a3a3a gui=NONE cterm=NONE
-hi PmenuKindSel guifg=#5f8787 guibg=#585858 gui=NONE cterm=NONE
-hi PmenuExtra guifg=#767676 guibg=#3a3a3a gui=NONE cterm=NONE
-hi PmenuExtraSel guifg=#9e9e9e guibg=#585858 gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ffaf5f guibg=#3a3a3a gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ffaf5f guibg=#585858 gui=NONE cterm=NONE
-hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Error guifg=#af5f5f guibg=#1c1c1c gui=reverse cterm=reverse
-hi ErrorMsg guifg=#af5f5f guibg=#1c1c1c gui=reverse cterm=reverse
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-hi MoreMsg guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE
-hi Question guifg=#d7af87 guibg=NONE gui=NONE cterm=NONE
-hi WarningMsg guifg=#d75f87 guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#dadada guibg=NONE gui=bold cterm=bold
-hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
-hi Search guifg=#5fafd7 guibg=#1c1c1c gui=reverse cterm=reverse
-hi IncSearch guifg=#ffaf5f guibg=#1c1c1c gui=reverse cterm=reverse
-hi CurSearch guifg=#ffaf5f guibg=#1c1c1c gui=reverse cterm=reverse
-hi WildMenu guifg=#1c1c1c guibg=#d7af87 gui=bold cterm=bold
-hi debugPC guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE
-hi debugBreakpoint guifg=#1c1c1c guibg=#d75f87 gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
-hi lCursor guifg=#1c1c1c guibg=#5fff00 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-hi Folded guifg=#9e9e9e guibg=#262626 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
-hi SpellBad guifg=NONE guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
-hi SpellCap guifg=NONE guibg=NONE guisp=#ffaf5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
-hi SpellLocal guifg=NONE guibg=NONE guisp=#5fd75f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
-hi SpellRare guifg=NONE guibg=NONE guisp=#d787d7 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
-hi Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#d75f87 guibg=NONE gui=NONE cterm=NONE
-hi String guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE
-hi Character guifg=#87d787 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#87afaf guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#af87af guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#af875f guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#5f87af guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
-hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-hi Directory guifg=#87afaf guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Debug guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
-hi DiffAdd guifg=#5faf5f guibg=NONE gui=reverse cterm=reverse
-hi DiffChange guifg=#5f87af guibg=NONE gui=reverse cterm=reverse
-hi DiffText guifg=#af87af guibg=NONE gui=reverse cterm=reverse
-hi DiffDelete guifg=#af5f5f guibg=NONE gui=reverse cterm=reverse
-hi Added guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
-hi Changed guifg=#ffaf5f guibg=NONE gui=NONE cterm=NONE
-hi Removed guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
+hi! link rubyDefine Statement
+hi! link rubyMacro Statement
+hi! link sqlKeyword Statement
+hi! link sqlSpecial Constant
+hi! link vimCommentString Comment
+hi! link vimOper Normal
+hi! link vimParenSep Normal
+hi! link vimSep Normal
+hi! link vimVar Normal
+hi! link yamlBlockMappingKey Statement
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link StatuslineTerm Statusline
-  hi! link StatuslineTermNC StatuslineNC
-  hi! link MessageWindow Pmenu
-  hi! link PopupSelected PmenuSel
-  hi! link javaScriptFunction Statement
-  hi! link javaScriptIdentifier Statement
-  hi! link sqlKeyword Statement
-  hi! link yamlBlockMappingKey Statement
-  hi! link rubyMacro Statement
-  hi! link rubyDefine Statement
-  hi! link vimVar Normal
-  hi! link vimOper Normal
-  hi! link vimSep Normal
-  hi! link vimParenSep Normal
-  hi! link vimCommentString Comment
-  hi! link markdownUrl String
-  hi Normal ctermfg=250 ctermbg=234 cterm=NONE
-  hi Statusline ctermfg=234 ctermbg=247 cterm=NONE
-  hi StatuslineNC ctermfg=234 ctermbg=243 cterm=NONE
-  hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE
-  hi TabLine ctermfg=234 ctermbg=243 cterm=NONE
-  hi TabLineFill ctermfg=234 ctermbg=243 cterm=NONE
-  hi TabLineSel ctermfg=234 ctermbg=247 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=243 ctermbg=234 cterm=bold,reverse
-  hi QuickFixLine ctermfg=234 ctermbg=67 cterm=NONE
-  hi CursorLineNr ctermfg=253 ctermbg=NONE cterm=bold
-  hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
-  hi LineNrAbove ctermfg=240 ctermbg=NONE cterm=NONE
-  hi LineNrBelow ctermfg=240 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=240 ctermbg=NONE cterm=NONE
-  hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=109 ctermbg=234 cterm=reverse
-  hi VisualNOS ctermfg=234 ctermbg=66 cterm=NONE
-  hi Pmenu ctermfg=NONE ctermbg=237 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=NONE ctermbg=240 cterm=NONE
-  hi PmenuKind ctermfg=66 ctermbg=237 cterm=NONE
-  hi PmenuKindSel ctermfg=66 ctermbg=240 cterm=NONE
-  hi PmenuExtra ctermfg=243 ctermbg=237 cterm=NONE
-  hi PmenuExtraSel ctermfg=247 ctermbg=240 cterm=NONE
-  hi PmenuMatch ctermfg=215 ctermbg=237 cterm=NONE
-  hi PmenuMatchSel ctermfg=215 ctermbg=240 cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Error ctermfg=131 ctermbg=234 cterm=reverse
-  hi ErrorMsg ctermfg=131 ctermbg=234 cterm=reverse
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=71 ctermbg=NONE cterm=NONE
-  hi Question ctermfg=180 ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=168 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=253 ctermbg=NONE cterm=bold
-  hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
-  hi Search ctermfg=74 ctermbg=234 cterm=reverse
-  hi IncSearch ctermfg=215 ctermbg=234 cterm=reverse
-  hi CurSearch ctermfg=215 ctermbg=234 cterm=reverse
-  hi WildMenu ctermfg=234 ctermbg=180 cterm=bold
-  hi debugPC ctermfg=234 ctermbg=67 cterm=NONE
-  hi debugBreakpoint ctermfg=234 ctermbg=168 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE
-  hi Folded ctermfg=247 ctermbg=235 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=237 cterm=NONE
-  hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=215 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=77 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=176 ctermbg=NONE cterm=underline
-  hi Comment ctermfg=243 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=168 ctermbg=NONE cterm=NONE
-  hi String ctermfg=71 ctermbg=NONE cterm=NONE
-  hi Character ctermfg=114 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=109 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=139 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=137 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=67 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=66 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Directory ctermfg=109 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=240 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Debug ctermfg=66 ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=71 ctermbg=NONE cterm=reverse
-  hi DiffChange ctermfg=67 ctermbg=NONE cterm=reverse
-  hi DiffText ctermfg=139 ctermbg=NONE cterm=reverse
-  hi DiffDelete ctermfg=131 ctermbg=NONE cterm=reverse
-  hi Added ctermfg=77 ctermbg=NONE cterm=NONE
-  hi Changed ctermfg=215 ctermbg=NONE cterm=NONE
-  hi Removed ctermfg=167 ctermbg=NONE cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#bcbcbc guibg=#1c1c1c guisp=NONE gui=NONE ctermfg=250 ctermbg=234 cterm=NONE term=NONE
+hi Added guifg=#5fd75f guibg=NONE guisp=NONE gui=NONE ctermfg=77 ctermbg=NONE cterm=NONE term=NONE
+hi Changed guifg=#ffaf5f guibg=NONE guisp=NONE gui=NONE ctermfg=215 ctermbg=NONE cterm=NONE term=NONE
+hi Character guifg=#87d787 guibg=NONE guisp=NONE gui=NONE ctermfg=114 ctermbg=NONE cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=reverse
+hi Comment guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#d75f87 guibg=NONE guisp=NONE gui=NONE ctermfg=168 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#dadada guisp=NONE gui=NONE ctermfg=16 ctermbg=253 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=underline
+hi CursorLineNr guifg=#dadada guibg=NONE guisp=NONE gui=bold ctermfg=253 ctermbg=NONE cterm=bold term=bold
+hi Debug guifg=#5f8787 guibg=NONE guisp=NONE gui=NONE ctermfg=66 ctermbg=NONE cterm=NONE term=NONE
+hi DiffAdd guifg=NONE guibg=#273923 guisp=NONE gui=NONE ctermfg=247 ctermbg=22 cterm=NONE term=reverse
+hi DiffChange guifg=NONE guibg=#37352f guisp=NONE gui=NONE ctermfg=247 ctermbg=237 cterm=NONE term=NONE
+hi DiffDelete guifg=#767676 guibg=#2f1f1a guisp=NONE gui=NONE ctermfg=243 ctermbg=52 cterm=NONE term=reverse
+hi DiffText guifg=NONE guibg=#0f4f4f guisp=NONE gui=NONE ctermfg=247 ctermbg=23 cterm=NONE term=reverse
+hi Directory guifg=#87afaf guibg=NONE guisp=NONE gui=bold ctermfg=109 ctermbg=NONE cterm=bold term=NONE
+hi EndOfBuffer guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=#af5f5f guibg=#1c1c1c guisp=NONE gui=reverse ctermfg=131 ctermbg=234 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#af5f5f guibg=#1c1c1c guisp=NONE gui=reverse ctermfg=131 ctermbg=234 cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#9e9e9e guibg=#262626 guisp=NONE gui=NONE ctermfg=247 ctermbg=235 cterm=NONE term=NONE
+hi Identifier guifg=#87afaf guibg=NONE guisp=NONE gui=NONE ctermfg=109 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=NONE guibg=#5a4a45 guisp=NONE gui=NONE ctermfg=215 ctermbg=234 cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#ff00af guibg=NONE guisp=NONE gui=bold ctermfg=199 ctermbg=NONE cterm=bold term=bold,underline
+hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#5faf5f guibg=NONE guisp=NONE gui=NONE ctermfg=71 ctermbg=NONE cterm=NONE term=NONE
+hi NonText guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=NONE guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=reverse
+hi PmenuExtra guifg=#767676 guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=243 ctermbg=237 cterm=NONE term=NONE
+hi PmenuExtraSel guifg=#9e9e9e guibg=#585858 guisp=NONE gui=NONE ctermfg=247 ctermbg=240 cterm=NONE term=NONE
+hi PmenuKind guifg=#5f8787 guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=66 ctermbg=237 cterm=NONE term=NONE
+hi PmenuKindSel guifg=#5f8787 guibg=#585858 guisp=NONE gui=NONE ctermfg=66 ctermbg=240 cterm=NONE term=NONE
+hi PmenuMatch guifg=#ffaf5f guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=215 ctermbg=237 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ffaf5f guibg=#585858 guisp=NONE gui=NONE ctermfg=215 ctermbg=240 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi PmenuSel guifg=NONE guibg=#585858 guisp=NONE gui=NONE ctermfg=NONE ctermbg=240 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#767676 guisp=NONE gui=NONE ctermfg=NONE ctermbg=243 cterm=NONE term=NONE
+hi PreProc guifg=#af875f guibg=NONE guisp=NONE gui=NONE ctermfg=137 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#d7af87 guibg=NONE guisp=NONE gui=NONE ctermfg=180 ctermbg=NONE cterm=NONE term=standout
+hi QuickFixLine guifg=#1c1c1c guibg=#5f87af guisp=NONE gui=NONE ctermfg=234 ctermbg=67 cterm=NONE term=NONE
+hi Removed guifg=#d75f5f guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE term=NONE
+hi Search guifg=NONE guibg=#374a44 guisp=NONE gui=NONE ctermfg=114 ctermbg=234 cterm=reverse term=reverse
+hi SignColumn guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#5f8787 guibg=NONE guisp=NONE gui=NONE ctermfg=66 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=NONE guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=167 ctermbg=NONE cterm=underline term=underline ctermul=167
+hi SpellCap guifg=NONE guibg=NONE guisp=#ffaf5f gui=undercurl ctermfg=215 ctermbg=NONE cterm=underline term=underline ctermul=215
+hi SpellLocal guifg=NONE guibg=NONE guisp=#5fd75f gui=undercurl ctermfg=77 ctermbg=NONE cterm=underline term=underline ctermul=77
+hi SpellRare guifg=NONE guibg=NONE guisp=#d787d7 gui=undercurl ctermfg=176 ctermbg=NONE cterm=underline term=underline ctermul=176
+hi Statement guifg=#af87af guibg=NONE guisp=NONE gui=NONE ctermfg=139 ctermbg=NONE cterm=NONE term=NONE
+hi StatusLine guifg=#1c1c1c guibg=#9e9e9e guisp=NONE gui=NONE ctermfg=234 ctermbg=247 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#1c1c1c guibg=#767676 guisp=NONE gui=NONE ctermfg=234 ctermbg=243 cterm=NONE term=bold,underline
+hi String guifg=#5faf5f guibg=NONE guisp=NONE gui=NONE ctermfg=71 ctermbg=NONE cterm=NONE term=NONE
+hi TabLine guifg=#1c1c1c guibg=#767676 guisp=NONE gui=NONE ctermfg=234 ctermbg=243 cterm=NONE term=bold,underline
+hi TabLineFill guifg=#1c1c1c guibg=#767676 guisp=NONE gui=NONE ctermfg=234 ctermbg=243 cterm=NONE term=NONE
+hi TabLineSel guifg=#1c1c1c guibg=#9e9e9e guisp=NONE gui=bold ctermfg=234 ctermbg=247 cterm=bold term=bold,reverse
+hi Title guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#dadada guibg=NONE guisp=NONE gui=bold ctermfg=253 ctermbg=NONE cterm=bold term=bold,reverse
+hi ToolbarButton guifg=#767676 guibg=#1c1c1c guisp=NONE gui=bold,reverse ctermfg=243 ctermbg=234 cterm=bold,reverse term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#5f87af guibg=NONE guisp=NONE gui=NONE ctermfg=67 ctermbg=NONE cterm=NONE term=NONE
+hi Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#767676 guibg=#767676 guisp=NONE gui=NONE ctermfg=243 ctermbg=243 cterm=NONE term=NONE
+hi Visual guifg=NONE guibg=#1a3456 guisp=NONE gui=NONE ctermfg=109 ctermbg=234 cterm=reverse term=reverse
+hi VisualNOS guifg=#1c1c1c guibg=#5f8787 guisp=NONE gui=NONE ctermfg=234 ctermbg=66 cterm=NONE term=NONE
+hi WarningMsg guifg=#d75f87 guibg=NONE guisp=NONE gui=NONE ctermfg=168 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#1c1c1c guibg=#d7af87 guisp=NONE gui=bold ctermfg=234 ctermbg=180 cterm=bold term=bold
+hi debugBreakpoint guifg=#1c1c1c guibg=#d75f87 guisp=NONE gui=NONE ctermfg=234 ctermbg=168 cterm=NONE term=NONE
+hi debugPC guifg=#1c1c1c guibg=#5f87af guisp=NONE gui=NONE ctermfg=234 ctermbg=67 cterm=NONE term=NONE
+hi lCursor guifg=#1c1c1c guibg=#5fff00 guisp=NONE gui=NONE ctermfg=234 ctermbg=82 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
+  if s:tgc
+    hi IncSearch cterm=NONE
+    hi Search cterm=NONE
+    hi Visual cterm=NONE
+  endif
   finish
 endif
 
 if s:t_Co >= 16
-  hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi Statusline ctermfg=black ctermbg=gray cterm=NONE
-  hi StatuslineNC ctermfg=black ctermbg=darkgray cterm=NONE
-  hi VertSplit ctermfg=darkgray ctermbg=darkgray cterm=NONE
+  hi Normal ctermfg=gray ctermbg=black cterm=NONE
+  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=white cterm=NONE
+  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi DiffChange ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+  hi DiffText ctermfg=darkblue ctermbg=black cterm=reverse
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=black cterm=reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
+  hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=gray ctermbg=NONE cterm=underline
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuMatch ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuMatchSel ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Question ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkblue cterm=NONE
+  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Search ctermfg=green ctermbg=black cterm=reverse
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline ctermul=darkred
+  hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=underline ctermul=darkyellow
+  hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline ctermul=darkgreen
+  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline ctermul=magenta
+  hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=black ctermbg=gray cterm=NONE
+  hi StatusLineNC ctermfg=black ctermbg=darkgray cterm=NONE
+  hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi TabLine ctermfg=black ctermbg=darkgray cterm=NONE
   hi TabLineFill ctermfg=black ctermbg=darkgray cterm=NONE
   hi TabLineSel ctermfg=black ctermbg=gray cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Todo ctermfg=white ctermbg=NONE cterm=bold
   hi ToolbarButton ctermfg=darkgray ctermbg=black cterm=bold,reverse
-  hi QuickFixLine ctermfg=black ctermbg=darkblue cterm=NONE
-  hi CursorLineNr ctermfg=white ctermbg=NONE cterm=bold
-  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi LineNrAbove ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi LineNrBelow ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=darkgray ctermbg=darkgray cterm=NONE
   hi Visual ctermfg=cyan ctermbg=black cterm=reverse
   hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
-  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
-  hi PmenuExtra ctermfg=darkgray ctermbg=gray cterm=NONE
-  hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=gray cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Error ctermfg=darkred ctermbg=black cterm=reverse
-  hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Question ctermfg=yellow ctermbg=NONE cterm=NONE
   hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=white ctermbg=NONE cterm=bold
-  hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
-  hi Search ctermfg=blue ctermbg=black cterm=reverse
-  hi IncSearch ctermfg=red ctermbg=black cterm=reverse
-  hi CurSearch ctermfg=red ctermbg=black cterm=reverse
   hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
-  hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE
   hi debugBreakpoint ctermfg=black ctermbg=red cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
-  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=red ctermbg=NONE cterm=NONE
-  hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Character ctermfg=green ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi DiffChange ctermfg=darkblue ctermbg=NONE cterm=reverse
-  hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse
-  hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse
-  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
-  unlet s:t_Co
+  hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE
+  hi lCursor ctermfg=black ctermbg=green cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=gray ctermbg=black cterm=NONE
-  hi Statusline ctermfg=gray ctermbg=black cterm=bold,reverse
-  hi StatuslineNC ctermfg=gray ctermbg=black cterm=reverse
-  hi VertSplit ctermfg=gray ctermbg=gray cterm=NONE
+  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=white cterm=NONE
+  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi DiffChange ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+  hi DiffText ctermfg=darkblue ctermbg=black cterm=reverse
+  hi Directory ctermfg=NONE ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=black cterm=reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=gray ctermbg=NONE cterm=underline
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuMatch ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuMatchSel ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkblue cterm=NONE
+  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
+  hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=gray cterm=NONE
+  hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi TabLine ctermfg=black ctermbg=gray cterm=NONE
   hi TabLineFill ctermfg=gray ctermbg=gray cterm=NONE
   hi TabLineSel ctermfg=black ctermbg=gray cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=gray ctermbg=black cterm=reverse
-  hi QuickFixLine ctermfg=black ctermbg=darkblue cterm=NONE
-  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi LineNr ctermfg=gray ctermbg=NONE cterm=bold
-  hi LineNrAbove ctermfg=gray ctermbg=NONE cterm=bold
-  hi LineNrBelow ctermfg=gray ctermbg=NONE cterm=bold
-  hi NonText ctermfg=gray ctermbg=NONE cterm=bold
-  hi EndOfBuffer ctermfg=gray ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold
-  hi FoldColumn ctermfg=gray ctermbg=NONE cterm=bold
-  hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
-  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
-  hi PmenuExtra ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=gray cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse
-  hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=gray ctermbg=NONE cterm=bold
-  hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
-  hi Search ctermfg=black ctermbg=darkblue cterm=NONE
-  hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE
-  hi debugBreakpoint ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi SpellBad ctermfg=darkred ctermbg=gray cterm=reverse
-  hi SpellCap ctermfg=darkblue ctermbg=gray cterm=reverse
-  hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse
-  hi SpellRare ctermfg=darkmagenta ctermbg=gray cterm=reverse
-  hi Comment ctermfg=gray ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
   hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi DiffChange ctermfg=darkblue ctermbg=NONE cterm=reverse
-  hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse
-  hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse
-  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=white ctermbg=NONE cterm=bold
+  hi ToolbarButton ctermfg=gray ctermbg=black cterm=reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=gray ctermbg=gray cterm=NONE
+  hi Visual ctermfg=darkcyan ctermbg=black cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+  hi lCursor ctermfg=black ctermbg=green cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: color00          #1c1c1c        234            black
-" Color: color08          #767676        243            darkgray
-" Color: color01          #af5f5f        131            darkred
-" Color: color09          #d75f87        168            red
-" Color: color02          #5faf5f        71             darkgreen
-" Color: color10          #87d787        114            green
-" Color: color03          #af875f        137            darkyellow
-" Color: color11          #d7af87        180            yellow
-" Color: color04          #5f87af        67             darkblue
-" Color: color12          #5fafd7        74             blue
-" Color: color05          #af87af        139            darkmagenta
-" Color: color13          #d787d7        176            magenta
-" Color: color06          #5f8787        66             darkcyan
-" Color: color14          #87afaf        109            cyan
-" Color: color07          #9e9e9e        247            gray
-" Color: color15          #bcbcbc        250            white
-" Color: colorLine        #303030        236            darkgrey
-" Color: colorB           #3a3a3a        237            darkgrey
-" Color: colorF           #262626        235            darkgrey
-" Color: colorNonT        #585858        240            darkgrey
-" Color: colorC           #ffaf5f        215            red
-" Color: colorlC          #5fff00        82             green
-" Color: colorV           #1f3f5f        109            cyan
-" Color: colorMP          #ff00af        199            magenta
-" Color: diffAdd          #5faf5f        71             darkgreen
-" Color: diffDelete       #af5f5f        131            darkred
-" Color: diffChange       #5f87af        67             darkblue
-" Color: diffText         #af87af        139            darkmagenta
-" Color: black            #000000        16             black
-" Color: white            #dadada        253            white
-" Color: Added            #5fd75f        77             darkgreen
-" Color: Changed          #ffaf5f        215            darkyellow
-" Color: Removed          #d75f5f        167            darkred
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
 " vim: et ts=8 sw=2 sts=2

runtime/colors/industry.vim

@@ -2,422 +2,253 @@
 " Description:  "industry" stands for 'industrial' color scheme.
 " Author:       Original author Shian Lee.
 " Maintainer:   Original maintainer Shian Lee.
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'industry'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#303030', '#870000', '#5fd75f', '#afaf00', '#87afff', '#af00af', '#00afaf', '#6c6c6c', '#444444', '#ff0000', '#00ff00', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#303030', '#870000', '#5fd75f', '#afaf00', '#87afff', '#af00af', '#00afaf', '#6c6c6c', '#444444', '#ff0000', '#00ff00', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi Normal guifg=#dadada guibg=#000000 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#444444 guibg=#000000 gui=NONE cterm=NONE
-hi StatusLine guifg=#000000 guibg=#dadada gui=bold cterm=bold
-hi StatusLineNC guifg=#000000 guibg=#6c6c6c gui=NONE cterm=NONE
-hi StatusLineTerm guifg=#000000 guibg=#00ff00 gui=bold cterm=bold
-hi StatusLineTermNC guifg=#000000 guibg=#5fd75f gui=NONE cterm=NONE
-hi VertSplit guifg=#000000 guibg=#6c6c6c gui=NONE cterm=NONE
-hi Pmenu guifg=#dadada guibg=#444444 gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#000000 gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#6c6c6c gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ff00ff guibg=#444444 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff00ff guibg=#ffff00 gui=NONE cterm=NONE
-hi TabLine guifg=#dadada guibg=#444444 gui=NONE cterm=NONE
-hi TabLineFill guifg=NONE guibg=#6c6c6c gui=NONE cterm=NONE
-hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold cterm=bold
-hi ToolbarButton guifg=#dadada guibg=#6c6c6c gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-hi NonText guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#00afaf guibg=#303030 gui=NONE cterm=NONE
-hi Visual guifg=#dadada guibg=#6c6c6c gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#6c6c6c gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#6c6c6c gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=bold
-hi ColorColumn guifg=NONE guibg=#444444 gui=NONE cterm=NONE
-hi QuickFixLine guifg=#000000 guibg=#ff00ff gui=NONE cterm=NONE
-hi VisualNOS guifg=#dadada guibg=#6c6c6c gui=NONE cterm=NONE
-hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi SignColumn guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#87afff guibg=NONE gui=underline cterm=underline
-hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi ErrorMsg guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi ModeMsg guifg=#ffffff guibg=NONE gui=bold cterm=bold
-hi WarningMsg guifg=#ff0000 guibg=NONE gui=bold cterm=bold
-hi MoreMsg guifg=#5fd75f guibg=NONE gui=bold cterm=bold
-hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#005fff guibg=#ffff00 gui=NONE cterm=NONE
-hi MatchParen guifg=#303030 guibg=#afaf00 gui=NONE cterm=NONE
-hi Search guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi IncSearch guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
-hi lCursor guifg=#000000 guibg=#ff0000 gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#005fff guibg=NONE guisp=#005fff gui=undercurl cterm=underline
-hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi SpellRare guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl cterm=underline
-hi Comment guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
-hi Function guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffffff guibg=NONE gui=bold cterm=bold
-hi Constant guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#00ff00 guibg=NONE gui=bold cterm=bold
-hi Special guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi Delimiter guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi Conceal guifg=#6c6c6c guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
-hi! link Terminal Normal
-hi! link PopupSelected PmenuSel
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link Float Number
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
+hi! link Number Constant
 hi! link PopupNotification Todo
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link TabPanel Normal
+hi! link TabPanelFill Normal
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi Normal ctermfg=253 ctermbg=16 cterm=NONE
-  hi EndOfBuffer ctermfg=238 ctermbg=16 cterm=NONE
-  hi StatusLine ctermfg=16 ctermbg=253 cterm=bold
-  hi StatusLineNC ctermfg=16 ctermbg=242 cterm=NONE
-  hi StatusLineTerm ctermfg=16 ctermbg=46 cterm=bold
-  hi StatusLineTermNC ctermfg=16 ctermbg=77 cterm=NONE
-  hi VertSplit ctermfg=16 ctermbg=242 cterm=NONE
-  hi Pmenu ctermfg=253 ctermbg=238 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=16 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=242 cterm=NONE
-  hi PmenuMatch ctermfg=201 ctermbg=238 cterm=NONE
-  hi PmenuMatchSel ctermfg=201 ctermbg=226 cterm=NONE
-  hi TabLine ctermfg=253 ctermbg=238 cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=242 cterm=NONE
-  hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold
-  hi ToolbarButton ctermfg=253 ctermbg=242 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=236 cterm=NONE
-  hi NonText ctermfg=37 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=37 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=37 ctermbg=236 cterm=NONE
-  hi Visual ctermfg=253 ctermbg=242 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=242 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=242 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
-  hi ColorColumn ctermfg=NONE ctermbg=238 cterm=NONE
-  hi QuickFixLine ctermfg=16 ctermbg=201 cterm=NONE
-  hi VisualNOS ctermfg=253 ctermbg=242 cterm=NONE
-  hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=37 ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=37 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi Error ctermfg=231 ctermbg=196 cterm=NONE
-  hi ErrorMsg ctermfg=231 ctermbg=196 cterm=NONE
-  hi ModeMsg ctermfg=231 ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=77 ctermbg=NONE cterm=bold
-  hi Question ctermfg=46 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=27 ctermbg=226 cterm=NONE
-  hi MatchParen ctermfg=236 ctermbg=142 cterm=NONE
-  hi Search ctermfg=16 ctermbg=226 cterm=NONE
-  hi IncSearch ctermfg=16 ctermbg=46 cterm=NONE
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=253 cterm=NONE
-  hi lCursor ctermfg=16 ctermbg=196 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=27 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=201 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=46 ctermbg=NONE cterm=underline
-  hi Comment ctermfg=37 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Function ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=231 ctermbg=NONE cterm=bold
-  hi Constant ctermfg=51 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=226 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=46 ctermbg=NONE cterm=bold
-  hi Special ctermfg=196 ctermbg=NONE cterm=NONE
-  hi Delimiter ctermfg=226 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=242 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=bold
-  hi! link Terminal Normal
-  hi! link PopupSelected PmenuSel
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#dadada guibg=#000000 guisp=NONE gui=NONE ctermfg=253 ctermbg=16 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#444444 guisp=NONE gui=NONE ctermfg=NONE ctermbg=238 cterm=NONE term=reverse
+hi Comment guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#6c6c6c guibg=NONE guisp=NONE gui=NONE ctermfg=242 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#dadada guisp=NONE gui=NONE ctermfg=16 ctermbg=253 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=NONE ctermbg=242 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=NONE ctermbg=242 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=bold ctermfg=226 ctermbg=NONE cterm=bold term=bold
+hi Delimiter guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi EndOfBuffer guifg=#444444 guibg=#000000 guisp=NONE gui=NONE ctermfg=238 ctermbg=16 cterm=NONE term=NONE
+hi Error guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 cterm=NONE term=bold,reverse
+hi ErrorMsg guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 cterm=NONE term=bold,reverse
+hi FoldColumn guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00afaf guibg=#303030 guisp=NONE gui=NONE ctermfg=37 ctermbg=236 cterm=NONE term=NONE
+hi Function guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=NONE
+hi Identifier guifg=#ff00ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#000000 guibg=#00ff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=46 cterm=NONE term=bold,reverse,underline
+hi LineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#303030 guibg=#afaf00 guisp=NONE gui=NONE ctermfg=236 ctermbg=142 cterm=NONE term=bold,underline
+hi ModeMsg guifg=#ffffff guibg=NONE guisp=NONE gui=bold ctermfg=231 ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#5fd75f guibg=NONE guisp=NONE gui=bold ctermfg=77 ctermbg=NONE cterm=bold term=NONE
+hi NonText guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#dadada guibg=#444444 guisp=NONE gui=NONE ctermfg=253 ctermbg=238 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ff00ff guibg=#444444 guisp=NONE gui=NONE ctermfg=201 ctermbg=238 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#ffff00 guisp=NONE gui=NONE ctermfg=201 ctermbg=226 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=NONE ctermbg=242 cterm=NONE term=NONE
+hi PreProc guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#00ff00 guibg=NONE guisp=NONE gui=bold ctermfg=46 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#000000 guibg=#ff00ff guisp=NONE gui=NONE ctermfg=16 ctermbg=201 cterm=NONE term=NONE
+hi Search guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=reverse
+hi SignColumn guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#005fff guibg=NONE guisp=#005fff gui=undercurl ctermfg=27 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=201 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#00ff00 guibg=NONE guisp=#00ff00 gui=undercurl ctermfg=46 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#ffffff guibg=NONE guisp=NONE gui=bold ctermfg=231 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#000000 guibg=#dadada guisp=NONE gui=bold ctermfg=16 ctermbg=253 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#000000 guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=16 ctermbg=242 cterm=NONE term=bold,underline
+hi StatusLineTerm guifg=#000000 guibg=#00ff00 guisp=NONE gui=bold ctermfg=16 ctermbg=46 cterm=bold term=bold,reverse
+hi StatusLineTermNC guifg=#000000 guibg=#5fd75f guisp=NONE gui=NONE ctermfg=16 ctermbg=77 cterm=NONE term=bold,underline
+hi TabLine guifg=#dadada guibg=#444444 guisp=NONE gui=NONE ctermfg=253 ctermbg=238 cterm=NONE term=bold,underline
+hi TabLineFill guifg=NONE guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=NONE ctermbg=242 cterm=NONE term=NONE
+hi TabLineSel guifg=#ffffff guibg=#000000 guisp=NONE gui=bold ctermfg=231 ctermbg=16 cterm=bold term=bold,reverse
+hi Title guifg=#ff00ff guibg=NONE guisp=NONE gui=bold ctermfg=201 ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#005fff guibg=#ffff00 guisp=NONE gui=NONE ctermfg=27 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=reverse
+hi Type guifg=#00ff00 guibg=NONE guisp=NONE gui=bold ctermfg=46 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#87afff guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#000000 guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=16 ctermbg=242 cterm=NONE term=NONE
+hi Visual guifg=#dadada guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=253 ctermbg=242 cterm=NONE term=reverse
+hi VisualNOS guifg=#dadada guibg=#6c6c6c guisp=NONE gui=NONE ctermfg=253 ctermbg=242 cterm=NONE term=NONE
+hi WarningMsg guifg=#ff0000 guibg=NONE guisp=NONE gui=bold ctermfg=196 ctermbg=NONE cterm=bold term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
+hi lCursor guifg=#000000 guibg=#ff0000 guisp=NONE gui=NONE ctermfg=16 ctermbg=196 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=darkgrey ctermbg=black cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=white cterm=bold
-  hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineTerm ctermfg=black ctermbg=green cterm=bold
-  hi StatusLineTermNC ctermfg=black ctermbg=darkgreen cterm=NONE
-  hi VertSplit ctermfg=black ctermbg=grey cterm=NONE
-  hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
-  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
-  hi TabLine ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
-  hi TabLineSel ctermfg=white ctermbg=black cterm=bold
-  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
-  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=black ctermbg=grey cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
   hi ColorColumn ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
-  hi VisualNOS ctermfg=white ctermbg=grey cterm=NONE
-  hi LineNr ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=white cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
+  hi Delimiter ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=darkgrey ctermbg=black cterm=NONE
   hi Error ctermfg=white ctermbg=red cterm=NONE
   hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
-  hi ModeMsg ctermfg=white ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=red ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Question ctermfg=green ctermbg=NONE cterm=bold
-  hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Search ctermfg=black ctermbg=yellow cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Function ctermfg=green ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=black ctermbg=green cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
-  hi Cursor ctermfg=black ctermbg=white cterm=NONE
-  hi lCursor ctermfg=black ctermbg=red cterm=NONE
+  hi LineNr ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ModeMsg ctermfg=white ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PreProc ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi Question ctermfg=green ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
+  hi Search ctermfg=black ctermbg=yellow cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=red ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=blue ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=magenta ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=green ctermbg=NONE cterm=underline
-  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Function ctermfg=green ctermbg=NONE cterm=NONE
   hi Statement ctermfg=white ctermbg=NONE cterm=bold
-  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Type ctermfg=green ctermbg=NONE cterm=bold
-  hi Special ctermfg=red ctermbg=NONE cterm=NONE
-  hi Delimiter ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=black ctermbg=white cterm=bold
+  hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
+  hi StatusLineTerm ctermfg=black ctermbg=green cterm=bold
+  hi StatusLineTermNC ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi TabLine ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLineSel ctermfg=white ctermbg=black cterm=bold
   hi Title ctermfg=magenta ctermbg=NONE cterm=bold
-  hi! link Terminal Normal
-  hi! link PopupSelected PmenuSel
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
+  hi ToolbarLine ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi Type ctermfg=green ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=black ctermbg=grey cterm=NONE
+  hi Visual ctermfg=black ctermbg=grey cterm=NONE
+  hi VisualNOS ctermfg=white ctermbg=grey cterm=NONE
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=bold
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+  hi lCursor ctermfg=black ctermbg=red cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=grey ctermbg=black cterm=bold
-  hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
-  hi StatusLineTerm ctermfg=darkgreen ctermbg=black cterm=bold,reverse
-  hi StatusLineTermNC ctermfg=darkgreen ctermbg=black cterm=reverse
-  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
-  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
-  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
-  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
-  hi VisualNOS ctermfg=black ctermbg=grey cterm=NONE
-  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=white cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Delimiter ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=grey ctermbg=black cterm=bold
   hi Error ctermfg=grey ctermbg=darkred cterm=NONE
   hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
-  hi ModeMsg ctermfg=grey ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Question ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Function ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ModeMsg ctermfg=grey ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkblue ctermbg=darkyellow cterm=reverse
   hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
   hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi Comment ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Function ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Statement ctermfg=grey ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Delimiter ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
+  hi StatusLineTerm ctermfg=darkgreen ctermbg=black cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=black ctermbg=grey cterm=NONE
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi lCursor ctermfg=black ctermbg=red cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Number term=NONE
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: foreground  #dadada        253            white
-" Color: background  #000000        16             black
-" Color: color00     #303030        236            black
-" Color: color08     #444444        238            darkgrey
-" Color: color01     #870000        88             darkred
-" Color: color09     #FF0000        196            red
-" Color: color02     #5FD75F        77             darkgreen
-" Color: color10     #00FF00        46             green
-" Color: color03     #AFAF00        142            darkyellow
-" Color: color11     #FFFF00        226            yellow
-" Color: color04     #87AFFF        111            darkblue
-" Color: color12     #005FFF        27             blue
-" Color: color05     #AF00AF        127            darkmagenta
-" Color: color13     #FF00FF        201            magenta
-" Color: color06     #00AFAF        37             darkcyan
-" Color: color14     #00FFFF        51             cyan
-" Color: color07     #6C6C6C        242            grey
-" Color: color15     #FFFFFF        231            white
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/koehler.vim

@@ -1,39 +1,45 @@
 " Name:         koehler
 " Author:       original author Ron Aaron <ron@ronware.org>
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
-" Website:      https://www.github.com/vim/colorschemes
+" URL:          https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2024 Aug 15
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'koehler'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 
-hi! link Terminal Normal
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Statement
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
 hi! link Debug Special
 hi! link Define PreProc
 hi! link Delimiter Special
 hi! link Exception Statement
 hi! link Float Number
 hi! link Function Identifier
-hi! link Include PreProc
 hi! link IncSearch Visual
+hi! link Include PreProc
 hi! link Keyword Statement
 hi! link Label Statement
 hi! link LineNrAbove LineNr
 hi! link LineNrBelow LineNr
 hi! link Macro PreProc
+hi! link MessageWindow Pmenu
 hi! link Number Constant
 hi! link Operator Statement
-hi! link PopupSelected PmenuSel
+hi! link PopupNotification Todo
 hi! link PreCondit PreProc
 hi! link Repeat Statement
 hi! link SpecialChar Special
@@ -43,392 +49,221 @@ hi! link StatusLineTermNC StatusLineNC
 hi! link StorageClass Type
 hi! link String Constant
 hi! link Structure Type
+hi! link TabPanel Normal
+hi! link TabPanelFill Normal
 hi! link Tag Special
+hi! link Terminal Normal
 hi! link Typedef Type
 hi! link lCursor Cursor
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi Normal guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#8b0000 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#555555 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#555555 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=bold
-hi Folded guifg=#00cdcd guibg=#666666 gui=NONE cterm=NONE
-hi QuickFixLine guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
-hi Directory guifg=#cc8000 guibg=NONE gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#cd0000 guibg=NONE gui=bold cterm=bold
-hi ErrorMsg guifg=#cd0000 guibg=#ffffff gui=reverse cterm=reverse
-hi FoldColumn guifg=#00cdcd guibg=NONE gui=NONE cterm=NONE
-hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=NONE guibg=#0000ff gui=NONE cterm=NONE
-hi ModeMsg guifg=#ffffff guibg=#0000ff gui=bold cterm=bold
-hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
-hi NonText guifg=#cd0000 guibg=NONE gui=bold cterm=bold
-hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ff00ff guibg=#444444 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff0000 guibg=#00cdcd gui=NONE cterm=NONE
-hi Question guifg=#5c5cff guibg=NONE gui=bold cterm=bold
-hi Search guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#cd0000 guibg=NONE gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#60ff60 guibg=NONE guisp=#60ff60 gui=undercurl cterm=underline
-hi SpellLocal guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl cterm=underline
-hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi StatusLine guifg=#0000ff guibg=#ffffff gui=bold cterm=bold
-hi StatusLineNC guifg=#0000ff guibg=#e5e5e5 gui=NONE cterm=NONE
-hi TabLine guifg=#0000ff guibg=#ffffff gui=bold cterm=bold
-hi TabLineFill guifg=#0000ff guibg=#ffffff gui=bold cterm=bold
-hi TabLineSel guifg=#ffffff guibg=#0000ff gui=bold cterm=bold
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
-hi VertSplit guifg=#0000ff guibg=#e5e5e5 gui=NONE cterm=NONE
-hi Visual guifg=NONE guibg=#666666 gui=reverse cterm=reverse
-hi VisualNOS guifg=NONE guibg=#000000 gui=bold,underline cterm=underline
-hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
-hi Error guifg=#cd0000 guibg=#ffffff gui=reverse cterm=reverse
-hi Identifier guifg=#40ffff guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#000000 guibg=#000000 gui=NONE cterm=NONE
-hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffff60 guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#0000ff guibg=#ffff00 gui=NONE cterm=NONE
-hi Type guifg=#60ff60 guibg=NONE gui=bold cterm=bold
-hi Underlined guifg=#add8e6 guibg=NONE gui=bold,underline cterm=underline
-hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=bold
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi Normal guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#8b0000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=88 cterm=NONE term=reverse
+hi Comment guifg=#80a0ff guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=59 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ffa0a0 guibg=NONE guisp=NONE gui=NONE ctermfg=217 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#00ff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=46 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#555555 guisp=NONE gui=NONE ctermfg=NONE ctermbg=240 cterm=NONE term=NONE
+hi CursorIM guifg=NONE guibg=fg guisp=NONE gui=NONE ctermfg=NONE ctermbg=fg cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#555555 guisp=NONE gui=NONE ctermfg=NONE ctermbg=240 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=bold ctermfg=226 ctermbg=NONE cterm=bold term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#cc8000 guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=NONE
+hi EndOfBuffer guifg=#cd0000 guibg=NONE guisp=NONE gui=bold ctermfg=160 ctermbg=NONE cterm=bold term=NONE
+hi Error guifg=#cd0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=160 ctermbg=231 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#cd0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=160 ctermbg=231 cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#00cdcd guibg=NONE guisp=NONE gui=NONE ctermfg=44 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00cdcd guibg=#666666 guisp=NONE gui=NONE ctermfg=44 ctermbg=59 cterm=NONE term=NONE
+hi Identifier guifg=#40ffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#000000 guibg=#000000 guisp=NONE gui=NONE ctermfg=16 ctermbg=16 cterm=NONE term=NONE
+hi LineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=NONE guibg=#0000ff guisp=NONE gui=NONE ctermfg=NONE ctermbg=21 cterm=NONE term=bold,underline
+hi ModeMsg guifg=#ffffff guibg=#0000ff guisp=NONE gui=bold ctermfg=231 ctermbg=21 cterm=bold term=bold
+hi MoreMsg guifg=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=bold term=NONE
+hi NonText guifg=#cd0000 guibg=NONE guisp=NONE gui=bold ctermfg=160 ctermbg=NONE cterm=bold term=NONE
+hi Pmenu guifg=#ffffff guibg=#444444 guisp=NONE gui=NONE ctermfg=231 ctermbg=238 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ff00ff guibg=#444444 guisp=NONE gui=NONE ctermfg=201 ctermbg=238 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff0000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=196 ctermbg=44 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=NONE
+hi PreProc guifg=#ff80ff guibg=NONE guisp=NONE gui=NONE ctermfg=213 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#5c5cff guibg=NONE guisp=NONE gui=bold ctermfg=63 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=NONE
+hi Search guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 cterm=NONE term=reverse
+hi SignColumn guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ffa500 guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#cd0000 guibg=NONE guisp=NONE gui=NONE ctermfg=160 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#60ff60 guibg=NONE guisp=#60ff60 gui=undercurl ctermfg=83 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl ctermfg=51 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=201 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#ffff60 guibg=NONE guisp=NONE gui=bold ctermfg=227 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#0000ff guibg=#ffffff guisp=NONE gui=bold ctermfg=21 ctermbg=231 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#0000ff guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=21 ctermbg=254 cterm=NONE term=bold,underline
+hi TabLine guifg=#0000ff guibg=#ffffff guisp=NONE gui=bold ctermfg=21 ctermbg=231 cterm=bold term=bold,underline
+hi TabLineFill guifg=#0000ff guibg=#ffffff guisp=NONE gui=bold ctermfg=21 ctermbg=231 cterm=bold term=NONE
+hi TabLineSel guifg=#ffffff guibg=#0000ff guisp=NONE gui=bold ctermfg=231 ctermbg=21 cterm=bold term=bold,reverse
+hi Title guifg=#ff00ff guibg=NONE guisp=NONE gui=bold ctermfg=201 ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#0000ff guibg=#ffff00 guisp=NONE gui=NONE ctermfg=21 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=#000000 guibg=#e5e5e5 guisp=NONE gui=bold ctermfg=16 ctermbg=254 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#60ff60 guibg=NONE guisp=NONE gui=bold ctermfg=83 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#add8e6 guibg=NONE guisp=NONE gui=bold,underline ctermfg=153 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#0000ff guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=21 ctermbg=254 cterm=NONE term=NONE
+hi Visual guifg=NONE guibg=#666666 guisp=NONE gui=reverse ctermfg=NONE ctermbg=59 cterm=reverse term=reverse
+hi VisualNOS guifg=NONE guibg=#000000 guisp=NONE gui=bold,underline ctermfg=NONE ctermbg=16 cterm=underline term=NONE
+hi WarningMsg guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
 
-if s:t_Co >= 256
-  hi Normal ctermfg=231 ctermbg=16 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=88 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=240 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=240 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
-  hi Folded ctermfg=44 ctermbg=59 cterm=NONE
-  hi QuickFixLine ctermfg=16 ctermbg=226 cterm=NONE
-  hi Conceal ctermfg=59 ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=46 cterm=NONE
-  hi Directory ctermfg=172 ctermbg=NONE cterm=NONE
-  hi EndOfBuffer ctermfg=160 ctermbg=NONE cterm=bold
-  hi ErrorMsg ctermfg=160 ctermbg=231 cterm=reverse
-  hi FoldColumn ctermfg=44 ctermbg=NONE cterm=NONE
-  hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=NONE ctermbg=21 cterm=NONE
-  hi ModeMsg ctermfg=231 ctermbg=21 cterm=bold
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=bold
-  hi NonText ctermfg=160 ctermbg=NONE cterm=bold
-  hi Pmenu ctermfg=231 ctermbg=238 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=44 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi PmenuMatch ctermfg=201 ctermbg=238 cterm=NONE
-  hi PmenuMatchSel ctermfg=196 ctermbg=44 cterm=NONE
-  hi Question ctermfg=63 ctermbg=NONE cterm=bold
-  hi Search ctermfg=231 ctermbg=196 cterm=NONE
-  hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=160 ctermbg=NONE cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=83 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=51 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=21 ctermbg=231 cterm=bold
-  hi StatusLineNC ctermfg=21 ctermbg=254 cterm=NONE
-  hi TabLine ctermfg=21 ctermbg=231 cterm=bold
-  hi TabLineFill ctermfg=21 ctermbg=231 cterm=bold
-  hi TabLineSel ctermfg=231 ctermbg=21 cterm=bold
-  hi Title ctermfg=201 ctermbg=NONE cterm=bold
-  hi VertSplit ctermfg=21 ctermbg=254 cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=59 cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=16 cterm=underline
-  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
-  hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
-  hi Error ctermfg=160 ctermbg=231 cterm=reverse
-  hi Identifier ctermfg=87 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=16 ctermbg=16 cterm=NONE
-  hi PreProc ctermfg=213 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=214 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=227 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=21 ctermbg=226 cterm=NONE
-  hi Type ctermfg=83 ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=153 ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=bold
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=white ctermbg=black cterm=NONE
   hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
-  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE
+  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=green cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
   hi Directory ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Error ctermfg=darkred ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=darkred ctermbg=white cterm=reverse
   hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=black cterm=NONE
   hi LineNr ctermfg=yellow ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=darkblue cterm=NONE
   hi ModeMsg ctermfg=white ctermbg=darkblue cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
   hi NonText ctermfg=darkred ctermbg=NONE cterm=bold
   hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
-  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=blue ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE
   hi Search ctermfg=white ctermbg=red cterm=NONE
   hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkred ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=cyan ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=yellow ctermbg=NONE cterm=bold
   hi StatusLine ctermfg=darkblue ctermbg=white cterm=bold
   hi StatusLineNC ctermfg=darkblue ctermbg=grey cterm=NONE
   hi TabLine ctermfg=darkblue ctermbg=white cterm=bold
   hi TabLineFill ctermfg=darkblue ctermbg=white cterm=bold
   hi TabLineSel ctermfg=white ctermbg=darkblue cterm=bold
   hi Title ctermfg=magenta ctermbg=NONE cterm=bold
+  hi Todo ctermfg=darkblue ctermbg=yellow cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=green ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=darkblue ctermbg=grey cterm=NONE
   hi Visual ctermfg=NONE ctermbg=darkgrey cterm=reverse
   hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
   hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
-  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Error ctermfg=darkred ctermbg=white cterm=reverse
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=black ctermbg=black cterm=NONE
-  hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=yellow ctermbg=NONE cterm=bold
-  hi Todo ctermfg=darkblue ctermbg=yellow cterm=NONE
-  hi Type ctermfg=green ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
   hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
-  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=green cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
   hi Directory ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Error ctermfg=darkred ctermbg=grey cterm=reverse
   hi ErrorMsg ctermfg=darkred ctermbg=grey cterm=bold,reverse
   hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=black cterm=NONE
   hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=darkblue cterm=NONE
   hi ModeMsg ctermfg=white ctermbg=darkblue cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
   hi NonText ctermfg=darkred ctermbg=NONE cterm=bold
   hi Pmenu ctermfg=grey ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=grey ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=grey cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkcyan cterm=NONE
-  hi PmenuMatch ctermfg=grey ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
   hi Search ctermfg=grey ctermbg=darkred cterm=NONE
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkred ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse
   hi SpellLocal ctermfg=darkcyan ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi StatusLine ctermfg=grey ctermbg=darkblue cterm=bold,reverse
   hi StatusLineNC ctermfg=grey ctermbg=darkblue cterm=reverse
   hi TabLine ctermfg=grey ctermbg=darkblue cterm=bold,reverse
   hi TabLineFill ctermfg=darkblue ctermbg=grey cterm=bold
   hi TabLineSel ctermfg=grey ctermbg=darkblue cterm=bold
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=darkblue ctermbg=grey cterm=NONE
   hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
   hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
   hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Error ctermfg=darkred ctermbg=grey cterm=reverse
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=black ctermbg=black cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: xterm0         #000000          16                black
-" Color: xterm1         #cd0000          160               darkred
-" Color: xterm2         #00cd00          40                darkgreen
-" Color: xterm3         #cdcd00          184               darkyellow
-" Color: xterm4         #0000ee          20                darkblue
-" Color: xterm5         #cd00cd          164               darkmagenta
-" Color: xterm6         #00cdcd          44                darkcyan
-" Color: xterm7         #e5e5e5          254               grey
-" Color: xterm8         #7f7f7f          102               darkgrey
-" Color: xterm9         #ff0000          196               red
-" Color: xterm10        #00ff00          46                green
-" Color: xterm11        #ffff00          226               yellow
-" Color: xterm12        #5c5cff          63                blue
-" Color: xterm13        #ff00ff          201               magenta
-" Color: xterm14        #00ffff          51                cyan
-" Color: xterm15        #ffffff          231               white
-" Color: Pmenu          #444444          238               darkgrey
-" Color: rgbGrey40      #666666          59                darkgrey
-" Color: rgbDarkGrey    #a9a9a9          145               grey
-" Color: rgbDarkBlue    #00008b          20                darkblue
-" Color: rgbDarkMagenta #8b008b          90                darkmagenta
-" Color: rgbBlue        #0000ff          21                darkblue
-" Color: rgbDarkCyan    #008b8b          44                darkcyan
-" Color: rgbSeaGreen    #2e8b57          29                darkgreen
-" Color: rgbGrey        #bebebe          250               grey
-" Color: StatusLineTerm #90ee90          120               darkgreen
-" Color: ToolbarLine    #7f7f7f          244               darkgrey
-" Color: Comment        #80a0ff          111               blue
-" Color: Constant       #ffa0a0          217               darkred
-" Color: Special        #ffa500          214               darkyellow
-" Color: Identifier     #40ffff          87                cyan
-" Color: Statement      #ffff60          227               yellow
-" Color: PreProc        #ff80ff          213               magenta
-" Color: Type           #60ff60          83                green
-" Color: koeDirectory   #cc8000          172               darkyellow
-" Color: koeCursorLine  #555555          240               black
-" Color: koeLightBlue   #ADD8E6          153               blue
-" Color: koeDarkRed     #8b0000          88                darkred
-" Term colors: xterm0 xterm1 xterm2 xterm3 xterm4 xterm5 xterm6 xterm7
-" Term colors: xterm8 xterm9 xterm10 xterm11 xterm12 xterm13
-" Term colors: xterm14 xterm15
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/morning.vim

@@ -2,412 +2,249 @@
 " Description:  Colorscheme with light grey background.
 " Author:       Original author Bram Moolenaar <Bram@vim.org>
 " Maintainer:   Original maintainer Bram Moolenaar <Bram@vim.org>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=light
 
 hi clear
 let g:colors_name = 'morning'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#e4e4e4', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#bcbcbc', '#0000ff', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#000000']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#e4e4e4', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#bcbcbc', '#0000ff', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#000000']
-endif
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
-hi! link StatuslineTerm Statusline
-hi! link StatuslineTermNC StatuslineNC
+hi! link Float Number
+hi! link Function Identifier
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
+hi! link Number Constant
 hi! link PopupNotification Todo
-hi! link PopupSelected PmenuSel
-hi Normal guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#0000ff guibg=#cccccc gui=bold cterm=bold
-hi Folded guifg=#00008b guibg=#d3d3d3 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#d3d3d3 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#d3d3d3 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#a52a2a guibg=NONE gui=bold cterm=bold
-hi QuickFixLine guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi StatusLine guifg=#eeeeee guibg=#000000 gui=bold cterm=bold
-hi StatusLineNC guifg=#bcbcbc guibg=#000000 gui=NONE cterm=NONE
-hi VertSplit guifg=#bcbcbc guibg=#000000 gui=NONE cterm=NONE
-hi Pmenu guifg=#000000 guibg=#b2b2b2 gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#000000 gui=NONE cterm=NONE
-hi PmenuMatch guifg=#a52a2a guibg=#b2b2b2 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#a52a2a guibg=#ffff00 gui=NONE cterm=NONE
-hi TabLine guifg=#000000 guibg=#bcbcbc gui=underline cterm=underline
-hi TabLineFill guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi TabLineSel guifg=#000000 guibg=#e4e4e4 gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=NONE guibg=#bcbcbc gui=bold cterm=bold
-hi NonText guifg=#0000ff guibg=#bcbcbc gui=bold cterm=bold
-hi SpecialKey guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=NONE guibg=#d0d0d0 gui=NONE cterm=NONE
-hi VisualNOS guifg=NONE guibg=#0000ff gui=NONE cterm=NONE
-hi LineNr guifg=#a52a2a guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#00008b guibg=NONE gui=NONE cterm=NONE
-hi SignColumn guifg=#00008b guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#6a5acd guibg=NONE gui=underline cterm=underline
-hi Error guifg=#ff0000 guibg=#e4e4e4 gui=reverse cterm=reverse
-hi ErrorMsg guifg=#ff0000 guibg=#e4e4e4 gui=reverse cterm=reverse
-hi WarningMsg guifg=#6a0dad guibg=NONE gui=bold cterm=bold
-hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
-hi ModeMsg guifg=#000000 guibg=NONE gui=bold cterm=bold
-hi Question guifg=#008787 guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi MatchParen guifg=#e4e4e4 guibg=#6a5acd gui=NONE cterm=NONE
-hi Search guifg=#e4e4e4 guibg=#6a0dad gui=NONE cterm=NONE
-hi IncSearch guifg=#2e8b57 guibg=NONE gui=reverse cterm=reverse
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold
-hi ColorColumn guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
-hi Cursor guifg=#e4e4e4 guibg=#2e8b57 gui=NONE cterm=NONE
-hi lCursor guifg=#e4e4e4 guibg=#a52a2a gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#00d700 guibg=NONE guisp=#00d700 gui=undercurl cterm=underline
-hi SpellLocal guifg=#a52a2a guibg=NONE guisp=#a52a2a gui=undercurl cterm=underline
-hi SpellRare guifg=#2e8b57 guibg=NONE guisp=#2e8b57 gui=undercurl cterm=underline
-hi Comment guifg=#0000ff guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ff00ff guibg=#eeeeee gui=NONE cterm=NONE
-hi Identifier guifg=#008787 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#a52a2a guibg=NONE gui=bold cterm=bold
-hi PreProc guifg=#6a0dad guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
-hi Special guifg=#6a5acd guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Directory guifg=#008787 guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#878787 guibg=NONE gui=NONE cterm=NONE
-hi Title guifg=#a52a2a guibg=NONE gui=bold cterm=bold
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link StatusLineTerm Statusline
+hi! link StatusLineTermNC StatuslineNC
+hi! link TabPanel Normal
+hi! link TabPanelFill EndOfBuffer
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link StatuslineTerm Statusline
-  hi! link StatuslineTermNC StatuslineNC
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi! link PopupSelected PmenuSel
-  hi Normal ctermfg=16 ctermbg=254 cterm=NONE
-  hi EndOfBuffer ctermfg=21 ctermbg=252 cterm=bold
-  hi Folded ctermfg=18 ctermbg=252 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=252 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=252 cterm=NONE
-  hi CursorLineNr ctermfg=124 ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=16 ctermbg=226 cterm=NONE
-  hi StatusLine ctermfg=255 ctermbg=16 cterm=bold
-  hi StatusLineNC ctermfg=250 ctermbg=16 cterm=NONE
-  hi VertSplit ctermfg=250 ctermbg=16 cterm=NONE
-  hi Pmenu ctermfg=16 ctermbg=249 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=254 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=16 cterm=NONE
-  hi PmenuMatch ctermfg=124 ctermbg=249 cterm=NONE
-  hi PmenuMatchSel ctermfg=124 ctermbg=226 cterm=NONE
-  hi TabLine ctermfg=16 ctermbg=250 cterm=underline
-  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=16 ctermbg=254 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=250 cterm=bold
-  hi NonText ctermfg=21 ctermbg=250 cterm=bold
-  hi SpecialKey ctermfg=250 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=252 cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=21 cterm=NONE
-  hi LineNr ctermfg=124 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=18 ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=18 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=62 ctermbg=NONE cterm=underline
-  hi Error ctermfg=196 ctermbg=254 cterm=reverse
-  hi ErrorMsg ctermfg=196 ctermbg=254 cterm=reverse
-  hi WarningMsg ctermfg=55 ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=bold
-  hi ModeMsg ctermfg=16 ctermbg=NONE cterm=bold
-  hi Question ctermfg=30 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=16 ctermbg=226 cterm=NONE
-  hi MatchParen ctermfg=254 ctermbg=62 cterm=NONE
-  hi Search ctermfg=254 ctermbg=55 cterm=NONE
-  hi IncSearch ctermfg=29 ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=bold
-  hi ColorColumn ctermfg=16 ctermbg=231 cterm=NONE
-  hi Cursor ctermfg=254 ctermbg=29 cterm=NONE
-  hi lCursor ctermfg=254 ctermbg=124 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=40 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=124 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=29 ctermbg=NONE cterm=underline
-  hi Comment ctermfg=21 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=201 ctermbg=255 cterm=NONE
-  hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=124 ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=55 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=29 ctermbg=NONE cterm=bold
-  hi Special ctermfg=62 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=30 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=102 ctermbg=NONE cterm=NONE
-  hi Title ctermfg=124 ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#000000 guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 cterm=NONE term=NONE
+hi ColorColumn guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=reverse
+hi Comment guifg=#0000ff guibg=NONE guisp=NONE gui=NONE ctermfg=21 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#878787 guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ff00ff guibg=#eeeeee guisp=NONE gui=NONE ctermfg=201 ctermbg=255 cterm=NONE term=NONE
+hi Cursor guifg=#e4e4e4 guibg=#2e8b57 guisp=NONE gui=NONE ctermfg=254 ctermbg=29 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#d3d3d3 guisp=NONE gui=NONE ctermfg=NONE ctermbg=252 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#d3d3d3 guisp=NONE gui=NONE ctermfg=NONE ctermbg=252 cterm=NONE term=underline
+hi CursorLineNr guifg=#a52a2a guibg=NONE guisp=NONE gui=bold ctermfg=124 ctermbg=NONE cterm=bold term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#008787 guibg=NONE guisp=NONE gui=bold ctermfg=30 ctermbg=NONE cterm=bold term=NONE
+hi EndOfBuffer guifg=#0000ff guibg=#cccccc guisp=NONE gui=bold ctermfg=21 ctermbg=252 cterm=bold term=NONE
+hi Error guifg=#ff0000 guibg=#e4e4e4 guisp=NONE gui=reverse ctermfg=196 ctermbg=254 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#ff0000 guibg=#e4e4e4 guisp=NONE gui=reverse ctermfg=196 ctermbg=254 cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#00008b guibg=NONE guisp=NONE gui=NONE ctermfg=18 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00008b guibg=#d3d3d3 guisp=NONE gui=NONE ctermfg=18 ctermbg=252 cterm=NONE term=NONE
+hi Identifier guifg=#008787 guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#2e8b57 guibg=NONE guisp=NONE gui=reverse ctermfg=29 ctermbg=NONE cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#a52a2a guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#e4e4e4 guibg=#6a5acd guisp=NONE gui=NONE ctermfg=254 ctermbg=62 cterm=NONE term=bold,underline
+hi ModeMsg guifg=#000000 guibg=NONE guisp=NONE gui=bold ctermfg=16 ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=bold term=NONE
+hi NonText guifg=#0000ff guibg=#bcbcbc guisp=NONE gui=bold ctermfg=21 ctermbg=250 cterm=bold term=NONE
+hi Pmenu guifg=#000000 guibg=#b2b2b2 guisp=NONE gui=NONE ctermfg=16 ctermbg=249 cterm=NONE term=reverse
+hi PmenuMatch guifg=#a52a2a guibg=#b2b2b2 guisp=NONE gui=NONE ctermfg=124 ctermbg=249 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#a52a2a guibg=#ffff00 guisp=NONE gui=NONE ctermfg=124 ctermbg=226 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=#e4e4e4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=NONE
+hi PreProc guifg=#6a0dad guibg=NONE guisp=NONE gui=NONE ctermfg=55 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#008787 guibg=NONE guisp=NONE gui=bold ctermfg=30 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=NONE
+hi Search guifg=#e4e4e4 guibg=#6a0dad guisp=NONE gui=NONE ctermfg=254 ctermbg=55 cterm=NONE term=reverse
+hi SignColumn guifg=#00008b guibg=NONE guisp=NONE gui=NONE ctermfg=18 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#6a5acd guibg=NONE guisp=NONE gui=NONE ctermfg=62 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#00d700 guibg=NONE guisp=#00d700 gui=undercurl ctermfg=40 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#a52a2a guibg=NONE guisp=#a52a2a gui=undercurl ctermfg=124 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#2e8b57 guibg=NONE guisp=#2e8b57 gui=undercurl ctermfg=29 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#a52a2a guibg=NONE guisp=NONE gui=bold ctermfg=124 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#eeeeee guibg=#000000 guisp=NONE gui=bold ctermfg=255 ctermbg=16 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#bcbcbc guibg=#000000 guisp=NONE gui=NONE ctermfg=250 ctermbg=16 cterm=NONE term=bold,underline
+hi TabLine guifg=#000000 guibg=#bcbcbc guisp=NONE gui=underline ctermfg=16 ctermbg=250 cterm=underline term=bold,underline
+hi TabLineFill guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=NONE
+hi TabLineSel guifg=#000000 guibg=#e4e4e4 guisp=NONE gui=bold ctermfg=16 ctermbg=254 cterm=bold term=bold,reverse
+hi Title guifg=#a52a2a guibg=NONE guisp=NONE gui=bold ctermfg=124 ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=NONE guibg=#bcbcbc guisp=NONE gui=bold ctermfg=NONE ctermbg=250 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#6a5acd guibg=NONE guisp=NONE gui=underline ctermfg=62 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#bcbcbc guibg=#000000 guisp=NONE gui=NONE ctermfg=250 ctermbg=16 cterm=NONE term=NONE
+hi Visual guifg=NONE guibg=#d0d0d0 guisp=NONE gui=NONE ctermfg=NONE ctermbg=252 cterm=NONE term=reverse
+hi VisualNOS guifg=NONE guibg=#0000ff guisp=NONE gui=NONE ctermfg=NONE ctermbg=21 cterm=NONE term=NONE
+hi WarningMsg guifg=#6a0dad guibg=NONE guisp=NONE gui=bold ctermfg=55 ctermbg=NONE cterm=bold term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=bold ctermfg=16 ctermbg=226 cterm=bold term=bold
+hi lCursor guifg=#e4e4e4 guibg=#a52a2a guisp=NONE gui=NONE ctermfg=254 ctermbg=124 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=black ctermbg=grey cterm=NONE
-  hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ColorColumn ctermfg=black ctermbg=white cterm=NONE
+  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=magenta ctermbg=white cterm=NONE
+  hi Cursor ctermfg=grey ctermbg=darkgreen cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkred ctermbg=NONE cterm=underline
-  hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE
-  hi StatusLine ctermfg=white ctermbg=black cterm=bold
-  hi StatusLineNC ctermfg=darkgrey ctermbg=black cterm=NONE
-  hi VertSplit ctermfg=darkgrey ctermbg=black cterm=NONE
-  hi Pmenu ctermfg=black ctermbg=white cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=grey cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=white cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
-  hi TabLine ctermfg=black ctermbg=white cterm=underline
-  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=black ctermbg=grey cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=white cterm=bold
-  hi NonText ctermfg=blue ctermbg=white cterm=bold
-  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=white cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=blue cterm=NONE
-  hi LineNr ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=NONE
   hi Error ctermfg=red ctermbg=grey cterm=reverse
   hi ErrorMsg ctermfg=red ctermbg=grey cterm=reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi ModeMsg ctermfg=black ctermbg=NONE cterm=bold
-  hi Question ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
-  hi MatchParen ctermfg=grey ctermbg=darkblue cterm=NONE
-  hi Search ctermfg=grey ctermbg=darkmagenta cterm=NONE
+  hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
-  hi ColorColumn ctermfg=black ctermbg=white cterm=NONE
-  hi Cursor ctermfg=grey ctermbg=darkgreen cterm=NONE
-  hi lCursor ctermfg=grey ctermbg=darkred cterm=NONE
+  hi LineNr ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=grey ctermbg=darkblue cterm=NONE
+  hi ModeMsg ctermfg=black ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=blue ctermbg=white cterm=bold
+  hi Pmenu ctermfg=black ctermbg=white cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=white cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=black cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE
+  hi Search ctermfg=grey ctermbg=darkmagenta cterm=NONE
+  hi SignColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=darkred ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=underline
-  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=magenta ctermbg=white cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=white ctermbg=black cterm=bold
+  hi StatusLineNC ctermfg=darkgrey ctermbg=black cterm=NONE
+  hi TabLine ctermfg=black ctermbg=white cterm=underline
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi TabLineSel ctermfg=black ctermbg=grey cterm=bold
   hi Title ctermfg=darkred ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
+  hi ToolbarButton ctermfg=NONE ctermbg=white cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=darkgrey ctermbg=black cterm=NONE
+  hi Visual ctermfg=NONE ctermbg=white cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=blue cterm=NONE
+  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
+  hi lCursor ctermfg=grey ctermbg=darkred cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=black ctermbg=gray cterm=NONE
-  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Cursor ctermfg=grey ctermbg=darkgreen cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse
-  hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse
-  hi VertSplit ctermfg=black ctermbg=gray cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi TabLine ctermfg=gray ctermbg=black cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=black ctermbg=gray cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
-  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi LineNr ctermfg=NONE ctermbg=NONE cterm=bold
-  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Error ctermfg=darkred ctermbg=gray cterm=reverse
   hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Question ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi MatchParen ctermfg=gray ctermbg=darkblue cterm=NONE
-  hi Search ctermfg=gray ctermbg=darkmagenta cterm=NONE
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MatchParen ctermfg=gray ctermbg=darkblue cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Search ctermfg=gray ctermbg=darkmagenta cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=bold
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
   hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse
   hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse
+  hi TabLine ctermfg=gray ctermbg=black cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi TabLineSel ctermfg=black ctermbg=gray cterm=NONE
   hi Title ctermfg=darkred ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=black ctermbg=gray cterm=reverse
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi lCursor ctermfg=grey ctermbg=darkred cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: light
-" Color: comment     #0000ff        21             blue
-" Color: constant    #ff00ff        201            magenta
-" Color: identifier  #008787        30             darkcyan
-" Color: statement   #a52a2a        124            darkred
-" Color: preproc     #6a0dad        55             darkmagenta
-" Color: type        #2e8b57        29             darkgreen
-" Color: special     #6a5acd        62             darkblue
-" Color: fg0         #000000        16             black
-" Color: bg0         #e4e4e4        254            grey
-" Color: bg1         #bcbcbc        250            white
-" Color: status      #bcbcbc        250            darkgrey
-" Color: bg2         #eeeeee        255            white
-" Color: endofbuffer #cccccc        252            darkgrey
-" Color: visual      #d0d0d0        252            white
-" Color: folded      #d3d3d3        252            darkgrey
-" Color: folded_fg   #00008b        18             darkblue
-" Color: pmenu       #b2b2b2        249            white
-" Color: wildmenu    #ffff00        226            yellow
-" Color: error       #ff0000        196            red
-" Color: colorcolumn #ffffff        231            white
-" Color: spellcap    #00d700        40             green
-" Color: black       #000000        16             black
-" Color: darkred     #870000        88             darkred
-" Color: darkgreen   #008700        28             darkgreen
-" Color: darkyellow  #878700        100            darkyellow
-" Color: darkblue    #000087        18             darkblue
-" Color: darkmagenta #870087        18             darkmagenta
-" Color: darkcyan    #008787        30             darkcyan
-" Color: gray        #878787        102            gray
-" Term colors: bg0     statement constant preproc identifier type special bg1
-" Term colors: comment statement constant preproc identifier type special fg0
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/murphy.vim

@@ -2,408 +2,250 @@
 " Description:  Green foreground black background.
 " Author:       Original author Ron Aaron <ron@ronware.org>.
 " Maintainer:   Original maintainer Ron Aaron <ron@ronware.org>.
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'murphy'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#303030', '#ffa700', '#005f00', '#ffd7af', '#87afff', '#ffafaf', '#00afaf', '#bcbcbc', '#444444', '#ff0000', '#00875f', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
+let g:terminal_ansi_colors = ['#303030', '#ffa700', '#005f00', '#ffd7af', '#87afff', '#ffafaf', '#00afaf', '#bcbcbc', '#444444', '#ff0000', '#00875f', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']
+
+hi! link Added Constant
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link Float Number
+hi! link Function Identifier
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link MessageWindow Pmenu
+hi! link Number Constant
+hi! link PopupNotification Todo
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
-hi! link PopupSelected PmenuSel
-hi! link Added Constant
-hi Normal guifg=#87ff87 guibg=#000000 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#0000ff guibg=#000000 gui=NONE cterm=NONE
-hi StatusLine guifg=#ffffff guibg=#00008b gui=NONE cterm=NONE
-hi StatusLineNC guifg=#ffffff guibg=#3a3a3a gui=NONE cterm=NONE
-hi VertSplit guifg=#ffffff guibg=#3a3a3a gui=NONE cterm=NONE
-hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#bcbcbc gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ff00ff guibg=#444444 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff00ff guibg=#ffff00 gui=NONE cterm=NONE
-hi TabLineFill guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-hi TabLine guifg=#87ff87 guibg=#444444 gui=NONE cterm=NONE
-hi TabLineSel guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#ffffff guibg=#444444 gui=bold cterm=bold
-hi NonText guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi QuickFixLine guifg=#303030 guibg=#00afaf gui=NONE cterm=NONE
-hi Folded guifg=#00afaf guibg=#303030 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#444444 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#444444 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=bold
-hi ColorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
-hi Visual guifg=#ffffff guibg=#005f00 gui=NONE cterm=NONE
-hi VisualNOS guifg=#ffffff guibg=#005f00 gui=NONE cterm=NONE
-hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi SignColumn guifg=#00afaf guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#00afaf guibg=NONE gui=underline cterm=underline
-hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi ErrorMsg guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi ModeMsg guifg=#87ff87 guibg=NONE gui=bold cterm=bold
-hi WarningMsg guifg=#ffa700 guibg=NONE gui=bold cterm=bold
-hi MoreMsg guifg=#005f00 guibg=NONE gui=bold cterm=bold
-hi Question guifg=#00ffff guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#0000ff guibg=#ffff00 gui=NONE cterm=NONE
-hi MatchParen guifg=#303030 guibg=#ffd7af gui=NONE cterm=NONE
-hi Search guifg=#ffffff guibg=#0000ff gui=NONE cterm=NONE
-hi IncSearch guifg=#ffa700 guibg=NONE gui=reverse cterm=reverse
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#87ff87 gui=NONE cterm=NONE
-hi lCursor guifg=#000000 guibg=#ff0000 gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl cterm=underline
-hi SpellLocal guifg=#ffd7af guibg=NONE guisp=#ffd7af gui=undercurl cterm=underline
-hi SpellRare guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl cterm=underline
-hi Comment guifg=#ffa700 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#ffd7af guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
-hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi Conceal guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link TabPanel Normal
+hi! link TabPanelFill EndOfBuffer
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi! link PopupSelected PmenuSel
-  hi! link Added Constant
-  hi Normal ctermfg=120 ctermbg=16 cterm=NONE
-  hi EndOfBuffer ctermfg=21 ctermbg=16 cterm=NONE
-  hi StatusLine ctermfg=231 ctermbg=18 cterm=NONE
-  hi StatusLineNC ctermfg=231 ctermbg=237 cterm=NONE
-  hi VertSplit ctermfg=231 ctermbg=237 cterm=NONE
-  hi Pmenu ctermfg=231 ctermbg=238 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=236 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=250 cterm=NONE
-  hi PmenuMatch ctermfg=201 ctermbg=238 cterm=NONE
-  hi PmenuMatchSel ctermfg=201 ctermbg=226 cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=236 cterm=NONE
-  hi TabLine ctermfg=120 ctermbg=238 cterm=NONE
-  hi TabLineSel ctermfg=231 ctermbg=16 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=236 cterm=NONE
-  hi ToolbarButton ctermfg=231 ctermbg=238 cterm=bold
-  hi NonText ctermfg=37 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=37 ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=236 ctermbg=37 cterm=NONE
-  hi Folded ctermfg=37 ctermbg=236 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=238 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=238 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
-  hi ColorColumn ctermfg=NONE ctermbg=235 cterm=NONE
-  hi Visual ctermfg=231 ctermbg=22 cterm=NONE
-  hi VisualNOS ctermfg=231 ctermbg=22 cterm=NONE
-  hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=37 ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=37 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=37 ctermbg=NONE cterm=underline
-  hi Error ctermfg=231 ctermbg=196 cterm=NONE
-  hi ErrorMsg ctermfg=231 ctermbg=196 cterm=NONE
-  hi ModeMsg ctermfg=120 ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=214 ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=22 ctermbg=NONE cterm=bold
-  hi Question ctermfg=51 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=21 ctermbg=226 cterm=NONE
-  hi MatchParen ctermfg=236 ctermbg=223 cterm=NONE
-  hi Search ctermfg=231 ctermbg=21 cterm=NONE
-  hi IncSearch ctermfg=214 ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=120 cterm=NONE
-  hi lCursor ctermfg=16 ctermbg=196 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=51 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=223 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=226 ctermbg=NONE cterm=underline
-  hi Comment ctermfg=214 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=226 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=231 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=223 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=250 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=250 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#87ff87 guibg=#000000 guisp=NONE gui=NONE ctermfg=120 ctermbg=16 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#262626 guisp=NONE gui=NONE ctermfg=NONE ctermbg=235 cterm=NONE term=reverse
+hi Comment guifg=#ffa700 guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ffffff guibg=NONE guisp=NONE gui=NONE ctermfg=231 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#87ff87 guisp=NONE gui=NONE ctermfg=16 ctermbg=120 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#444444 guisp=NONE gui=NONE ctermfg=NONE ctermbg=238 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#444444 guisp=NONE gui=NONE ctermfg=NONE ctermbg=238 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=bold ctermfg=226 ctermbg=NONE cterm=bold term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi EndOfBuffer guifg=#0000ff guibg=#000000 guisp=NONE gui=NONE ctermfg=21 ctermbg=16 cterm=NONE term=NONE
+hi Error guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 cterm=NONE term=bold,reverse
+hi ErrorMsg guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 cterm=NONE term=bold,reverse
+hi FoldColumn guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00afaf guibg=#303030 guisp=NONE gui=NONE ctermfg=37 ctermbg=236 cterm=NONE term=NONE
+hi Identifier guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#ffa700 guibg=NONE guisp=NONE gui=reverse ctermfg=214 ctermbg=NONE cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#303030 guibg=#ffd7af guisp=NONE gui=NONE ctermfg=236 ctermbg=223 cterm=NONE term=bold,underline
+hi ModeMsg guifg=#87ff87 guibg=NONE guisp=NONE gui=bold ctermfg=120 ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#005f00 guibg=NONE guisp=NONE gui=bold ctermfg=22 ctermbg=NONE cterm=bold term=NONE
+hi NonText guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#ffffff guibg=#444444 guisp=NONE gui=NONE ctermfg=231 ctermbg=238 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ff00ff guibg=#444444 guisp=NONE gui=NONE ctermfg=201 ctermbg=238 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#ffff00 guisp=NONE gui=NONE ctermfg=201 ctermbg=226 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#bcbcbc guisp=NONE gui=NONE ctermfg=NONE ctermbg=250 cterm=NONE term=NONE
+hi PreProc guifg=#ffd7af guibg=NONE guisp=NONE gui=NONE ctermfg=223 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#00ffff guibg=NONE guisp=NONE gui=bold ctermfg=51 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#303030 guibg=#00afaf guisp=NONE gui=NONE ctermfg=236 ctermbg=37 cterm=NONE term=NONE
+hi Search guifg=#ffffff guibg=#0000ff guisp=NONE gui=NONE ctermfg=231 ctermbg=21 cterm=NONE term=reverse
+hi SignColumn guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ff00ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#00afaf guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl ctermfg=51 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ffd7af guibg=NONE guisp=#ffd7af gui=undercurl ctermfg=223 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl ctermfg=226 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi StatusLine guifg=#ffffff guibg=#00008b guisp=NONE gui=NONE ctermfg=231 ctermbg=18 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#ffffff guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=231 ctermbg=237 cterm=NONE term=bold,underline
+hi TabLine guifg=#87ff87 guibg=#444444 guisp=NONE gui=NONE ctermfg=120 ctermbg=238 cterm=NONE term=bold,underline
+hi TabLineFill guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=NONE
+hi TabLineSel guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=bold,reverse
+hi Title guifg=#ff00ff guibg=NONE guisp=NONE gui=bold ctermfg=201 ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#0000ff guibg=#ffff00 guisp=NONE gui=NONE ctermfg=21 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=#ffffff guibg=#444444 guisp=NONE gui=bold ctermfg=231 ctermbg=238 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=#303030 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=reverse
+hi Type guifg=#bcbcbc guibg=NONE guisp=NONE gui=NONE ctermfg=250 ctermbg=NONE cterm=NONE term=NONE
+hi Underlined guifg=#00afaf guibg=NONE guisp=NONE gui=underline ctermfg=37 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#ffffff guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=231 ctermbg=237 cterm=NONE term=NONE
+hi Visual guifg=#ffffff guibg=#005f00 guisp=NONE gui=NONE ctermfg=231 ctermbg=22 cterm=NONE term=reverse
+hi VisualNOS guifg=#ffffff guibg=#005f00 guisp=NONE gui=NONE ctermfg=231 ctermbg=22 cterm=NONE term=NONE
+hi WarningMsg guifg=#ffa700 guibg=NONE guisp=NONE gui=bold ctermfg=214 ctermbg=NONE cterm=bold term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
+hi lCursor guifg=#000000 guibg=#ff0000 guisp=NONE gui=NONE ctermfg=16 ctermbg=196 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=green ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE
-  hi StatusLine ctermfg=white ctermbg=darkblue cterm=NONE
-  hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi VertSplit ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
-  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
-  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
-  hi TabLine ctermfg=green ctermbg=darkgrey cterm=NONE
-  hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
-  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold
-  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
   hi ColorColumn ctermfg=green ctermbg=darkgrey cterm=NONE
-  hi Visual ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi VisualNOS ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi LineNr ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=darkcyan ctermbg=NONE cterm=underline
+  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=white ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=green cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE
   hi Error ctermfg=white ctermbg=red cterm=NONE
   hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
-  hi ModeMsg ctermfg=green ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Question ctermfg=cyan ctermbg=NONE cterm=bold
-  hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Search ctermfg=white ctermbg=blue cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=darkred ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
-  hi Cursor ctermfg=black ctermbg=green cterm=NONE
-  hi lCursor ctermfg=black ctermbg=red cterm=NONE
+  hi LineNr ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ModeMsg ctermfg=green ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Question ctermfg=cyan ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi Search ctermfg=white ctermbg=blue cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=cyan ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=yellow ctermbg=NONE cterm=underline
-  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Statement ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=white ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=white ctermbg=darkblue cterm=NONE
+  hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi TabLine ctermfg=green ctermbg=darkgrey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
   hi Title ctermfg=magenta ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
+  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
+  hi Type ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=darkcyan ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi Visual ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi VisualNOS ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+  hi lCursor ctermfg=black ctermbg=red cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=darkgreen ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi StatusLine ctermfg=darkblue ctermbg=grey cterm=bold,reverse
-  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
-  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
-  hi TabLine ctermfg=grey ctermbg=black cterm=reverse
-  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
-  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=reverse,underline
-  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Comment ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=grey ctermbg=NONE cterm=bold
+  hi Cursor ctermfg=black ctermbg=green cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
   hi Error ctermfg=grey ctermbg=darkred cterm=NONE
   hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
-  hi ModeMsg ctermfg=grey ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Question ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Search ctermfg=grey ctermbg=darkblue cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=darkred ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ModeMsg ctermfg=grey ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Question ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi Search ctermfg=grey ctermbg=darkblue cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse
   hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
-  hi Comment ctermfg=darkred ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=grey ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi Type ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=darkblue ctermbg=grey cterm=bold,reverse
+  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
+  hi TabLine ctermfg=grey ctermbg=black cterm=reverse
+  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
+  hi Type ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=reverse,underline
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi lCursor ctermfg=black ctermbg=red cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: foreground  #87FF87        120            green
-" Color: background  #000000        16             black
-" Color: color00     #303030        236            black
-" Color: color08     #444444        238            darkgrey
-" Color: color01     #FFA700        214            darkred
-" Color: color09     #FF0000        196            red
-" Color: color02     #005F00        22             darkgreen
-" Color: color10     #00875F        29             green
-" Color: color03     #FFD7AF        223            darkyellow
-" Color: color11     #FFFF00        226            yellow
-" Color: color04     #00008B        18             darkblue
-" Color: color12     #0000FF        21             blue
-" Color: color05     #FFAFAF        217            darkmagenta
-" Color: color13     #FF00FF        201            magenta
-" Color: color06     #00AFAF        37             darkcyan
-" Color: color14     #00FFFF        51             cyan
-" Color: color07     #BCBCBC        250            grey
-" Color: color15     #FFFFFF        231            white
-" Color: color16     #262626        235            black
-" Color: color17     #3A3A3A        237            darkgrey
-" Color: color04t    #87AFFF        111            darkblue
-" Color: color12t    #005FFF        27             blue
-" Term colors: color00 color01 color02 color03 color04t color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12t color13 color14 color15
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/pablo.vim

@@ -1,440 +1,253 @@
 " Name:         pablo
 " Author:       Ron Aaron <ron@ronware.org>
 " Maintainer:   Original maintainerRon Aaron <ron@ronware.org>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'pablo'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi! link Terminal Normal
-hi! link StatusLineTerm StatusLine
-hi! link StatusLineTermNC StatusLineNC
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
-hi! link PopupSelected PmenuSel
-hi Normal guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
-hi Comment guifg=#808080 guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#00c0c0 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#c0c000 guibg=NONE gui=bold cterm=bold
-hi PreProc guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#00c000 guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#0000ff guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
-hi Ignore guifg=#000000 guibg=#000000 gui=NONE cterm=NONE
-hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi Todo guifg=#000000 guibg=#c0c000 gui=NONE cterm=NONE
-hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
-hi lCursor guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
-hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
-hi Directory guifg=#00c000 guibg=NONE gui=NONE cterm=NONE
-hi Search guifg=#000000 guibg=#c0c000 gui=NONE cterm=NONE
-hi IncSearch guifg=#ffffff guibg=NONE gui=reverse cterm=reverse
-hi NonText guifg=#0000ff guibg=NONE gui=bold cterm=bold
-hi EndOfBuffer guifg=#0000ff guibg=NONE gui=bold cterm=bold
-hi ErrorMsg guifg=#ffffff guibg=#cd0000 gui=NONE cterm=NONE
-hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi SignColumn guifg=#00ffff guibg=#a9a9a9 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#4d4d4d gui=NONE cterm=NONE
-hi FoldColumn guifg=#7f7f7f guibg=#303030 gui=NONE cterm=NONE
-hi Folded guifg=#7f7f7f guibg=#303030 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=#3a3a3a gui=bold cterm=bold
-hi Visual guifg=#00008b guibg=#a9a9a9 gui=NONE cterm=NONE
-hi VisualNOS guifg=NONE guibg=#000000 gui=bold,underline cterm=underline
-hi LineNr guifg=#7f7f7f guibg=NONE gui=NONE cterm=NONE
+hi! link Float Number
+hi! link Function Identifier
 hi! link LineNrAbove LineNr
 hi! link LineNrBelow LineNr
-hi MatchParen guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-hi MoreMsg guifg=#5c5cff guibg=NONE gui=bold cterm=bold
-hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold
-hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi QuickFixLine guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#5c5cff guibg=NONE guisp=#5c5cff gui=undercurl cterm=underline
-hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi SpellRare guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl cterm=underline
-hi StatusLine guifg=#ffff00 guibg=#0000ee gui=NONE cterm=NONE
-hi StatusLineNC guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
-hi VertSplit guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
-hi TabLine guifg=#ffffff guibg=#7f7f7f gui=NONE cterm=NONE
-hi TabLineFill guifg=NONE guibg=#000000 gui=reverse cterm=reverse
-hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=bold
-hi PmenuMatch guifg=#ff00ff guibg=#303030 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff00ff guibg=#e5e5e5 gui=NONE cterm=NONE
-hi Pmenu guifg=fg guibg=#303030 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#e5e5e5 gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link MessageWindow Pmenu
+hi! link Number Constant
+hi! link PopupNotification Todo
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link TabPanel Normal
+hi! link TabPanelFill EndOfBuffer
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi! link PopupSelected PmenuSel
-  hi Normal ctermfg=231 ctermbg=16 cterm=NONE
-  hi Comment ctermfg=244 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=37 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=142 ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=34 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=21 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi Ignore ctermfg=16 ctermbg=16 cterm=NONE
-  hi Error ctermfg=231 ctermbg=196 cterm=NONE
-  hi Todo ctermfg=16 ctermbg=142 cterm=NONE
-  hi Conceal ctermfg=241 ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=231 cterm=NONE
-  hi lCursor ctermfg=16 ctermbg=231 cterm=NONE
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi Title ctermfg=225 ctermbg=NONE cterm=bold
-  hi Directory ctermfg=34 ctermbg=NONE cterm=NONE
-  hi Search ctermfg=16 ctermbg=142 cterm=NONE
-  hi IncSearch ctermfg=231 ctermbg=NONE cterm=reverse
-  hi NonText ctermfg=63 ctermbg=NONE cterm=bold
-  hi EndOfBuffer ctermfg=63 ctermbg=NONE cterm=bold
-  hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
-  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=51 ctermbg=248 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=239 cterm=NONE
-  hi FoldColumn ctermfg=102 ctermbg=236 cterm=NONE
-  hi Folded ctermfg=102 ctermbg=236 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=237 cterm=bold
-  hi Visual ctermfg=20 ctermbg=248 cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=16 cterm=underline
-  hi LineNr ctermfg=102 ctermbg=NONE cterm=NONE
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi MatchParen ctermfg=NONE ctermbg=44 cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=63 ctermbg=NONE cterm=bold
-  hi Question ctermfg=121 ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=81 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
-  hi QuickFixLine ctermfg=16 ctermbg=44 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=63 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=201 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=226 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=226 ctermbg=20 cterm=NONE
-  hi StatusLineNC ctermfg=16 ctermbg=231 cterm=NONE
-  hi VertSplit ctermfg=16 ctermbg=231 cterm=NONE
-  hi TabLine ctermfg=231 ctermbg=102 cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=16 cterm=reverse
-  hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
-  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=bold
-  hi PmenuMatch ctermfg=201 ctermbg=236 cterm=NONE
-  hi PmenuMatchSel ctermfg=201 ctermbg=254 cterm=NONE
-  hi Pmenu ctermfg=fg ctermbg=236 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=254 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=NONE ctermbg=239 cterm=NONE term=reverse
+hi Comment guifg=#808080 guibg=NONE guisp=NONE gui=NONE ctermfg=244 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=NONE
+hi CursorIM guifg=NONE guibg=fg guisp=NONE gui=NONE ctermfg=NONE ctermbg=fg cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffff00 guibg=#3a3a3a guisp=NONE gui=bold ctermfg=226 ctermbg=237 cterm=bold term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#00c000 guibg=NONE guisp=NONE gui=NONE ctermfg=34 ctermbg=NONE cterm=NONE term=NONE
+hi EndOfBuffer guifg=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=63 ctermbg=NONE cterm=bold term=NONE
+hi Error guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 cterm=NONE term=bold,reverse
+hi ErrorMsg guifg=#ffffff guibg=#cd0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=160 cterm=NONE term=bold,reverse
+hi FoldColumn guifg=#7f7f7f guibg=#303030 guisp=NONE gui=NONE ctermfg=102 ctermbg=236 cterm=NONE term=NONE
+hi Folded guifg=#7f7f7f guibg=#303030 guisp=NONE gui=NONE ctermfg=102 ctermbg=236 cterm=NONE term=NONE
+hi Identifier guifg=#00c0c0 guibg=NONE guisp=NONE gui=NONE ctermfg=37 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#000000 guibg=#000000 guisp=NONE gui=NONE ctermfg=16 ctermbg=16 cterm=NONE term=NONE
+hi IncSearch guifg=#ffffff guibg=NONE guisp=NONE gui=reverse ctermfg=231 ctermbg=NONE cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#7f7f7f guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=NONE guibg=#008b8b guisp=NONE gui=NONE ctermfg=NONE ctermbg=44 cterm=NONE term=bold,underline
+hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#5c5cff guibg=NONE guisp=NONE gui=bold ctermfg=63 ctermbg=NONE cterm=bold term=NONE
+hi NonText guifg=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=63 ctermbg=NONE cterm=bold term=NONE
+hi Pmenu guifg=fg guibg=#303030 guisp=NONE gui=NONE ctermfg=fg ctermbg=236 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ff00ff guibg=#303030 guisp=NONE gui=NONE ctermfg=201 ctermbg=236 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=201 ctermbg=254 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=NONE
+hi PreProc guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#00ff00 guibg=NONE guisp=NONE gui=bold ctermfg=121 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#000000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=NONE
+hi Search guifg=#000000 guibg=#c0c000 guisp=NONE gui=NONE ctermfg=16 ctermbg=142 cterm=NONE term=reverse
+hi SignColumn guifg=#00ffff guibg=#a9a9a9 guisp=NONE gui=NONE ctermfg=51 ctermbg=248 cterm=NONE term=reverse
+hi Special guifg=#0000ff guibg=NONE guisp=NONE gui=NONE ctermfg=21 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#5c5cff guibg=NONE guisp=#5c5cff gui=undercurl ctermfg=63 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=201 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl ctermfg=226 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#c0c000 guibg=NONE guisp=NONE gui=bold ctermfg=142 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#ffff00 guibg=#0000ee guisp=NONE gui=NONE ctermfg=226 ctermbg=20 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=bold,underline
+hi TabLine guifg=#ffffff guibg=#7f7f7f guisp=NONE gui=NONE ctermfg=231 ctermbg=102 cterm=NONE term=bold,underline
+hi TabLineFill guifg=NONE guibg=#000000 guisp=NONE gui=reverse ctermfg=NONE ctermbg=16 cterm=reverse term=NONE
+hi TabLineSel guifg=#ffffff guibg=#000000 guisp=NONE gui=bold ctermfg=231 ctermbg=16 cterm=bold term=bold,reverse
+hi Title guifg=#ff00ff guibg=NONE guisp=NONE gui=bold ctermfg=225 ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#000000 guibg=#c0c000 guisp=NONE gui=NONE ctermfg=16 ctermbg=142 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=#000000 guibg=#e5e5e5 guisp=NONE gui=bold ctermfg=16 ctermbg=254 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=reverse
+hi Type guifg=#00c000 guibg=NONE guisp=NONE gui=NONE ctermfg=34 ctermbg=NONE cterm=NONE term=NONE
+hi Underlined guifg=#80a0ff guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=NONE
+hi Visual guifg=#00008b guibg=#a9a9a9 guisp=NONE gui=NONE ctermfg=20 ctermbg=248 cterm=NONE term=reverse
+hi VisualNOS guifg=NONE guibg=#000000 guisp=NONE gui=bold,underline ctermfg=NONE ctermbg=16 cterm=underline term=NONE
+hi WarningMsg guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
+hi lCursor guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Special ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=darkgreen ctermbg=NONE cterm=underline
-  hi Ignore ctermfg=black ctermbg=black cterm=NONE
-  hi Error ctermfg=white ctermbg=red cterm=NONE
-  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=black ctermbg=white cterm=NONE
-  hi lCursor ctermfg=black ctermbg=white cterm=NONE
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi Title ctermfg=magenta ctermbg=NONE cterm=bold
-  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi IncSearch ctermfg=white ctermbg=NONE cterm=reverse
-  hi NonText ctermfg=blue ctermbg=NONE cterm=bold
-  hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=bold
-  hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
-  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=cyan ctermbg=black cterm=NONE
   hi ColorColumn ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=white cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
-  hi Visual ctermfg=darkblue ctermbg=grey cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=bold
+  hi Error ctermfg=white ctermbg=red cterm=NONE
+  hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=black cterm=NONE
+  hi IncSearch ctermfg=white ctermbg=NONE cterm=reverse
   hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
   hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=blue ctermbg=NONE cterm=bold
+  hi NonText ctermfg=blue ctermbg=NONE cterm=bold
+  hi Pmenu ctermfg=fg ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=fg ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=grey cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=grey cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
   hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=cyan ctermbg=black cterm=NONE
+  hi Special ctermfg=blue ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=blue ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=magenta ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=yellow ctermbg=NONE cterm=underline
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi StatusLine ctermfg=yellow ctermbg=darkblue cterm=NONE
   hi StatusLineNC ctermfg=black ctermbg=white cterm=NONE
-  hi VertSplit ctermfg=black ctermbg=white cterm=NONE
   hi TabLine ctermfg=white ctermbg=darkgrey cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=black cterm=reverse
   hi TabLineSel ctermfg=white ctermbg=black cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
+  hi Title ctermfg=magenta ctermbg=NONE cterm=bold
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
   hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold
-  hi PmenuMatch ctermfg=fg ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=grey cterm=bold
-  hi Pmenu ctermfg=fg ctermbg=darkgrey cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=grey cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=darkgreen ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=black ctermbg=white cterm=NONE
+  hi Visual ctermfg=darkblue ctermbg=grey cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+  hi lCursor ctermfg=black ctermbg=white cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=grey ctermbg=black cterm=bold
-  hi StatusLine ctermfg=darkblue ctermbg=grey cterm=reverse
-  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
-  hi StatusLineTerm ctermfg=darkblue ctermbg=grey cterm=reverse
-  hi StatusLineTermNC ctermfg=grey ctermbg=black cterm=reverse
-  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
-  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
-  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
-  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
-  hi VisualNOS ctermfg=black ctermbg=grey cterm=NONE
-  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Comment ctermfg=grey ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Cursor ctermfg=black ctermbg=white cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=grey ctermbg=black cterm=bold
   hi Error ctermfg=grey ctermbg=darkred cterm=NONE
   hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
-  hi ModeMsg ctermfg=grey ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Question ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi ModeMsg ctermfg=grey ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PreProc ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkblue ctermbg=darkyellow cterm=reverse
   hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
   hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi Comment ctermfg=grey ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Error ctermfg=grey ctermbg=darkred cterm=NONE
-  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=darkblue ctermbg=grey cterm=reverse
+  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
+  hi StatusLineTerm ctermfg=darkblue ctermbg=grey cterm=reverse
+  hi StatusLineTermNC ctermfg=grey ctermbg=black cterm=reverse
+  hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+  hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=black ctermbg=grey cterm=NONE
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi lCursor ctermfg=black ctermbg=white cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: color00        #000000     16             black
-" Color: color08        #7f7f7f     102            darkgrey
-" Color: color01        #cd0000     160            darkred
-" Color: color09        #ff0000     196            red
-" Color: color02        #00cd00     40             darkgreen
-" Color: color10        #00ff00     46             green
-" Color: color03        #cdcd00     184            darkyellow
-" Color: color11        #ffff00     226            yellow
-" Color: color04        #0000ee     20             darkblue
-" Color: color12        #5c5cff     63             blue
-" Color: color05        #cd00cd     164            darkmagenta
-" Color: color13        #ff00ff     201            magenta
-" Color: color06        #00cdcd     44             darkcyan
-" Color: color14        #00ffff     51             cyan
-" Color: color07        #e5e5e5     254            grey
-" Color: color15        #ffffff     231            white
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
-" Color: rgbGrey30      #4d4d4d     239            darkgrey
-" Color: rgbGrey40      #666666     241            darkgrey
-" Color: rgbDarkGrey    #a9a9a9     248            grey
-" Color: rgbDarkBlue    #00008b     20             darkblue
-" Color: rgbDarkMagenta #8b008b     164            darkmagenta
-" Color: rgbBlue        #0000ff     63             blue
-" Color: rgbDarkCyan    #008b8b     44             darkcyan
-" Color: rgbSeaGreen    #2e8b57     121            darkgreen
-" Color: rgbGrey        #bebebe     248            grey
-" Color: Question       #00ff00     121            green
-" Color: SignColumn     #a9a9a9     248            black
-" Color: SpecialKey     #00ffff     81             cyan
-" Color: StatusLineTerm #90ee90     121            darkgreen
-" Color: Title          #ff00ff     225            magenta
-" Color: WarningMsg     #ff0000     196            red
-" Color: ToolbarLine    #7f7f7f     242            darkgrey
-" Color: ToolbarButton  #d3d3d3     254            grey
-" Color: Underlined     #80a0ff     111            darkgreen
-" Color: Comment        #808080     244            darkgrey
-" Color: Constant       #00ffff     51             cyan
-" Color: Special        #0000ff     21             blue
-" Color: Identifier     #00c0c0     37             darkcyan
-" Color: Search         #c0c000     142            darkyellow
-" Color: Statement      #c0c000     142            darkyellow
-" Color: Todo           #c0c000     142            darkyellow
-" Color: PreProc        #00ff00     46             green
-" Color: Type           #00c000     34             darkgreen
-" Color: Directory      #00c000     34             darkgreen
-" Color: Pmenu          #303030     236            darkgrey
-" Color: Folded         #303030     236            darkgrey
-" Color: Cursorline     #3a3a3a     237            darkgrey
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/peachpuff.vim

@@ -2,417 +2,251 @@
 " Description:  This color scheme uses a peachpuff background (what you've expected when it's " called peachpuff?).
 " Author:       Original author David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " Maintainer:   Original maintainer David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=light
 
 hi clear
 let g:colors_name = 'peachpuff'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#ffdab9', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#737373', '#406090', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#000000']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#ffdab9', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#737373', '#406090', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#000000']
-endif
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link Float Number
+hi! link Function Identifier
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
+hi! link Number Constant
 hi! link PopupNotification Todo
-hi! link PopupSelected PmenuSel
-hi Normal guifg=#000000 guibg=#ffdab9 gui=NONE cterm=NONE
-hi Folded guifg=#000000 guibg=#e3c1a5 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#f5c195 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#f5c195 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#cd0000 guibg=NONE gui=bold cterm=bold
-hi QuickFixLine guifg=#000000 guibg=#ffaf87 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#737373 guibg=NONE gui=NONE cterm=NONE
-hi StatusLine guifg=#ffffff guibg=#000000 gui=bold cterm=bold
-hi StatusLineNC guifg=#ffdab9 guibg=#737373 gui=bold cterm=bold
-hi StatusLineTerm guifg=#ffffff guibg=#2e8b57 gui=bold cterm=bold
-hi StatusLineTermNC guifg=#ffdab9 guibg=#008b8b gui=bold cterm=bold
-hi VertSplit guifg=#ffdab9 guibg=#737373 gui=NONE cterm=NONE
-hi Pmenu guifg=#000000 guibg=#ffaf87 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#ffdab9 gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#737373 gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#f5c195 gui=bold cterm=bold
-hi PmenuMatch guifg=#a52a2a guibg=#ffaf87 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#a52a2a guibg=#f5c195 gui=bold cterm=bold
-hi TabLine guifg=#ffdab9 guibg=#737373 gui=underline cterm=underline
-hi TabLineFill guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi TabLineSel guifg=#000000 guibg=#ffdab9 gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=#ffdab9 guibg=#737373 gui=bold cterm=bold
-hi NonText guifg=#737373 guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#737373 guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#000000 guibg=#cccccc gui=NONE cterm=NONE
-hi VisualNOS guifg=NONE guibg=#406090 gui=NONE cterm=NONE
-hi LineNr guifg=#cd0000 guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#406090 guibg=NONE gui=NONE cterm=NONE
-hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Underlined guifg=#6a5acd guibg=NONE gui=underline cterm=underline
-hi Error guifg=#ff0000 guibg=#ffffff gui=bold,reverse cterm=bold,reverse
-hi ErrorMsg guifg=#ff0000 guibg=#ffffff gui=bold,reverse cterm=bold,reverse
-hi WarningMsg guifg=#cd00cd guibg=#ffdab9 gui=bold cterm=bold
-hi MoreMsg guifg=#2e8b57 guibg=#ffdab9 gui=bold cterm=bold
-hi ModeMsg guifg=#000000 guibg=#ffdab9 gui=bold cterm=bold
-hi Question guifg=#c00058 guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#6a5acd guibg=#ffff00 gui=NONE cterm=NONE
-hi MatchParen guifg=#ffdab9 guibg=#6a5acd gui=NONE cterm=NONE
-hi Search guifg=#ffdab9 guibg=#cd00cd gui=NONE cterm=NONE
-hi IncSearch guifg=#2e8b57 guibg=NONE gui=reverse cterm=reverse
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold
-hi ColorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-hi Cursor guifg=#ffdab9 guibg=#000000 gui=NONE cterm=NONE
-hi lCursor guifg=#000000 guibg=#c00058 gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#008b8b guibg=NONE guisp=#008b8b gui=undercurl cterm=underline
-hi SpellLocal guifg=#cd00cd guibg=NONE guisp=#cd00cd gui=undercurl cterm=underline
-hi SpellRare guifg=#6a5acd guibg=NONE guisp=#6a5acd gui=undercurl cterm=underline
-hi Comment guifg=#406090 guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#c00058 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#a52a2a guibg=NONE gui=bold cterm=bold
-hi PreProc guifg=#cd00cd guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
-hi Special guifg=#6a5acd guibg=NONE gui=NONE cterm=NONE
-hi Directory guifg=#008b8b guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#737373 guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#cd00cd guibg=NONE gui=bold cterm=bold
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link TabPanel Normal
+hi! link TabPanelFill EndOfBuffer
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi! link PopupSelected PmenuSel
-  hi Normal ctermfg=16 ctermbg=223 cterm=NONE
-  hi Folded ctermfg=16 ctermbg=252 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=180 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=180 cterm=NONE
-  hi CursorLineNr ctermfg=160 ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=16 ctermbg=216 cterm=NONE
-  hi EndOfBuffer ctermfg=243 ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=231 ctermbg=16 cterm=bold
-  hi StatusLineNC ctermfg=223 ctermbg=243 cterm=bold
-  hi StatusLineTerm ctermfg=231 ctermbg=29 cterm=bold
-  hi StatusLineTermNC ctermfg=223 ctermbg=30 cterm=bold
-  hi VertSplit ctermfg=223 ctermbg=243 cterm=NONE
-  hi Pmenu ctermfg=16 ctermbg=216 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=223 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=180 cterm=bold
-  hi PmenuMatch ctermfg=124 ctermbg=216 cterm=NONE
-  hi PmenuMatchSel ctermfg=124 ctermbg=180 cterm=bold
-  hi TabLine ctermfg=223 ctermbg=243 cterm=underline
-  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=16 ctermbg=223 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=223 ctermbg=243 cterm=bold
-  hi NonText ctermfg=243 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=243 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=16 ctermbg=252 cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=25 cterm=NONE
-  hi LineNr ctermfg=160 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=25 ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=62 ctermbg=NONE cterm=underline
-  hi Error ctermfg=196 ctermbg=231 cterm=bold,reverse
-  hi ErrorMsg ctermfg=196 ctermbg=231 cterm=bold,reverse
-  hi WarningMsg ctermfg=164 ctermbg=223 cterm=bold
-  hi MoreMsg ctermfg=29 ctermbg=223 cterm=bold
-  hi ModeMsg ctermfg=16 ctermbg=223 cterm=bold
-  hi Question ctermfg=161 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=62 ctermbg=226 cterm=NONE
-  hi MatchParen ctermfg=223 ctermbg=62 cterm=NONE
-  hi Search ctermfg=223 ctermbg=164 cterm=NONE
-  hi IncSearch ctermfg=29 ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=bold
-  hi ColorColumn ctermfg=NONE ctermbg=255 cterm=NONE
-  hi Cursor ctermfg=223 ctermbg=16 cterm=NONE
-  hi lCursor ctermfg=16 ctermbg=161 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=30 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=164 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=62 ctermbg=NONE cterm=underline
-  hi Comment ctermfg=25 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=161 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=124 ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=164 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=29 ctermbg=NONE cterm=bold
-  hi Special ctermfg=62 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=30 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=243 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=164 ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#000000 guibg=#ffdab9 guisp=NONE gui=NONE ctermfg=16 ctermbg=223 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#eeeeee guisp=NONE gui=NONE ctermfg=NONE ctermbg=255 cterm=NONE term=reverse
+hi Comment guifg=#406090 guibg=NONE guisp=NONE gui=NONE ctermfg=25 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#737373 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#c00058 guibg=NONE guisp=NONE gui=NONE ctermfg=161 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#ffdab9 guibg=#000000 guisp=NONE gui=NONE ctermfg=223 ctermbg=16 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#f5c195 guisp=NONE gui=NONE ctermfg=NONE ctermbg=180 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#f5c195 guisp=NONE gui=NONE ctermfg=NONE ctermbg=180 cterm=NONE term=underline
+hi CursorLineNr guifg=#cd0000 guibg=NONE guisp=NONE gui=bold ctermfg=160 ctermbg=NONE cterm=bold term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#008b8b guibg=NONE guisp=NONE gui=bold ctermfg=30 ctermbg=NONE cterm=bold term=NONE
+hi EndOfBuffer guifg=#737373 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=#ff0000 guibg=#ffffff guisp=NONE gui=bold,reverse ctermfg=196 ctermbg=231 cterm=bold,reverse term=bold,reverse
+hi ErrorMsg guifg=#ff0000 guibg=#ffffff guisp=NONE gui=bold,reverse ctermfg=196 ctermbg=231 cterm=bold,reverse term=bold,reverse
+hi FoldColumn guifg=#406090 guibg=NONE guisp=NONE gui=NONE ctermfg=25 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#000000 guibg=#e3c1a5 guisp=NONE gui=NONE ctermfg=16 ctermbg=252 cterm=NONE term=NONE
+hi Identifier guifg=#008b8b guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#2e8b57 guibg=NONE guisp=NONE gui=reverse ctermfg=29 ctermbg=NONE cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#cd0000 guibg=NONE guisp=NONE gui=NONE ctermfg=160 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#ffdab9 guibg=#6a5acd guisp=NONE gui=NONE ctermfg=223 ctermbg=62 cterm=NONE term=bold,underline
+hi ModeMsg guifg=#000000 guibg=#ffdab9 guisp=NONE gui=bold ctermfg=16 ctermbg=223 cterm=bold term=bold
+hi MoreMsg guifg=#2e8b57 guibg=#ffdab9 guisp=NONE gui=bold ctermfg=29 ctermbg=223 cterm=bold term=NONE
+hi NonText guifg=#737373 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#000000 guibg=#ffaf87 guisp=NONE gui=NONE ctermfg=16 ctermbg=216 cterm=NONE term=reverse
+hi PmenuMatch guifg=#a52a2a guibg=#ffaf87 guisp=NONE gui=NONE ctermfg=124 ctermbg=216 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#a52a2a guibg=#f5c195 guisp=NONE gui=bold ctermfg=124 ctermbg=180 cterm=bold term=bold
+hi PmenuSbar guifg=NONE guibg=#ffdab9 guisp=NONE gui=NONE ctermfg=NONE ctermbg=223 cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#f5c195 guisp=NONE gui=bold ctermfg=16 ctermbg=180 cterm=bold term=bold
+hi PmenuThumb guifg=NONE guibg=#737373 guisp=NONE gui=NONE ctermfg=NONE ctermbg=243 cterm=NONE term=NONE
+hi PreProc guifg=#cd00cd guibg=NONE guisp=NONE gui=NONE ctermfg=164 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#c00058 guibg=NONE guisp=NONE gui=bold ctermfg=161 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#000000 guibg=#ffaf87 guisp=NONE gui=NONE ctermfg=16 ctermbg=216 cterm=NONE term=NONE
+hi Search guifg=#ffdab9 guibg=#cd00cd guisp=NONE gui=NONE ctermfg=223 ctermbg=164 cterm=NONE term=reverse
+hi SignColumn guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#6a5acd guibg=NONE guisp=NONE gui=NONE ctermfg=62 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#737373 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#008b8b guibg=NONE guisp=#008b8b gui=undercurl ctermfg=30 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#cd00cd guibg=NONE guisp=#cd00cd gui=undercurl ctermfg=164 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#6a5acd guibg=NONE guisp=#6a5acd gui=undercurl ctermfg=62 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#a52a2a guibg=NONE guisp=NONE gui=bold ctermfg=124 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#ffffff guibg=#000000 guisp=NONE gui=bold ctermfg=231 ctermbg=16 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#ffdab9 guibg=#737373 guisp=NONE gui=bold ctermfg=223 ctermbg=243 cterm=bold term=bold,underline
+hi StatusLineTerm guifg=#ffffff guibg=#2e8b57 guisp=NONE gui=bold ctermfg=231 ctermbg=29 cterm=bold term=bold,reverse
+hi StatusLineTermNC guifg=#ffdab9 guibg=#008b8b guisp=NONE gui=bold ctermfg=223 ctermbg=30 cterm=bold term=bold,underline
+hi TabLine guifg=#ffdab9 guibg=#737373 guisp=NONE gui=underline ctermfg=223 ctermbg=243 cterm=underline term=bold,underline
+hi TabLineFill guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=NONE
+hi TabLineSel guifg=#000000 guibg=#ffdab9 guisp=NONE gui=bold ctermfg=16 ctermbg=223 cterm=bold term=bold,reverse
+hi Title guifg=#cd00cd guibg=NONE guisp=NONE gui=bold ctermfg=164 ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#6a5acd guibg=#ffff00 guisp=NONE gui=NONE ctermfg=62 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=#ffdab9 guibg=#737373 guisp=NONE gui=bold ctermfg=223 ctermbg=243 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#6a5acd guibg=NONE guisp=NONE gui=underline ctermfg=62 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#ffdab9 guibg=#737373 guisp=NONE gui=NONE ctermfg=223 ctermbg=243 cterm=NONE term=NONE
+hi Visual guifg=#000000 guibg=#cccccc guisp=NONE gui=NONE ctermfg=16 ctermbg=252 cterm=NONE term=reverse
+hi VisualNOS guifg=NONE guibg=#406090 guisp=NONE gui=NONE ctermfg=NONE ctermbg=25 cterm=NONE term=NONE
+hi WarningMsg guifg=#cd00cd guibg=#ffdab9 guisp=NONE gui=bold ctermfg=164 ctermbg=223 cterm=bold term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=bold ctermfg=16 ctermbg=226 cterm=bold term=bold
+hi lCursor guifg=#000000 guibg=#c00058 guisp=NONE gui=NONE ctermfg=16 ctermbg=161 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=black ctermbg=white cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ColorColumn ctermfg=NONE ctermbg=grey cterm=NONE
+  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=white ctermbg=black cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=underline
-  hi QuickFixLine ctermfg=black ctermbg=grey cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=white ctermbg=black cterm=bold
-  hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=bold
-  hi StatusLineTerm ctermfg=white ctermbg=darkgreen cterm=bold
-  hi StatusLineTermNC ctermfg=white ctermbg=darkcyan cterm=bold
-  hi VertSplit ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
-  hi TabLine ctermfg=white ctermbg=darkgrey cterm=underline
-  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold
-  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=black ctermbg=grey cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=darkgrey cterm=NONE
-  hi LineNr ctermfg=red ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
   hi Error ctermfg=darkred ctermbg=white cterm=bold,reverse
   hi ErrorMsg ctermfg=darkred ctermbg=white cterm=bold,reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=white cterm=bold
-  hi ModeMsg ctermfg=black ctermbg=white cterm=bold
-  hi Question ctermfg=darkred ctermbg=NONE cterm=bold
-  hi Todo ctermfg=darkblue ctermbg=yellow cterm=NONE
-  hi MatchParen ctermfg=white ctermbg=darkblue cterm=NONE
-  hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
-  hi ColorColumn ctermfg=NONE ctermbg=grey cterm=NONE
-  hi Cursor ctermfg=white ctermbg=black cterm=NONE
-  hi lCursor ctermfg=black ctermbg=darkred cterm=NONE
+  hi LineNr ctermfg=red ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=white ctermbg=darkblue cterm=NONE
+  hi ModeMsg ctermfg=black ctermbg=white cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=white cterm=bold
+  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkred ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=grey cterm=NONE
+  hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=underline
-  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=white ctermbg=black cterm=bold
+  hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=bold
+  hi StatusLineTerm ctermfg=white ctermbg=darkgreen cterm=bold
+  hi StatusLineTermNC ctermfg=white ctermbg=darkcyan cterm=bold
+  hi TabLine ctermfg=white ctermbg=darkgrey cterm=underline
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=darkblue ctermbg=yellow cterm=NONE
+  hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi Visual ctermfg=black ctermbg=grey cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=bold
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
+  hi lCursor ctermfg=black ctermbg=darkred cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=black ctermbg=gray cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=white ctermbg=black cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=underline
-  hi QuickFixLine ctermfg=gray ctermbg=darkcyan cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse
-  hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse
-  hi StatusLineTerm ctermfg=black ctermbg=gray cterm=bold,reverse
-  hi StatusLineTermNC ctermfg=black ctermbg=gray cterm=reverse
-  hi VertSplit ctermfg=black ctermbg=gray cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi TabLine ctermfg=gray ctermbg=black cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=black ctermbg=white cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
-  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi LineNr ctermfg=black ctermbg=NONE cterm=bold
-  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
   hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse
   hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi ModeMsg ctermfg=black ctermbg=NONE cterm=bold
-  hi Question ctermfg=darkred ctermbg=NONE cterm=bold
-  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
-  hi MatchParen ctermfg=gray ctermbg=darkblue cterm=NONE
-  hi Search ctermfg=gray ctermbg=darkmagenta cterm=NONE
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi LineNr ctermfg=black ctermbg=NONE cterm=bold
+  hi MatchParen ctermfg=gray ctermbg=darkblue cterm=NONE
+  hi ModeMsg ctermfg=black ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkred ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=gray ctermbg=darkcyan cterm=NONE
+  hi Search ctermfg=gray ctermbg=darkmagenta cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=bold
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
   hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse
   hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=reverse
-  hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse
+  hi StatusLineTerm ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=black ctermbg=gray cterm=reverse
+  hi TabLine ctermfg=gray ctermbg=black cterm=NONE
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi TabLineSel ctermfg=black ctermbg=white cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=darkblue ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=black ctermbg=gray cterm=reverse
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi lCursor ctermfg=black ctermbg=darkred cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: light
-" Color: comment     #406090        25             darkgrey
-" Color: constant    #c00058        161            darkred
-" Color: identifier  #008b8b        30             darkcyan
-" Color: statement   #a52a2a        124            darkred
-" Color: preproc     #cd00cd        164            darkmagenta
-" Color: type        #2e8b57        29             darkgreen
-" Color: special     #6a5acd        62             darkblue
-" Color: fg0         #000000        16             black
-" Color: bg0         #ffdab9        223            white
-" Color: fg1         #ffffff        231            white
-" Color: bg1         #737373        243            darkgrey
-" Color: visual      #cccccc        252            grey
-" Color: folded      #e3c1a5        252            cyan
-" Color: folded_fg   #000000        16             black
-" Color: cursorline  #f5c195        180            yellow
-" Color: pmenu       #ffaf87        216            grey
-" Color: wildmenu    #ffff00        226            yellow
-" Color: error       #ff0000        196            darkred
-" Color: linenr      #cd0000        160            red
-" Color: blue        #0000ff        21             darkblue
-" Color: red         #ff0000        196            darkred
-" Color: colorcolumn #eeeeee        255            grey
-" Color: black       #000000        16             black
-" Color: darkred     #870000        88             darkred
-" Color: darkgreen   #008700        28             darkgreen
-" Color: darkyellow  #878700        100            darkyellow
-" Color: darkblue    #000087        18             darkblue
-" Color: darkmagenta #870087        18             darkmagenta
-" Color: darkcyan    #008787        30             darkcyan
-" Color: gray        #878787        102            gray
-" Term colors: bg0     statement constant preproc identifier type special bg1
-" Term colors: comment statement constant preproc identifier type special fg0
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/ron.vim

@@ -1,23 +1,28 @@
 " Name:         ron
 " Author:       original author Ron Aaron <ron@ronware.org>
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
-" Website:      https://www.github.com/vim/colorschemes
+" URL:          https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2024 Aug 15
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'ron'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 
-hi! link Terminal Normal
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Statement
+hi! link CurSearch Search
+hi! link CursorLineFold CursorLine
+hi! link CursorLineSign CursorLine
 hi! link Debug Special
 hi! link Define PreProc
 hi! link Delimiter Special
@@ -26,9 +31,12 @@ hi! link Float Constant
 hi! link Function Identifier
 hi! link Include PreProc
 hi! link Keyword Statement
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link Macro PreProc
+hi! link MessageWindow Pmenu
 hi! link Number Constant
-hi! link PopupSelected PmenuSel
+hi! link PopupNotification Todo
 hi! link PreCondit PreProc
 hi! link Repeat Statement
 hi! link SpecialChar Special
@@ -38,415 +46,231 @@ hi! link StatusLineTermNC StatusLineNC
 hi! link StorageClass Type
 hi! link String Constant
 hi! link Structure Type
+hi! link TabPanel EndOfBuffer
+hi! link TabPanelFill EndOfBuffer
+hi! link TabPanelSel TabLineSel
 hi! link Tag Special
 hi! link Typedef Type
 hi! link lCursor Cursor
-hi! link CurSearch Search
-hi! link CursorLineFold CursorLine
-hi! link CursorLineSign CursorLine
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi Normal guifg=#00ffff guibg=#000000 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#cd0000 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=NONE
-hi QuickFixLine guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
-hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi Cursor guifg=#ffffff guibg=#60a060 gui=NONE cterm=NONE
-hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#ffff00 guibg=#303030 gui=NONE cterm=NONE
-hi ErrorMsg guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi FoldColumn guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=NONE guibg=#4d4d4d gui=NONE cterm=NONE
-hi IncSearch guifg=NONE guibg=#4682b4 gui=NONE cterm=NONE
-hi LineNr guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=NONE
-hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=NONE
-hi NonText guifg=#ffff00 guibg=#303030 gui=NONE cterm=NONE
-hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#000000 gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#e5e5e5 gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ff00ff guibg=#444444 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff00ff guibg=#00cdcd gui=NONE cterm=NONE
-hi Question guifg=#00ff00 guibg=#000000 gui=bold cterm=NONE
-hi Search guifg=#000000 guibg=#a9a9a9 gui=bold cterm=NONE
-hi SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi StatusLine guifg=#00ffff guibg=#0000ff gui=bold cterm=NONE
-hi StatusLineNC guifg=#add8e6 guibg=#00008b gui=NONE cterm=NONE
-hi VertSplit guifg=#add8e6 guibg=#00008b gui=NONE cterm=NONE
-hi TabLine guifg=#000000 guibg=#008b8b gui=NONE cterm=NONE
-hi TabLineFill guifg=#a9a9a9 guibg=#7f7f7f gui=NONE cterm=NONE
-hi TabLineSel guifg=#00ffff guibg=#000000 gui=bold cterm=NONE
-hi Terminal guifg=#00ffff guibg=#000000 gui=NONE cterm=NONE
-hi Title guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi VisualNOS guifg=NONE guibg=#000000 gui=bold,underline cterm=underline
-hi WarningMsg guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#ffffff guibg=NONE guisp=#ffffff gui=undercurl cterm=underline
-hi SpellLocal guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl cterm=underline
-hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi Comment guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#00ffff guibg=NONE gui=bold cterm=NONE
-hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi Identifier guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#000000 guibg=#000000 gui=NONE cterm=NONE
-hi Label guifg=#eec900 guibg=NONE gui=NONE cterm=NONE
-hi Operator guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#eea9b8 guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#add8e6 guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#000000 guibg=#ffa500 gui=NONE cterm=NONE
-hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=NONE
-hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
-hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=NONE
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi Normal guifg=#00ffff guibg=#000000 guisp=NONE gui=NONE ctermfg=51 ctermbg=16 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#cd0000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=160 cterm=NONE term=reverse
+hi Comment guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=59 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#00ffff guibg=NONE guisp=NONE gui=bold ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#ffffff guibg=#60a060 guisp=NONE gui=NONE ctermfg=231 ctermbg=71 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=59 cterm=NONE term=NONE
+hi CursorIM guifg=NONE guibg=fg guisp=NONE gui=NONE ctermfg=NONE ctermbg=fg cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=59 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffff00 guibg=NONE guisp=NONE gui=bold ctermfg=226 ctermbg=NONE cterm=NONE term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi EndOfBuffer guifg=#ffff00 guibg=#303030 guisp=NONE gui=NONE ctermfg=226 ctermbg=236 cterm=NONE term=NONE
+hi Error guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#ffffff guibg=NONE guisp=NONE gui=NONE ctermfg=231 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=NONE guibg=#4d4d4d guisp=NONE gui=NONE ctermfg=NONE ctermbg=239 cterm=NONE term=NONE
+hi Identifier guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#000000 guibg=#000000 guisp=NONE gui=NONE ctermfg=16 ctermbg=16 cterm=NONE term=NONE
+hi IncSearch guifg=NONE guibg=#4682b4 guisp=NONE gui=NONE ctermfg=NONE ctermbg=67 cterm=NONE term=bold,reverse,underline
+hi Label guifg=#eec900 guibg=NONE guisp=NONE gui=NONE ctermfg=220 ctermbg=NONE cterm=NONE term=NONE
+hi LineNr guifg=#a9a9a9 guibg=NONE guisp=NONE gui=NONE ctermfg=145 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=NONE guibg=#008b8b guisp=NONE gui=NONE ctermfg=NONE ctermbg=44 cterm=NONE term=bold,underline
+hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=NONE term=bold
+hi MoreMsg guifg=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=NONE term=NONE
+hi NonText guifg=#ffff00 guibg=#303030 guisp=NONE gui=NONE ctermfg=226 ctermbg=236 cterm=NONE term=NONE
+hi Operator guifg=#ffa500 guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#ffffff guibg=#444444 guisp=NONE gui=NONE ctermfg=231 ctermbg=238 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ff00ff guibg=#444444 guisp=NONE gui=NONE ctermfg=201 ctermbg=238 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#00cdcd guisp=NONE gui=NONE ctermfg=201 ctermbg=44 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=NONE
+hi PreProc guifg=#eea9b8 guibg=NONE guisp=NONE gui=NONE ctermfg=217 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#00ff00 guibg=#000000 guisp=NONE gui=bold ctermfg=46 ctermbg=16 cterm=NONE term=standout
+hi QuickFixLine guifg=#000000 guibg=#00cdcd guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=NONE
+hi Search guifg=#000000 guibg=#a9a9a9 guisp=NONE gui=bold ctermfg=16 ctermbg=145 cterm=NONE term=reverse
+hi SignColumn guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#ffffff guibg=NONE guisp=#ffffff gui=undercurl ctermfg=231 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl ctermfg=226 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=201 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#add8e6 guibg=NONE guisp=NONE gui=NONE ctermfg=152 ctermbg=NONE cterm=NONE term=NONE
+hi StatusLine guifg=#00ffff guibg=#0000ff guisp=NONE gui=bold ctermfg=51 ctermbg=21 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#add8e6 guibg=#00008b guisp=NONE gui=NONE ctermfg=152 ctermbg=20 cterm=NONE term=bold,underline
+hi TabLine guifg=#000000 guibg=#008b8b guisp=NONE gui=NONE ctermfg=16 ctermbg=44 cterm=NONE term=bold,underline
+hi TabLineFill guifg=#a9a9a9 guibg=#7f7f7f guisp=NONE gui=NONE ctermfg=145 ctermbg=102 cterm=NONE term=NONE
+hi TabLineSel guifg=#00ffff guibg=#000000 guisp=NONE gui=bold ctermfg=51 ctermbg=16 cterm=NONE term=bold,reverse
+hi Terminal guifg=#00ffff guibg=#000000 guisp=NONE gui=NONE ctermfg=51 ctermbg=16 cterm=NONE term=NONE
+hi Title guifg=#a9a9a9 guibg=NONE guisp=NONE gui=NONE ctermfg=145 ctermbg=NONE cterm=NONE term=NONE
+hi Todo guifg=#000000 guibg=#ffa500 guisp=NONE gui=NONE ctermfg=16 ctermbg=214 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=#000000 guibg=#e5e5e5 guisp=NONE gui=bold ctermfg=16 ctermbg=254 cterm=NONE term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=NONE term=NONE
+hi Underlined guifg=#80a0ff guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#add8e6 guibg=#00008b guisp=NONE gui=NONE ctermfg=152 ctermbg=20 cterm=NONE term=NONE
+hi Visual guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=reverse
+hi VisualNOS guifg=NONE guibg=#000000 guisp=NONE gui=bold,underline ctermfg=NONE ctermbg=16 cterm=underline term=NONE
+hi WarningMsg guifg=#ffff00 guibg=NONE guisp=NONE gui=NONE ctermfg=226 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
 
-if s:t_Co >= 256
-  hi Normal ctermfg=51 ctermbg=16 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=160 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=59 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=59 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=16 ctermbg=44 cterm=NONE
-  hi Conceal ctermfg=59 ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=231 ctermbg=71 cterm=NONE
-  hi Directory ctermfg=51 ctermbg=NONE cterm=NONE
-  hi EndOfBuffer ctermfg=226 ctermbg=236 cterm=NONE
-  hi ErrorMsg ctermfg=196 ctermbg=231 cterm=reverse
-  hi FoldColumn ctermfg=231 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=NONE ctermbg=239 cterm=NONE
-  hi IncSearch ctermfg=NONE ctermbg=67 cterm=NONE
-  hi LineNr ctermfg=145 ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=NONE ctermbg=44 cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=226 ctermbg=236 cterm=NONE
-  hi Pmenu ctermfg=231 ctermbg=238 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=16 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=44 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=254 cterm=NONE
-  hi PmenuMatch ctermfg=201 ctermbg=238 cterm=NONE
-  hi PmenuMatchSel ctermfg=201 ctermbg=44 cterm=NONE
-  hi Question ctermfg=46 ctermbg=16 cterm=NONE
-  hi Search ctermfg=16 ctermbg=145 cterm=NONE
-  hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=51 ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=51 ctermbg=21 cterm=NONE
-  hi StatusLineNC ctermfg=152 ctermbg=20 cterm=NONE
-  hi VertSplit ctermfg=152 ctermbg=20 cterm=NONE
-  hi TabLine ctermfg=16 ctermbg=44 cterm=NONE
-  hi TabLineFill ctermfg=145 ctermbg=102 cterm=NONE
-  hi TabLineSel ctermfg=51 ctermbg=16 cterm=NONE
-  hi Terminal ctermfg=51 ctermbg=16 cterm=NONE
-  hi Title ctermfg=145 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=16 cterm=underline
-  hi WarningMsg ctermfg=226 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=231 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=226 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=201 ctermbg=NONE cterm=underline
-  hi Comment ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi Identifier ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=16 ctermbg=16 cterm=NONE
-  hi Label ctermfg=220 ctermbg=NONE cterm=NONE
-  hi Operator ctermfg=214 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=217 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=226 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=152 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=16 ctermbg=214 cterm=NONE
-  hi Type ctermfg=29 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=NONE
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=cyan ctermbg=black cterm=NONE
   hi ColorColumn ctermfg=cyan ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=green ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=white ctermbg=green cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
-  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=white ctermbg=green cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
   hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=yellow ctermbg=darkgrey cterm=NONE
+  hi Error ctermfg=red ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=red ctermbg=white cterm=reverse
   hi FoldColumn ctermfg=white ctermbg=NONE cterm=NONE
   hi Folded ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=black cterm=NONE
   hi IncSearch ctermfg=NONE ctermbg=blue cterm=NONE
+  hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
   hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=yellow ctermbg=darkgrey cterm=NONE
+  hi Operator ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
-  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=black cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
   hi Search ctermfg=black ctermbg=grey cterm=NONE
   hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=yellow ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=white ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=yellow ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=cyan ctermbg=darkblue cterm=NONE
   hi StatusLineNC ctermfg=darkcyan ctermbg=darkblue cterm=NONE
-  hi VertSplit ctermfg=darkcyan ctermbg=darkblue cterm=NONE
   hi TabLine ctermfg=black ctermbg=darkcyan cterm=NONE
   hi TabLineFill ctermfg=grey ctermbg=darkgrey cterm=NONE
   hi TabLineSel ctermfg=cyan ctermbg=black cterm=NONE
   hi Terminal ctermfg=cyan ctermbg=black cterm=NONE
   hi Title ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=darkcyan ctermbg=darkblue cterm=NONE
   hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
   hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
   hi WarningMsg ctermfg=yellow ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
-  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=white ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=yellow ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
-  hi Comment ctermfg=green ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Error ctermfg=red ctermbg=white cterm=reverse
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=black ctermbg=black cterm=NONE
-  hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Operator ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Special ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=darkcyan ctermbg=black cterm=NONE
   hi ColorColumn ctermfg=darkcyan ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=grey cterm=NONE
+  hi Constant ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Cursor ctermfg=white ctermbg=green cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=underline
-  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=grey cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
   hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi EndOfBuffer ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=grey cterm=bold,reverse
   hi ErrorMsg ctermfg=darkred ctermbg=grey cterm=reverse
   hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkcyan ctermbg=black cterm=reverse
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=black cterm=NONE
   hi IncSearch ctermfg=darkyellow ctermbg=darkblue cterm=NONE
+  hi Label ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi LineNr ctermfg=grey ctermbg=NONE cterm=bold
   hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=bold
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Operator ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=grey ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=grey ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
-  hi PmenuMatch ctermfg=grey ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkgreen ctermbg=black cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
   hi Search ctermfg=black ctermbg=grey cterm=NONE
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
+  hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
   hi StatusLine ctermfg=darkblue ctermbg=grey cterm=bold,reverse
   hi StatusLineNC ctermfg=darkblue ctermbg=grey cterm=reverse
-  hi VertSplit ctermfg=darkblue ctermbg=darkblue cterm=NONE
   hi TabLine ctermfg=black ctermbg=darkcyan cterm=NONE
   hi TabLineFill ctermfg=darkblue ctermbg=darkblue cterm=NONE
   hi TabLineSel ctermfg=darkcyan ctermbg=black cterm=bold
   hi Terminal ctermfg=darkcyan ctermbg=black cterm=NONE
   hi Title ctermfg=grey ctermbg=NONE cterm=bold
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=bold
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=darkblue ctermbg=darkblue cterm=NONE
   hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
   hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
   hi WarningMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkgreen cterm=NONE
-  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
-  hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=reverse
-  hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi SpellRare ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
-  hi Comment ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Error ctermfg=darkred ctermbg=grey cterm=bold,reverse
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=black ctermbg=black cterm=NONE
-  hi Label ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Operator ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Todo ctermfg=black ctermbg=darkyellow cterm=bold
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
   finish
 endif
 
-" Background: dark
-" Color: xterm0         #000000          16                black
-" Color: xterm1         #cd0000          160               darkred
-" Color: xterm2         #00cd00          40                darkgreen
-" Color: xterm3         #cdcd00          184               darkyellow
-" Color: xterm4         #0000ee          20                darkblue
-" Color: xterm5         #cd00cd          164               darkmagenta
-" Color: xterm6         #00cdcd          44                darkcyan
-" Color: xterm7         #e5e5e5          254               grey
-" Color: xterm8         #7f7f7f          102               darkgrey
-" Color: xterm9         #ff0000          196               red
-" Color: xterm10        #00ff00          46                green
-" Color: xterm11        #ffff00          226               yellow
-" Color: xterm12        #5c5cff          63                blue
-" Color: xterm13        #ff00ff          201               magenta
-" Color: xterm14        #00ffff          51                cyan
-" Color: xterm15        #ffffff          231               white
-" Color: rgbGrey40      #666666          59                darkgrey
-" Color: rgbDarkGrey    #a9a9a9          145               grey
-" Color: rgbDarkBlue    #00008b          20                darkblue
-" Color: rgbBlue        #0000ff          21                darkblue
-" Color: rgbDarkCyan    #008b8b          44                darkcyan
-" Color: Directory      #00ffff          51                cyan
-" Color: rgbSeaGreen    #2e8b57          29                darkgreen
-" Color: rgbGrey        #bebebe          250               grey
-" Color: Question       #00ff00          46                green
-" Color: SignColumn     #a9a9a9          248               grey
-" Color: SpecialKey     #00ffff          51                cyan
-" Color: StatusLineTerm #90ee90          120               darkgreen
-" Color: ToolbarLine    #7f7f7f          244               darkgrey
-" Color: Underlined     #80a0ff          111               blue
-" Color: Pmenu          #444444          238               darkgrey
-" Color: ron303030      #303030          236               darkgrey
-" Color: ronLightBlue   #add8e6          152               darkcyan
-" Color: ronPink2       #eea9b8          217               darkmagenta
-" Color: ronOrange      #ffa500          214               darkyellow
-" Color: ronCursor      #60a060          71                green
-" Color: ronSteelBlue   #4682b4          67                blue
-" Color: ronGold2       #eec900          220               yellow
-" Color: ronDarkGreen   #006400          22                darkgreen
-" Color: ronSlateBlue   #6a5acd          62                blue
-" Color: ronOliveDrab   #6b8e23          64                green
-" Color: ronCoral       #ff7f50          209               red
-" Color: ronGray30      #4d4d4d          239               darkgrey
-" Term colors: xterm0 xterm1 xterm2 xterm3 xterm4 xterm5 xterm6 xterm7
-" Term colors: xterm8 xterm9 xterm10 xterm11 xterm12 xterm13
-" Term colors: xterm14 xterm15
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/shine.vim

@@ -2,425 +2,259 @@
 " Description:  Light colorscheme inspired by normal text editors.
 " Author:       Original author is Yasuhiro Matsumoto <mattn@mail.goo.ne.jp>
 " Maintainer:   Original maintainer is Yasuhiro Matsumoto <mattn@mail.goo.ne.jp>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=light
 
 hi clear
 let g:colors_name = 'shine'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#000000', '#8b0000', '#006400', '#ffff00', '#00008b', '#6a0dad', '#008b8b', '#dadada', '#767676', '#ffafaf', '#90ee90', '#ffff60', '#add8e6', '#ff00ff', '#00ffff', '#ffffff']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#8b0000', '#006400', '#ffff00', '#00008b', '#6a0dad', '#008b8b', '#dadada', '#767676', '#ffafaf', '#90ee90', '#ffff60', '#add8e6', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link EndOfBuffer NonText
 hi! link ErrorMsg Error
-hi! link Tag Special
-hi! link Operator Statement
+hi! link Function Identifier
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
+hi! link Operator Statement
 hi! link PopupNotification Todo
-hi! link PopupSelected PmenuSel
-hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
-hi Folded guifg=#00008b guibg=#dadada gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#dadada gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#dadada gui=NONE cterm=NONE
-hi CursorLineNr guifg=NONE guibg=#dadada gui=NONE cterm=NONE
-hi QuickFixLine guifg=#000000 guibg=#ff8c00 gui=NONE cterm=NONE
-hi StatusLine guifg=#ffffff guibg=#000000 gui=bold cterm=bold
-hi StatusLineNC guifg=#ffffff guibg=#a8a8a8 gui=NONE cterm=NONE
-hi StatusLineTerm guifg=#000000 guibg=#90ee90 gui=bold cterm=bold
-hi StatusLineTermNC guifg=#dadada guibg=#006400 gui=NONE cterm=NONE
-hi VertSplit guifg=#a8a8a8 guibg=#a8a8a8 gui=NONE cterm=NONE
-hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#ffff60 gui=NONE cterm=NONE
-hi PmenuSbar guifg=#ffffff guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuThumb guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ff0000 guibg=#a8a8a8 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff0000 guibg=#ffff60 gui=NONE cterm=NONE
-hi TabLine guifg=#000000 guibg=#dadada gui=underline cterm=underline
-hi TabLineFill guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi TabLineSel guifg=#000000 guibg=#ffffff gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=NONE guibg=#a8a8a8 gui=bold cterm=bold
-hi NonText guifg=#add8e6 guibg=#ffffff gui=NONE cterm=NONE
-hi SpecialKey guifg=#add8e6 guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
-hi VisualNOS guifg=NONE guibg=NONE gui=bold,underline ctermfg=NONE ctermbg=NONE cterm=underline
-hi LineNr guifg=#767676 guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#767676 guibg=NONE gui=NONE cterm=NONE
-hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Underlined guifg=#6a0dad guibg=NONE gui=underline cterm=underline
-hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi WarningMsg guifg=#6a0dad guibg=#ffffff gui=NONE cterm=NONE
-hi MoreMsg guifg=#006400 guibg=#ffffff gui=NONE cterm=NONE
-hi ModeMsg guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
-hi Question guifg=#a07070 guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi MatchParen guifg=#ffffff guibg=#ffafaf gui=NONE cterm=NONE
-hi Search guifg=#ffffff guibg=#6a0dad gui=NONE cterm=NONE
-hi IncSearch guifg=#008b8b guibg=#ffff00 gui=reverse cterm=reverse
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold
-hi ColorColumn guifg=#000000 guibg=#ffafaf gui=NONE cterm=NONE
-hi Cursor guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
-hi lCursor guifg=#000000 guibg=#a07070 gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#2e8b57 guibg=NONE guisp=#2e8b57 gui=undercurl cterm=underline
-hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi SpellRare guifg=#00008b guibg=NONE guisp=#00008b gui=undercurl cterm=underline
-hi Statement guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
-hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
-hi Comment guifg=#a8a8a8 guibg=NONE gui=bold cterm=NONE
-hi StorageClass guifg=#ff0000 guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#add8e6 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#a07070 guibg=NONE gui=NONE cterm=NONE
-hi Number guifg=#a07070 guibg=NONE gui=bold cterm=bold
-hi Float guifg=#a07070 guibg=NONE gui=bold cterm=bold
-hi PreProc guifg=#6a0dad guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ff8c00 guibg=NONE gui=NONE cterm=NONE
-hi SpecialChar guifg=#00008b guibg=NONE gui=NONE cterm=NONE
-hi Directory guifg=#008b8b guibg=NONE gui=bold cterm=bold
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#006400 guibg=NONE gui=bold cterm=bold
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link TabPanel Normal
+hi! link TabPanelFill EndOfBuffer
+hi! link Tag Special
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link EndOfBuffer NonText
-  hi! link ErrorMsg Error
-  hi! link Tag Special
-  hi! link Operator Statement
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi! link PopupSelected PmenuSel
-  hi Normal ctermfg=16 ctermbg=231 cterm=NONE
-  hi Folded ctermfg=18 ctermbg=253 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=253 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=253 cterm=NONE
-  hi CursorLineNr ctermfg=NONE ctermbg=253 cterm=NONE
-  hi QuickFixLine ctermfg=16 ctermbg=208 cterm=NONE
-  hi StatusLine ctermfg=231 ctermbg=16 cterm=bold
-  hi StatusLineNC ctermfg=231 ctermbg=248 cterm=NONE
-  hi StatusLineTerm ctermfg=16 ctermbg=120 cterm=bold
-  hi StatusLineTermNC ctermfg=253 ctermbg=22 cterm=NONE
-  hi VertSplit ctermfg=248 ctermbg=248 cterm=NONE
-  hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=228 cterm=NONE
-  hi PmenuSbar ctermfg=231 ctermbg=231 cterm=NONE
-  hi PmenuThumb ctermfg=243 ctermbg=243 cterm=NONE
-  hi PmenuMatch ctermfg=196 ctermbg=248 cterm=NONE
-  hi PmenuMatchSel ctermfg=196 ctermbg=228 cterm=NONE
-  hi TabLine ctermfg=16 ctermbg=253 cterm=underline
-  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=16 ctermbg=231 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=248 cterm=bold
-  hi NonText ctermfg=153 ctermbg=231 cterm=NONE
-  hi SpecialKey ctermfg=153 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=16 ctermbg=248 cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi LineNr ctermfg=243 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=243 ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=55 ctermbg=NONE cterm=underline
-  hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi WarningMsg ctermfg=55 ctermbg=231 cterm=NONE
-  hi MoreMsg ctermfg=22 ctermbg=231 cterm=NONE
-  hi ModeMsg ctermfg=16 ctermbg=231 cterm=NONE
-  hi Question ctermfg=95 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=16 ctermbg=226 cterm=NONE
-  hi MatchParen ctermfg=231 ctermbg=217 cterm=NONE
-  hi Search ctermfg=231 ctermbg=55 cterm=NONE
-  hi IncSearch ctermfg=30 ctermbg=226 cterm=reverse
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=bold
-  hi ColorColumn ctermfg=16 ctermbg=217 cterm=NONE
-  hi Cursor ctermfg=231 ctermbg=16 cterm=NONE
-  hi lCursor ctermfg=16 ctermbg=95 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=29 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=201 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=18 ctermbg=NONE cterm=underline
-  hi Statement ctermfg=29 ctermbg=NONE cterm=bold
-  hi Type ctermfg=29 ctermbg=NONE cterm=bold
-  hi Comment ctermfg=248 ctermbg=NONE cterm=NONE
-  hi StorageClass ctermfg=196 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=153 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=95 ctermbg=NONE cterm=NONE
-  hi Number ctermfg=95 ctermbg=NONE cterm=bold
-  hi Float ctermfg=95 ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=55 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=208 ctermbg=NONE cterm=NONE
-  hi SpecialChar ctermfg=18 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=30 ctermbg=NONE cterm=bold
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=22 ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=NONE
+hi ColorColumn guifg=#000000 guibg=#ffafaf guisp=NONE gui=NONE ctermfg=16 ctermbg=217 cterm=NONE term=reverse
+hi Comment guifg=#a8a8a8 guibg=NONE guisp=NONE gui=bold ctermfg=248 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#add8e6 guibg=NONE guisp=NONE gui=NONE ctermfg=153 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#a07070 guibg=NONE guisp=NONE gui=NONE ctermfg=95 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#dadada guisp=NONE gui=NONE ctermfg=NONE ctermbg=253 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#dadada guisp=NONE gui=NONE ctermfg=NONE ctermbg=253 cterm=NONE term=underline
+hi CursorLineNr guifg=NONE guibg=#dadada guisp=NONE gui=NONE ctermfg=NONE ctermbg=253 cterm=NONE term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#008b8b guibg=NONE guisp=NONE gui=bold ctermfg=30 ctermbg=NONE cterm=bold term=NONE
+hi Error guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi Float guifg=#a07070 guibg=NONE guisp=NONE gui=bold ctermfg=95 ctermbg=NONE cterm=bold term=NONE
+hi FoldColumn guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00008b guibg=#dadada guisp=NONE gui=NONE ctermfg=18 ctermbg=253 cterm=NONE term=NONE
+hi Identifier guifg=#008b8b guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#008b8b guibg=#ffff00 guisp=NONE gui=reverse ctermfg=30 ctermbg=226 cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#767676 guibg=NONE guisp=NONE gui=NONE ctermfg=243 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#ffffff guibg=#ffafaf guisp=NONE gui=NONE ctermfg=231 ctermbg=217 cterm=NONE term=bold,underline
+hi ModeMsg guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=bold
+hi MoreMsg guifg=#006400 guibg=#ffffff guisp=NONE gui=NONE ctermfg=22 ctermbg=231 cterm=NONE term=NONE
+hi NonText guifg=#add8e6 guibg=#ffffff guisp=NONE gui=NONE ctermfg=153 ctermbg=231 cterm=NONE term=NONE
+hi Number guifg=#a07070 guibg=NONE guisp=NONE gui=bold ctermfg=95 ctermbg=NONE cterm=bold term=NONE
+hi Pmenu guifg=#000000 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ff0000 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=196 ctermbg=248 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff0000 guibg=#ffff60 guisp=NONE gui=NONE ctermfg=196 ctermbg=228 cterm=NONE term=NONE
+hi PmenuSbar guifg=#ffffff guibg=#ffffff guisp=NONE gui=NONE ctermfg=231 ctermbg=231 cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#ffff60 guisp=NONE gui=NONE ctermfg=16 ctermbg=228 cterm=NONE term=bold
+hi PmenuThumb guifg=#767676 guibg=#767676 guisp=NONE gui=NONE ctermfg=243 ctermbg=243 cterm=NONE term=NONE
+hi PreProc guifg=#6a0dad guibg=NONE guisp=NONE gui=NONE ctermfg=55 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#a07070 guibg=NONE guisp=NONE gui=NONE ctermfg=95 ctermbg=NONE cterm=NONE term=standout
+hi QuickFixLine guifg=#000000 guibg=#ff8c00 guisp=NONE gui=NONE ctermfg=16 ctermbg=208 cterm=NONE term=NONE
+hi Search guifg=#ffffff guibg=#6a0dad guisp=NONE gui=NONE ctermfg=231 ctermbg=55 cterm=NONE term=reverse
+hi SignColumn guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ff8c00 guibg=NONE guisp=NONE gui=NONE ctermfg=208 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialChar guifg=#00008b guibg=NONE guisp=NONE gui=NONE ctermfg=18 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#add8e6 guibg=NONE guisp=NONE gui=NONE ctermfg=153 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#2e8b57 guibg=NONE guisp=#2e8b57 gui=undercurl ctermfg=29 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=201 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#00008b guibg=NONE guisp=#00008b gui=undercurl ctermfg=18 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#ffffff guibg=#000000 guisp=NONE gui=bold ctermfg=231 ctermbg=16 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#ffffff guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=231 ctermbg=248 cterm=NONE term=bold,underline
+hi StatusLineTerm guifg=#000000 guibg=#90ee90 guisp=NONE gui=bold ctermfg=16 ctermbg=120 cterm=bold term=bold,reverse
+hi StatusLineTermNC guifg=#dadada guibg=#006400 guisp=NONE gui=NONE ctermfg=253 ctermbg=22 cterm=NONE term=bold,underline
+hi StorageClass guifg=#ff0000 guibg=NONE guisp=NONE gui=bold ctermfg=196 ctermbg=NONE cterm=bold term=bold
+hi TabLine guifg=#000000 guibg=#dadada guisp=NONE gui=underline ctermfg=16 ctermbg=253 cterm=underline term=bold,underline
+hi TabLineFill guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=NONE
+hi TabLineSel guifg=#000000 guibg=#ffffff guisp=NONE gui=bold ctermfg=16 ctermbg=231 cterm=bold term=bold,reverse
+hi Title guifg=#006400 guibg=NONE guisp=NONE gui=bold ctermfg=22 ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=NONE guibg=#a8a8a8 guisp=NONE gui=bold ctermfg=NONE ctermbg=248 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#6a0dad guibg=NONE guisp=NONE gui=underline ctermfg=55 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#a8a8a8 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=248 ctermbg=248 cterm=NONE term=NONE
+hi Visual guifg=#000000 guibg=#a8a8a8 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=reverse
+hi VisualNOS guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=underline term=NONE
+hi WarningMsg guifg=#6a0dad guibg=#ffffff guisp=NONE gui=NONE ctermfg=55 ctermbg=231 cterm=NONE term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=bold ctermfg=16 ctermbg=226 cterm=bold term=bold
+hi lCursor guifg=#000000 guibg=#a07070 guisp=NONE gui=NONE ctermfg=16 ctermbg=95 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=black ctermbg=white cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ColorColumn ctermfg=black ctermbg=red cterm=NONE
+  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=white ctermbg=black cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi StatusLine ctermfg=white ctermbg=black cterm=bold
-  hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi StatusLineTerm ctermfg=black ctermbg=green cterm=bold
-  hi StatusLineTermNC ctermfg=grey ctermbg=darkgreen cterm=NONE
-  hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Error ctermfg=red ctermbg=white cterm=reverse
+  hi Float ctermfg=darkred ctermbg=NONE cterm=bold
+  hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=darkcyan ctermbg=yellow cterm=reverse
+  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=white ctermbg=red cterm=NONE
+  hi ModeMsg ctermfg=black ctermbg=white cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=white cterm=NONE
+  hi NonText ctermfg=blue ctermbg=white cterm=NONE
+  hi Number ctermfg=darkred ctermbg=NONE cterm=bold
   hi Pmenu ctermfg=black ctermbg=darkgrey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
-  hi PmenuSbar ctermfg=white ctermbg=white cterm=NONE
-  hi PmenuThumb ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
   hi PmenuMatch ctermfg=black ctermbg=darkgrey cterm=bold
   hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
-  hi TabLine ctermfg=black ctermbg=grey cterm=underline
-  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=darkgrey cterm=bold
-  hi NonText ctermfg=blue ctermbg=white cterm=NONE
-  hi SpecialKey ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=black ctermbg=darkgrey cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=darkmagenta ctermbg=NONE cterm=underline
-  hi Error ctermfg=red ctermbg=white cterm=reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=white cterm=NONE
-  hi ModeMsg ctermfg=black ctermbg=white cterm=NONE
+  hi PmenuSbar ctermfg=white ctermbg=white cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
+  hi PmenuThumb ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
-  hi MatchParen ctermfg=white ctermbg=red cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
   hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE
-  hi IncSearch ctermfg=darkcyan ctermbg=yellow cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
-  hi ColorColumn ctermfg=black ctermbg=red cterm=NONE
-  hi Cursor ctermfg=white ctermbg=black cterm=NONE
-  hi lCursor ctermfg=black ctermbg=darkred cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi SpecialChar ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=blue ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=magenta ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=underline
   hi Statement ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=white ctermbg=black cterm=bold
+  hi StatusLineNC ctermfg=white ctermbg=darkgrey cterm=NONE
+  hi StatusLineTerm ctermfg=black ctermbg=green cterm=bold
+  hi StatusLineTermNC ctermfg=grey ctermbg=darkgreen cterm=NONE
   hi StorageClass ctermfg=red ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Number ctermfg=darkred ctermbg=NONE cterm=bold
-  hi Float ctermfg=darkred ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi SpecialChar ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi TabLine ctermfg=black ctermbg=grey cterm=underline
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
   hi Title ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
+  hi ToolbarButton ctermfg=NONE ctermbg=darkgrey cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=darkmagenta ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
+  hi Visual ctermfg=black ctermbg=darkgrey cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
+  hi lCursor ctermfg=black ctermbg=darkred cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=black ctermbg=grey cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=black ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=white ctermbg=black cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=grey cterm=bold,reverse
-  hi StatusLineNC ctermfg=black ctermbg=grey cterm=reverse
-  hi StatusLineTerm ctermfg=black ctermbg=darkgreen cterm=bold,reverse
-  hi StatusLineTermNC ctermfg=grey ctermbg=darkgreen cterm=reverse
-  hi VertSplit ctermfg=black ctermbg=grey cterm=reverse
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Error ctermfg=darkred ctermbg=NONE cterm=bold,reverse
+  hi Float ctermfg=darkred ctermbg=NONE cterm=bold
+  hi FoldColumn ctermfg=grey ctermbg=NONE cterm=bold
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=darkcyan ctermbg=darkyellow cterm=reverse
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MatchParen ctermfg=grey ctermbg=darkred cterm=NONE
+  hi ModeMsg ctermfg=black ctermbg=NONE cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Number ctermfg=darkred ctermbg=NONE cterm=bold
   hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuSbar ctermfg=grey ctermbg=grey cterm=NONE
-  hi PmenuThumb ctermfg=black ctermbg=black cterm=NONE
   hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
   hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi TabLine ctermfg=black ctermbg=grey cterm=reverse
-  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=grey ctermbg=black cterm=reverse
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold,reverse
-  hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi LineNr ctermfg=NONE ctermbg=NONE cterm=bold
-  hi FoldColumn ctermfg=grey ctermbg=NONE cterm=bold
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Error ctermfg=darkred ctermbg=NONE cterm=bold,reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi ModeMsg ctermfg=black ctermbg=NONE cterm=NONE
+  hi PmenuSbar ctermfg=grey ctermbg=grey cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=black ctermbg=black cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi MatchParen ctermfg=grey ctermbg=darkred cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
   hi Search ctermfg=grey ctermbg=darkmagenta cterm=NONE
-  hi IncSearch ctermfg=darkcyan ctermbg=darkyellow cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
-  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi SpecialChar ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
   hi SpellCap ctermfg=darkgreen ctermbg=NONE cterm=reverse
   hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=reverse
   hi SpellRare ctermfg=darkblue ctermbg=NONE cterm=reverse
   hi Statement ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=black ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=black ctermbg=grey cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=grey cterm=reverse
+  hi StatusLineTerm ctermfg=black ctermbg=darkgreen cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=grey ctermbg=darkgreen cterm=reverse
   hi StorageClass ctermfg=darkred ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Number ctermfg=darkred ctermbg=NONE cterm=bold
-  hi Float ctermfg=darkred ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi SpecialChar ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi TabLine ctermfg=black ctermbg=grey cterm=reverse
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi TabLineSel ctermfg=grey ctermbg=black cterm=reverse
   hi Title ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=black ctermbg=grey cterm=reverse
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
+  hi lCursor ctermfg=black ctermbg=darkred cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi Function term=NONE
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: light
-" Color: Black       #000000        16             black
-" Color: DarkGrey    #767676        243            darkgrey
-" Color: MediumGrey  #A8A8A8        248            darkgrey
-" Color: LightGrey   #DADADA        253            grey
-" Color: White       #ffffff        231            white
-" Color: Cyan        #00ffff        51             cyan
-" Color: Magenta     #ff00ff        201            magenta
-" Color: Red         #ff0000        196            red
-" Color: Yellow      #ffff00        226            yellow
-" Color: SeaGreen    #2e8b57        29             darkgreen
-" Color: DarkBlue    #00008b        18             darkblue
-" Color: DarkCyan    #008b8b        30             darkcyan
-" Color: DarkGreen   #006400        22             darkgreen
-" Color: DarkOrange  #ff8c00        208            darkyellow
-" Color: DarkRed     #8b0000        88             darkred
-" Color: LightBlue   #add8e6        153            blue
-" Color: LightGreen  #90ee90        120            green
-" Color: LightMagenta#ff83fa        213            magenta
-" Color: LightRed    #ffafaf        217            red
-" Color: MutedRed    #a07070        95             darkred
-" Color: MutedYellow #ffff60        228            yellow
-" Color: Purple      #6a0dad        55             darkmagenta
-" Term colors: Black DarkRed DarkGreen Yellow DarkBlue Purple DarkCyan LightGrey
-" Term colors: DarkGrey LightRed LightGreen MutedYellow LightBlue Magenta Cyan White
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/slate.vim

@@ -2,440 +2,262 @@
 " Description:  Remake of slate
 " Author:       Original maintainer Ralph Amissah <ralph@amissah.com>
 " Maintainer:   Original maintainer Ralph Amissah <ralph@amissah.com>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'slate'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link Float Number
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
+hi! link Number Constant
 hi! link PopupNotification Todo
-hi! link PopupSelected PmenuSel
-hi Normal guifg=#ffffff guibg=#262626 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#5f87d7 guibg=NONE gui=NONE cterm=NONE
-hi StatusLine guifg=#000000 guibg=#afaf87 gui=NONE cterm=NONE
-hi StatusLineNC guifg=#666666 guibg=#afaf87 gui=NONE cterm=NONE
-hi StatusLineTerm guifg=#000000 guibg=#afaf87 gui=NONE cterm=NONE
-hi StatusLineTermNC guifg=#666666 guibg=#afaf87 gui=NONE cterm=NONE
-hi VertSplit guifg=#666666 guibg=#afaf87 gui=NONE cterm=NONE
-hi Pmenu guifg=NONE guibg=#4a4a4a gui=NONE cterm=NONE
-hi PmenuSel guifg=#262626 guibg=#d7d787 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#262626 gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#ffd700 gui=NONE cterm=NONE
-hi PmenuMatch guifg=#d7875f guibg=#4a4a4a gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#d7875f guibg=#d7d787 gui=NONE cterm=NONE
-hi TabLineSel guifg=#000000 guibg=#afaf87 gui=NONE cterm=NONE
-hi TabLine guifg=#666666 guibg=#333333 gui=NONE cterm=NONE
-hi TabLineFill guifg=#ff8787 guibg=#333333 gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=#262626 guibg=#d7d787 gui=NONE cterm=NONE
-hi NonText guifg=#5f87d7 guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#00875f guibg=NONE gui=NONE cterm=NONE
-hi QuickFixLine guifg=#000000 guibg=#5f87d7 gui=NONE cterm=NONE
-hi Folded guifg=#666666 guibg=#000000 gui=NONE cterm=NONE
-hi FoldColumn guifg=#5f87d7 guibg=#000000 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#333333 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#333333 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#000000 gui=NONE cterm=NONE
-hi CursorLineNr guifg=NONE guibg=#333333 gui=NONE cterm=NONE
-hi Visual guifg=#d7d787 guibg=#5f8700 gui=NONE cterm=NONE
-hi SignColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
-hi VisualNOS guifg=#d7d787 guibg=#5f8700 gui=NONE cterm=NONE
-hi LineNr guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi ErrorMsg guifg=#ff0000 guibg=#000000 gui=reverse cterm=reverse
-hi ModeMsg guifg=#262626 guibg=#ffd700 gui=NONE cterm=NONE
-hi WarningMsg guifg=#ff8787 guibg=NONE gui=NONE cterm=NONE
-hi MoreMsg guifg=#00875f guibg=NONE gui=NONE cterm=NONE
-hi Question guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE
-hi Search guifg=#000000 guibg=#d7875f gui=NONE cterm=NONE
-hi IncSearch guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
-hi Todo guifg=#ff0000 guibg=#ffff00 gui=NONE cterm=NONE
-hi WildMenu guifg=#262626 guibg=#d7d787 gui=NONE cterm=NONE
-hi Underlined guifg=#5f87d7 guibg=NONE gui=underline cterm=underline
-hi Cursor guifg=#333333 guibg=#d7d787 gui=NONE cterm=NONE
-hi lCursor guifg=#262626 guibg=#ffafaf gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl cterm=underline
-hi SpellLocal guifg=#ffafaf guibg=NONE guisp=#ffafaf gui=undercurl cterm=underline
-hi SpellRare guifg=#ffd7af guibg=NONE guisp=#ffd7af gui=undercurl cterm=underline
-hi Comment guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi String guifg=#87d7ff guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#ff8787 guibg=NONE gui=NONE cterm=NONE
-hi Function guifg=#ffd7af guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#5f87d7 guibg=NONE gui=bold cterm=bold
-hi Constant guifg=#ffafaf guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#d7875f guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#5f87d7 guibg=NONE gui=bold cterm=bold
-hi Operator guifg=#d7875f guibg=NONE gui=NONE cterm=NONE
-hi Define guifg=#ffd700 guibg=NONE gui=bold cterm=bold
-hi Structure guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Directory guifg=#00875f guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#ffd700 guibg=NONE gui=bold cterm=bold
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi! link PopupSelected PmenuSel
-  hi Normal ctermfg=231 ctermbg=235 cterm=NONE
-  hi EndOfBuffer ctermfg=68 ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=16 ctermbg=144 cterm=NONE
-  hi StatusLineNC ctermfg=241 ctermbg=144 cterm=NONE
-  hi StatusLineTerm ctermfg=16 ctermbg=144 cterm=NONE
-  hi StatusLineTermNC ctermfg=241 ctermbg=144 cterm=NONE
-  hi VertSplit ctermfg=241 ctermbg=144 cterm=NONE
-  hi Pmenu ctermfg=NONE ctermbg=239 cterm=NONE
-  hi PmenuSel ctermfg=235 ctermbg=186 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=235 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=220 cterm=NONE
-  hi PmenuMatch ctermfg=173 ctermbg=239 cterm=NONE
-  hi PmenuMatchSel ctermfg=173 ctermbg=186 cterm=NONE
-  hi TabLineSel ctermfg=16 ctermbg=144 cterm=NONE
-  hi TabLine ctermfg=241 ctermbg=236 cterm=NONE
-  hi TabLineFill ctermfg=210 ctermbg=236 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=235 ctermbg=186 cterm=NONE
-  hi NonText ctermfg=68 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=29 ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=16 ctermbg=68 cterm=NONE
-  hi Folded ctermfg=241 ctermbg=16 cterm=NONE
-  hi FoldColumn ctermfg=68 ctermbg=16 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=16 cterm=NONE
-  hi CursorLineNr ctermfg=NONE ctermbg=236 cterm=NONE
-  hi Visual ctermfg=186 ctermbg=64 cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=235 cterm=NONE
-  hi VisualNOS ctermfg=186 ctermbg=64 cterm=NONE
-  hi LineNr ctermfg=241 ctermbg=NONE cterm=NONE
-  hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi ErrorMsg ctermfg=196 ctermbg=16 cterm=reverse
-  hi ModeMsg ctermfg=235 ctermbg=220 cterm=NONE
-  hi WarningMsg ctermfg=210 ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
-  hi Question ctermfg=220 ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=16 ctermbg=220 cterm=NONE
-  hi Search ctermfg=16 ctermbg=173 cterm=NONE
-  hi IncSearch ctermfg=16 ctermbg=46 cterm=NONE
-  hi Todo ctermfg=196 ctermbg=226 cterm=NONE
-  hi WildMenu ctermfg=235 ctermbg=186 cterm=NONE
-  hi Underlined ctermfg=68 ctermbg=NONE cterm=underline
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=226 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=217 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=223 ctermbg=NONE cterm=underline
-  hi Comment ctermfg=241 ctermbg=NONE cterm=NONE
-  hi String ctermfg=117 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=210 ctermbg=NONE cterm=NONE
-  hi Function ctermfg=223 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=186 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=68 ctermbg=NONE cterm=bold
-  hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=173 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=68 ctermbg=NONE cterm=bold
-  hi Operator ctermfg=173 ctermbg=NONE cterm=NONE
-  hi Define ctermfg=220 ctermbg=NONE cterm=bold
-  hi Structure ctermfg=46 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=29 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=241 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=220 ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#ffffff guibg=#262626 guisp=NONE gui=NONE ctermfg=231 ctermbg=235 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=reverse
+hi Comment guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ffafaf guibg=NONE guisp=NONE gui=NONE ctermfg=217 ctermbg=NONE cterm=NONE term=NONE
+hi CursorColumn guifg=NONE guibg=#333333 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#333333 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=underline
+hi CursorLineNr guifg=NONE guibg=#333333 guisp=NONE gui=NONE ctermfg=NONE ctermbg=236 cterm=NONE term=bold
+hi Define guifg=#ffd700 guibg=NONE guisp=NONE gui=bold ctermfg=220 ctermbg=NONE cterm=bold term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#00875f guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=bold term=NONE
+hi EndOfBuffer guifg=#5f87d7 guibg=NONE guisp=NONE gui=NONE ctermfg=68 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#ff0000 guibg=#000000 guisp=NONE gui=reverse ctermfg=196 ctermbg=16 cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#5f87d7 guibg=#000000 guisp=NONE gui=NONE ctermfg=68 ctermbg=16 cterm=NONE term=NONE
+hi Folded guifg=#666666 guibg=#000000 guisp=NONE gui=NONE ctermfg=241 ctermbg=16 cterm=NONE term=NONE
+hi Function guifg=#ffd7af guibg=NONE guisp=NONE gui=NONE ctermfg=223 ctermbg=NONE cterm=NONE term=NONE
+hi Identifier guifg=#ff8787 guibg=NONE guisp=NONE gui=NONE ctermfg=210 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#000000 guibg=#00ff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=46 cterm=NONE term=bold,reverse,underline
+hi LineNr guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=241 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#000000 guibg=#ffd700 guisp=NONE gui=NONE ctermfg=16 ctermbg=220 cterm=NONE term=bold,underline
+hi ModeMsg guifg=#262626 guibg=#ffd700 guisp=NONE gui=NONE ctermfg=235 ctermbg=220 cterm=NONE term=bold
+hi MoreMsg guifg=#00875f guibg=NONE guisp=NONE gui=NONE ctermfg=29 ctermbg=NONE cterm=NONE term=NONE
+hi NonText guifg=#5f87d7 guibg=NONE guisp=NONE gui=NONE ctermfg=68 ctermbg=NONE cterm=NONE term=NONE
+hi Operator guifg=#d7875f guibg=NONE guisp=NONE gui=NONE ctermfg=173 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=NONE guibg=#4a4a4a guisp=NONE gui=NONE ctermfg=NONE ctermbg=239 cterm=NONE term=reverse
+hi PmenuMatch guifg=#d7875f guibg=#4a4a4a guisp=NONE gui=NONE ctermfg=173 ctermbg=239 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#d7875f guibg=#d7d787 guisp=NONE gui=NONE ctermfg=173 ctermbg=186 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=#262626 guisp=NONE gui=NONE ctermfg=NONE ctermbg=235 cterm=NONE term=reverse
+hi PmenuSel guifg=#262626 guibg=#d7d787 guisp=NONE gui=NONE ctermfg=235 ctermbg=186 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#ffd700 guisp=NONE gui=NONE ctermfg=NONE ctermbg=220 cterm=NONE term=NONE
+hi PreProc guifg=#d7875f guibg=NONE guisp=NONE gui=NONE ctermfg=173 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#ffd700 guibg=NONE guisp=NONE gui=NONE ctermfg=220 ctermbg=NONE cterm=NONE term=standout
+hi QuickFixLine guifg=#000000 guibg=#5f87d7 guisp=NONE gui=NONE ctermfg=16 ctermbg=68 cterm=NONE term=NONE
+hi Search guifg=#000000 guibg=#d7875f guisp=NONE gui=NONE ctermfg=16 ctermbg=173 cterm=NONE term=reverse
+hi SignColumn guifg=NONE guibg=#262626 guisp=NONE gui=NONE ctermfg=NONE ctermbg=235 cterm=NONE term=reverse
+hi Special guifg=#d7d787 guibg=NONE guisp=NONE gui=NONE ctermfg=186 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#00875f guibg=NONE guisp=NONE gui=NONE ctermfg=29 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#ffff00 guibg=NONE guisp=#ffff00 gui=undercurl ctermfg=226 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ffafaf guibg=NONE guisp=#ffafaf gui=undercurl ctermfg=217 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#ffd7af guibg=NONE guisp=#ffd7af gui=undercurl ctermfg=223 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#5f87d7 guibg=NONE guisp=NONE gui=bold ctermfg=68 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#000000 guibg=#afaf87 guisp=NONE gui=NONE ctermfg=16 ctermbg=144 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#666666 guibg=#afaf87 guisp=NONE gui=NONE ctermfg=241 ctermbg=144 cterm=NONE term=bold,underline
+hi StatusLineTerm guifg=#000000 guibg=#afaf87 guisp=NONE gui=NONE ctermfg=16 ctermbg=144 cterm=NONE term=bold,reverse
+hi StatusLineTermNC guifg=#666666 guibg=#afaf87 guisp=NONE gui=NONE ctermfg=241 ctermbg=144 cterm=NONE term=bold,underline
+hi String guifg=#87d7ff guibg=NONE guisp=NONE gui=NONE ctermfg=117 ctermbg=NONE cterm=NONE term=NONE
+hi Structure guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=NONE
+hi TabLine guifg=#666666 guibg=#333333 guisp=NONE gui=NONE ctermfg=241 ctermbg=236 cterm=NONE term=bold,underline
+hi TabLineFill guifg=#ff8787 guibg=#333333 guisp=NONE gui=NONE ctermfg=210 ctermbg=236 cterm=NONE term=NONE
+hi TabLineSel guifg=#000000 guibg=#afaf87 guisp=NONE gui=NONE ctermfg=16 ctermbg=144 cterm=NONE term=bold,reverse
+hi Title guifg=#ffd700 guibg=NONE guisp=NONE gui=bold ctermfg=220 ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#ff0000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=196 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=#262626 guibg=#d7d787 guisp=NONE gui=NONE ctermfg=235 ctermbg=186 cterm=NONE term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#5f87d7 guibg=NONE guisp=NONE gui=bold ctermfg=68 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#5f87d7 guibg=NONE guisp=NONE gui=underline ctermfg=68 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#666666 guibg=#afaf87 guisp=NONE gui=NONE ctermfg=241 ctermbg=144 cterm=NONE term=NONE
+hi Visual guifg=#d7d787 guibg=#5f8700 guisp=NONE gui=NONE ctermfg=186 ctermbg=64 cterm=NONE term=reverse
+hi VisualNOS guifg=#d7d787 guibg=#5f8700 guisp=NONE gui=NONE ctermfg=186 ctermbg=64 cterm=NONE term=NONE
+hi WarningMsg guifg=#ff8787 guibg=NONE guisp=NONE gui=NONE ctermfg=210 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#262626 guibg=#d7d787 guisp=NONE gui=NONE ctermfg=235 ctermbg=186 cterm=NONE term=bold
+
+if has('gui_running') || s:tgc
+  hi Cursor guifg=#333333 guibg=#d7d787 guisp=NONE gui=NONE cterm=NONE
+  hi lCursor guifg=#262626 guibg=#ffafaf guisp=NONE gui=NONE cterm=NONE
+endif
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi StatusLine ctermfg=white ctermbg=black cterm=bold,reverse
-  hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineTerm ctermfg=white ctermbg=black cterm=bold,reverse
-  hi StatusLineTermNC ctermfg=black ctermbg=grey cterm=NONE
-  hi VertSplit ctermfg=darkgrey ctermbg=grey cterm=NONE
-  hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkmagenta cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=yellow cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkmagenta cterm=bold
-  hi TabLineSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi TabLine ctermfg=grey ctermbg=darkgrey cterm=NONE
-  hi TabLineFill ctermfg=cyan ctermbg=darkgrey cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=green ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=bold
   hi ColorColumn ctermfg=white ctermbg=darkgrey cterm=NONE
-  hi Visual ctermfg=yellow ctermbg=darkgreen cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=black cterm=NONE
-  hi VisualNOS ctermfg=darkmagenta ctermbg=darkgreen cterm=NONE
-  hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=bold
+  hi Define ctermfg=yellow ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
   hi Error ctermfg=darkred ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
-  hi ModeMsg ctermfg=black ctermbg=yellow cterm=NONE
-  hi WarningMsg ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE
-  hi Question ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=yellow cterm=NONE
-  hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Function ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=red ctermbg=NONE cterm=bold
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
-  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
+  hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=yellow cterm=NONE
+  hi ModeMsg ctermfg=black ctermbg=yellow cterm=NONE
+  hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Operator ctermfg=red ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkmagenta cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=yellow cterm=NONE
+  hi PreProc ctermfg=red ctermbg=NONE cterm=NONE
+  hi Question ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE
+  hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=black cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=green ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=red ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
   hi Statement ctermfg=blue ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=red ctermbg=NONE cterm=bold
-  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi Operator ctermfg=red ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=red ctermbg=NONE cterm=NONE
-  hi Structure ctermfg=green ctermbg=NONE cterm=NONE
-  hi Function ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Type ctermfg=blue ctermbg=NONE cterm=bold
-  hi Define ctermfg=yellow ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=white ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
+  hi StatusLineTerm ctermfg=white ctermbg=black cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=black ctermbg=grey cterm=NONE
   hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Structure ctermfg=green ctermbg=NONE cterm=NONE
+  hi TabLine ctermfg=grey ctermbg=darkgrey cterm=NONE
+  hi TabLineFill ctermfg=cyan ctermbg=darkgrey cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi Title ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=blue ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=darkgrey ctermbg=grey cterm=NONE
+  hi Visual ctermfg=yellow ctermbg=darkgreen cterm=NONE
+  hi VisualNOS ctermfg=darkmagenta ctermbg=darkgreen cterm=NONE
+  hi WarningMsg ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
-  hi StatusLineTerm ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi StatusLineTermNC ctermfg=grey ctermbg=black cterm=reverse
-  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=darkyellow cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi TabLineSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi TabLine ctermfg=grey ctermbg=black cterm=reverse
-  hi TabLineFill ctermfg=grey ctermbg=black cterm=reverse
-  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=black ctermbg=darkblue cterm=NONE
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VisualNOS ctermfg=darkmagenta ctermbg=darkgreen cterm=underline
-  hi LineNr ctermfg=grey ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Define ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
   hi Error ctermfg=darkred ctermbg=grey cterm=reverse
   hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
-  hi ModeMsg ctermfg=NONE ctermbg=darkyellow cterm=NONE
-  hi WarningMsg ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Function ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Identifier ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
-  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
+  hi LineNr ctermfg=grey ctermbg=NONE cterm=bold
+  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=darkyellow cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Operator ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkyellow cterm=NONE
+  hi PreProc ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=black ctermbg=darkblue cterm=NONE
+  hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgreen ctermbg=NONE cterm=bold
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=reverse
   hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
   hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=reverse
   hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=darkred ctermbg=NONE cterm=bold
-  hi Comment ctermfg=darkgray ctermbg=NONE cterm=bold
-  hi Operator ctermfg=darkred ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkred ctermbg=NONE cterm=bold
-  hi Structure ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Function ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Type ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Define ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=grey ctermbg=black cterm=reverse
+  hi StatusLineTerm ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=grey ctermbg=black cterm=reverse
   hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Structure ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi TabLine ctermfg=grey ctermbg=black cterm=reverse
+  hi TabLineFill ctermfg=grey ctermbg=black cterm=reverse
+  hi TabLineSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi Title ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
+  hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=darkmagenta ctermbg=darkgreen cterm=underline
+  hi WarningMsg ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi Cursor term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Number term=NONE
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: x_black       #000000           16                black
-" Color: x_darkred     #cd0000           160               darkred
-" Color: x_darkgreen   #00cd00           40                darkgreen
-" Color: x_darkyellow  #cdcd00           184               darkyellow
-" Color: x_darkblue    #0000ee           21                darkblue
-" Color: x_darkmagenta #cd00cd           164               darkmagenta
-" Color: x_darkcyan    #00cdcd           44                darkcyan
-" Color: x_gray        #e5e5e5           254               gray
-" Color: x_darkgray    #7f7f7f           244               darkgray
-" Color: x_red         #ff0000           196               red
-" Color: x_green       #00ff00           46                green
-" Color: x_yellow      #ffff00           226               yellow
-" Color: x_blue        #5c5cff           63                blue
-" Color: x_magenta     #ff00ff           201               magenta
-" Color: x_cyan        #00ffff           51                cyan
-" Color: x_white       #ffffff           231               white
-" Color: foreground    #FFFFFF           231               white
-" Color: background    #262626           235               black
-" Color: color00       #000000           16                black
-" Color: color08       #333333           236               darkgrey
-" Color: color01       #FF0000           196               darkred
-" Color: color09       #FFAFAF           217               red
-" Color: color02       #5F8700           64                darkgreen
-" Color: color10       #00875F           29                green
-" Color: color03       #ffff00           226               darkyellow
-" Color: color11       #FFD700           220               yellow
-" Color: color04       #87d7FF           117               darkblue
-" Color: color12       #5F87D7           68                blue
-" Color: color05       #d7d787           186               darkmagenta
-" Color: color13       #AFAF87           144               magenta
-" Color: color06       #FFD7AF           223               darkcyan
-" Color: color14       #FF8787           210               cyan
-" Color: color07       #666666           241               grey
-" Color: color15       #FFFFFF           231               white
-" Color: color16       #D7875F           173               darkmagenta
-" Color: color17       #00FF00           46                darkgreen
-" Color: Pmenu         #4A4A4A           239               darkgrey
-" Term colors: x_black    x_darkred x_darkgreen x_darkyellow x_darkblue x_darkmagenta x_darkcyan x_gray
-" Term colors: x_darkgray x_red     x_green     x_yellow     x_blue     x_magenta     x_cyan     x_white
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/sorbet.vim

@@ -2,30 +2,27 @@
 " Description:  A shallow grave, a monument to the ruined age.
 " Author:       Maxence Weynans <neutaaaaan@gmail.com>
 " Maintainer:   Maxence Weynans <neutaaaaan@gmail.com>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Vim License (see `:help license`)`
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Jun 18
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'sorbet'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#000000', '#d75f5f', '#87d75f', '#d7af5f', '#87afd7', '#af87d7', '#5fafaf', '#dadada', '#707070', '#ff5f5f', '#87ff5f', '#ffd75f', '#87d7ff', '#d787ff', '#5fd7d7', '#ffffff']
 
-hi! link Terminal Normal
-hi! link StatusLineTerm StatusLine
-hi! link StatusLineTermNC StatusLineNC
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
-hi! link PopupSelected PmenuSel
 hi! link Boolean Constant
 hi! link Character Constant
 hi! link Conditional Statement
-hi! link Define PreProc
 hi! link Debug Special
+hi! link Define PreProc
 hi! link Delimiter Special
 hi! link ErrorMsg Error
 hi! link Exception Statement
@@ -35,191 +32,112 @@ hi! link Include PreProc
 hi! link Keyword Statement
 hi! link Label Statement
 hi! link Macro PreProc
+hi! link MessageWindow Pmenu
 hi! link Number Constant
 hi! link Operator Statement
+hi! link PopupNotification Todo
 hi! link PreCondit PreProc
 hi! link Repeat Statement
 hi! link SpecialChar Special
 hi! link SpecialComment Special
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
 hi! link StorageClass Type
 hi! link Structure Type
 hi! link Tag Special
+hi! link Terminal Normal
 hi! link Typedef Type
-hi! link lCursor Cursor
 hi! link debugPC CursorLine
+hi! link lCursor Cursor
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#d75f5f', '#87d75f', '#d7af5f', '#87afd7', '#af87d7', '#5fafaf', '#dadada', '#707070', '#ff5f5f', '#87ff5f', '#ffd75f', '#87d7ff', '#d787ff', '#5fd7d7', '#ffffff']
-endif
-hi Normal guifg=#dadada guibg=#161821 gui=NONE cterm=NONE
-hi Added guifg=#87d75f guibg=NONE gui=NONE cterm=NONE
-hi Changed guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
-hi Removed guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#262831 gui=NONE cterm=NONE
-hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
-hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi CursorColumn guifg=NONE guibg=#363841 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#363841 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#d7d7ff guibg=#363841 gui=NONE cterm=NONE
-hi DiffAdd guifg=#00af5f guibg=#000000 gui=reverse cterm=reverse
-hi DiffChange guifg=#87afff guibg=#000000 gui=reverse cterm=reverse
-hi DiffDelete guifg=#d7005f guibg=#000000 gui=reverse cterm=reverse
-hi DiffText guifg=#ff87ff guibg=#000000 gui=reverse cterm=reverse
-hi Directory guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#8787af guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#5f5f87 guibg=#161821 gui=NONE cterm=NONE
-hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
-hi LineNr guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
-hi ModeMsg guifg=#dadada guibg=NONE gui=bold cterm=bold
-hi MoreMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-hi NonText guifg=#707070 guibg=NONE gui=NONE cterm=NONE
-hi Pmenu guifg=#000000 guibg=#a6a8b1 gui=NONE cterm=NONE
-hi PmenuMatch guifg=#d7005f guibg=#a6a8b1 gui=NONE cterm=NONE
-hi PmenuExtra guifg=#000000 guibg=#a6a8b1 gui=NONE cterm=NONE
-hi PmenuKind guifg=#000000 guibg=#a6a8b1 gui=bold cterm=bold
-hi PmenuSbar guifg=#707070 guibg=#5f5f87 gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#d7d7ff gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#d7005f guibg=#d7d7ff gui=bold cterm=bold
-hi PmenuExtraSel guifg=#000000 guibg=#d7d7ff gui=NONE cterm=NONE
-hi PmenuKindSel guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold
-hi PmenuThumb guifg=#dadada guibg=#d7d7ff gui=NONE cterm=NONE
-hi Question guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
-hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse
-hi SignColumn guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#5f5f87 guibg=NONE gui=bold cterm=bold
-hi SpellBad guifg=#d75f5f guibg=NONE guisp=#d75f5f gui=undercurl cterm=underline
-hi SpellCap guifg=#87afd7 guibg=NONE guisp=#87afd7 gui=undercurl cterm=underline
-hi SpellLocal guifg=#af87d7 guibg=NONE guisp=#af87d7 gui=undercurl cterm=underline
-hi SpellRare guifg=#5fafaf guibg=NONE guisp=#5fafaf gui=undercurl cterm=underline
-hi StatusLine guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold
-hi StatusLineNC guifg=#8787af guibg=#000000 gui=reverse cterm=reverse
-hi TabLine guifg=#8787af guibg=#000000 gui=reverse cterm=reverse
-hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-hi TabLineSel guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold
-hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi VertSplit guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
-hi VisualNOS guifg=NONE guibg=#363841 gui=NONE cterm=NONE
-hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#d7d7ff guibg=#161821 gui=bold cterm=bold
-hi Comment guifg=#af87d7 guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
-hi Error guifg=#ff5f5f guibg=#000000 gui=bold,reverse cterm=bold,reverse
-hi Identifier guifg=#87d75f guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#5fafaf guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
-hi String guifg=#d7af5f guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#5fd7af guibg=NONE gui=bold,reverse cterm=bold,reverse
-hi Type guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#dadada guibg=NONE gui=underline cterm=underline
-hi CursorIM guifg=#000000 guibg=#afff00 gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#dadada guibg=#000000 gui=bold cterm=bold
-hi debugBreakpoint guifg=#8787af guibg=#000000 gui=bold,reverse cterm=bold,reverse
+hi Normal guifg=#dadada guibg=#161821 guisp=NONE gui=NONE ctermfg=253 ctermbg=233 cterm=NONE term=NONE
+hi Added guifg=#87d75f guibg=NONE guisp=NONE gui=NONE ctermfg=113 ctermbg=NONE cterm=NONE term=NONE
+hi Changed guifg=#87afd7 guibg=NONE guisp=NONE gui=NONE ctermfg=110 ctermbg=NONE cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#262831 guisp=NONE gui=NONE ctermfg=NONE ctermbg=235 cterm=NONE term=reverse
+hi Comment guifg=#af87d7 guibg=NONE guisp=NONE gui=NONE ctermfg=140 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#d75f5f guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE term=NONE
+hi CurSearch guifg=#ff5fff guibg=#000000 guisp=NONE gui=reverse ctermfg=207 ctermbg=16 cterm=reverse term=reverse
+hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=reverse
+hi CursorColumn guifg=NONE guibg=#363841 guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=NONE
+hi CursorIM guifg=#000000 guibg=#afff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=154 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#363841 guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=underline
+hi CursorLineNr guifg=#d7d7ff guibg=#363841 guisp=NONE gui=NONE ctermfg=189 ctermbg=237 cterm=NONE term=bold
+hi DiffAdd guifg=#00af5f guibg=#000000 guisp=NONE gui=reverse ctermfg=35 ctermbg=16 cterm=reverse term=reverse
+hi DiffChange guifg=#87afff guibg=#000000 guisp=NONE gui=reverse ctermfg=111 ctermbg=16 cterm=reverse term=NONE
+hi DiffDelete guifg=#d7005f guibg=#000000 guisp=NONE gui=reverse ctermfg=161 ctermbg=16 cterm=reverse term=reverse
+hi DiffText guifg=#ff87ff guibg=#000000 guisp=NONE gui=reverse ctermfg=213 ctermbg=16 cterm=reverse term=reverse
+hi Directory guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE
+hi EndOfBuffer guifg=#5f5f87 guibg=NONE guisp=NONE gui=NONE ctermfg=60 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=#ff5f5f guibg=#000000 guisp=NONE gui=bold,reverse ctermfg=203 ctermbg=16 cterm=bold,reverse term=bold,reverse
+hi FoldColumn guifg=#8787af guibg=NONE guisp=NONE gui=NONE ctermfg=103 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#5f5f87 guibg=#161821 guisp=NONE gui=NONE ctermfg=60 ctermbg=233 cterm=NONE term=NONE
+hi Identifier guifg=#87d75f guibg=NONE guisp=NONE gui=NONE ctermfg=113 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#ffaf00 guibg=#000000 guisp=NONE gui=reverse ctermfg=214 ctermbg=16 cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#5f5f87 guibg=NONE guisp=NONE gui=NONE ctermfg=60 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#ff00af guibg=NONE guisp=NONE gui=bold ctermfg=199 ctermbg=NONE cterm=bold term=bold,underline
+hi ModeMsg guifg=#dadada guibg=NONE guisp=NONE gui=bold ctermfg=253 ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE
+hi NonText guifg=#707070 guibg=NONE guisp=NONE gui=NONE ctermfg=242 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#000000 guibg=#a6a8b1 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=reverse
+hi PmenuExtra guifg=#000000 guibg=#a6a8b1 guisp=NONE gui=NONE ctermfg=16 ctermbg=248 cterm=NONE term=NONE
+hi PmenuExtraSel guifg=#000000 guibg=#d7d7ff guisp=NONE gui=NONE ctermfg=16 ctermbg=189 cterm=NONE term=NONE
+hi PmenuKind guifg=#000000 guibg=#a6a8b1 guisp=NONE gui=bold ctermfg=16 ctermbg=248 cterm=bold term=bold
+hi PmenuKindSel guifg=#000000 guibg=#d7d7ff guisp=NONE gui=bold ctermfg=16 ctermbg=189 cterm=bold term=bold
+hi PmenuMatch guifg=#d7005f guibg=#a6a8b1 guisp=NONE gui=NONE ctermfg=161 ctermbg=248 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#d7005f guibg=#d7d7ff guisp=NONE gui=bold ctermfg=161 ctermbg=189 cterm=bold term=bold
+hi PmenuSbar guifg=#707070 guibg=#5f5f87 guisp=NONE gui=NONE ctermfg=242 ctermbg=60 cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#d7d7ff guisp=NONE gui=NONE ctermfg=16 ctermbg=189 cterm=NONE term=bold
+hi PmenuThumb guifg=#dadada guibg=#d7d7ff guisp=NONE gui=NONE ctermfg=253 ctermbg=189 cterm=NONE term=NONE
+hi PreProc guifg=#87afd7 guibg=NONE guisp=NONE gui=NONE ctermfg=110 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=standout
+hi QuickFixLine guifg=#ff5fff guibg=#000000 guisp=NONE gui=reverse ctermfg=207 ctermbg=16 cterm=reverse term=NONE
+hi Removed guifg=#d75f5f guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE term=NONE
+hi Search guifg=#00afff guibg=#000000 guisp=NONE gui=reverse ctermfg=39 ctermbg=16 cterm=reverse term=reverse
+hi SignColumn guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#5fafaf guibg=NONE guisp=NONE gui=NONE ctermfg=73 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#5f5f87 guibg=NONE guisp=NONE gui=bold ctermfg=60 ctermbg=NONE cterm=bold term=bold
+hi SpellBad guifg=#d75f5f guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=167 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#87afd7 guibg=NONE guisp=#87afd7 gui=undercurl ctermfg=110 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#af87d7 guibg=NONE guisp=#af87d7 gui=undercurl ctermfg=140 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#5fafaf guibg=NONE guisp=#5fafaf gui=undercurl ctermfg=73 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#87afd7 guibg=NONE guisp=NONE gui=NONE ctermfg=110 ctermbg=NONE cterm=NONE term=NONE
+hi StatusLine guifg=#000000 guibg=#d7d7ff guisp=NONE gui=bold ctermfg=16 ctermbg=189 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#8787af guibg=#000000 guisp=NONE gui=reverse ctermfg=103 ctermbg=16 cterm=reverse term=bold,underline
+hi String guifg=#d7af5f guibg=NONE guisp=NONE gui=NONE ctermfg=179 ctermbg=NONE cterm=NONE term=NONE
+hi TabLine guifg=#8787af guibg=#000000 guisp=NONE gui=reverse ctermfg=103 ctermbg=16 cterm=reverse term=bold,underline
+hi TabLineFill guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=NONE
+hi TabLineSel guifg=#000000 guibg=#d7d7ff guisp=NONE gui=bold ctermfg=16 ctermbg=189 cterm=bold term=bold,reverse
+hi Title guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi Todo guifg=#5fd7af guibg=NONE guisp=NONE gui=bold,reverse ctermfg=79 ctermbg=NONE cterm=bold,reverse term=bold,reverse
+hi ToolbarButton guifg=#dadada guibg=#000000 guisp=NONE gui=bold ctermfg=253 ctermbg=16 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=reverse
+hi Type guifg=#87afd7 guibg=NONE guisp=NONE gui=NONE ctermfg=110 ctermbg=NONE cterm=NONE term=NONE
+hi Underlined guifg=#dadada guibg=NONE guisp=NONE gui=underline ctermfg=253 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#5f5f87 guibg=NONE guisp=NONE gui=NONE ctermfg=60 ctermbg=NONE cterm=NONE term=NONE
+hi Visual guifg=#ffaf00 guibg=#000000 guisp=NONE gui=reverse ctermfg=214 ctermbg=16 cterm=reverse term=reverse
+hi VisualNOS guifg=NONE guibg=#363841 guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=NONE
+hi WarningMsg guifg=#dadada guibg=NONE guisp=NONE gui=NONE ctermfg=253 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#d7d7ff guibg=#161821 guisp=NONE gui=bold ctermfg=189 ctermbg=233 cterm=bold term=bold
+hi debugBreakpoint guifg=#8787af guibg=#000000 guisp=NONE gui=bold,reverse ctermfg=103 ctermbg=16 cterm=bold,reverse term=bold,reverse
 
-if s:t_Co >= 256
-  hi Normal ctermfg=253 ctermbg=233 cterm=NONE
-  hi Added ctermfg=113 ctermbg=NONE cterm=NONE
-  hi Changed ctermfg=110 ctermbg=NONE cterm=NONE
-  hi Removed ctermfg=167 ctermbg=NONE cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=235 cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi CurSearch ctermfg=207 ctermbg=16 cterm=reverse
-  hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorLineNr ctermfg=189 ctermbg=237 cterm=NONE
-  hi DiffAdd ctermfg=35 ctermbg=16 cterm=reverse
-  hi DiffChange ctermfg=111 ctermbg=16 cterm=reverse
-  hi DiffDelete ctermfg=161 ctermbg=16 cterm=reverse
-  hi DiffText ctermfg=213 ctermbg=16 cterm=reverse
-  hi Directory ctermfg=253 ctermbg=NONE cterm=NONE
-  hi EndOfBuffer ctermfg=60 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=103 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=60 ctermbg=233 cterm=NONE
-  hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
-  hi LineNr ctermfg=60 ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
-  hi ModeMsg ctermfg=253 ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=253 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=242 ctermbg=NONE cterm=NONE
-  hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE
-  hi PmenuMatch ctermfg=161 ctermbg=248 cterm=NONE
-  hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE
-  hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold
-  hi PmenuSbar ctermfg=242 ctermbg=60 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=189 cterm=NONE
-  hi PmenuMatchSel ctermfg=161 ctermbg=189 cterm=bold
-  hi PmenuExtraSel ctermfg=16 ctermbg=189 cterm=NONE
-  hi PmenuKindSel ctermfg=16 ctermbg=189 cterm=bold
-  hi PmenuThumb ctermfg=253 ctermbg=189 cterm=NONE
-  hi Question ctermfg=253 ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse
-  hi Search ctermfg=39 ctermbg=16 cterm=reverse
-  hi SignColumn ctermfg=253 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=60 ctermbg=NONE cterm=bold
-  hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=110 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=140 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=73 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=16 ctermbg=189 cterm=bold
-  hi StatusLineNC ctermfg=103 ctermbg=16 cterm=reverse
-  hi TabLine ctermfg=103 ctermbg=16 cterm=reverse
-  hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE
-  hi TabLineSel ctermfg=16 ctermbg=189 cterm=bold
-  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit ctermfg=60 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=214 ctermbg=16 cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=237 cterm=NONE
-  hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=189 ctermbg=233 cterm=bold
-  hi Comment ctermfg=140 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=167 ctermbg=NONE cterm=NONE
-  hi Error ctermfg=203 ctermbg=16 cterm=bold,reverse
-  hi Identifier ctermfg=113 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=253 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=110 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=73 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=110 ctermbg=NONE cterm=NONE
-  hi String ctermfg=179 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=79 ctermbg=NONE cterm=bold,reverse
-  hi Type ctermfg=110 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=253 ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
-  hi ToolbarButton ctermfg=253 ctermbg=16 cterm=bold
-  hi debugBreakpoint ctermfg=103 ctermbg=16 cterm=bold,reverse
-  unlet s:t_Co
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
-  hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse
-  hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
-  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse
-  hi Search ctermfg=cyan ctermbg=black cterm=reverse
-  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold
-  hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse
-  hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse
-  hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
   hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Comment ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
   hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
@@ -227,75 +145,74 @@ if s:t_Co >= 16
   hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
   hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
   hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
   hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
+  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi PmenuMatch ctermfg=NONE ctermbg=darkred cterm=reverse
   hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-  hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
-  hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold
   hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuMatch ctermfg=NONE ctermbg=darkred cterm=reverse
+  hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold
+  hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse
+  hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
   hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Question ctermfg=NONE ctermbg=NONE cterm=standout
   hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Search ctermfg=cyan ctermbg=black cterm=reverse
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse
+  hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
   hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse
+  hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
   hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
   hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
   hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Comment ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
-  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse
-  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   hi debugBreakpoint ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 8
-  hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse
-  hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
-  hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
-  hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
-  hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-  hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
-  hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
   hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Comment ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
   hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
@@ -303,159 +220,73 @@ if s:t_Co >= 8
   hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
   hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
   hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
   hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi PmenuMatch ctermfg=NONE ctermbg=darkred cterm=reverse
   hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-  hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
-  hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold
   hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuMatch ctermfg=NONE ctermbg=darkred cterm=reverse
+  hi PmenuMatchSel ctermfg=darkred ctermbg=NONE cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
   hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Question ctermfg=NONE ctermbg=NONE cterm=standout
   hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
+  hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
   hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse
+  hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
   hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
   hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
   hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Comment ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
-  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse
-  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   hi debugBreakpoint ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
-  hi CurSearch term=reverse
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi ErrorMsg term=bold,reverse
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: guibg         #161821           233               black
-" Color: statusline    #d7d7ff           189               white
-" Color: statuslineNC  #8787af           103               grey
-" Color: darkuipurple  #5f5f87           60                grey
-" Color: dark0         #000000           16                black
-" Color: dark1         #d75f5f           167               darkred
-" Color: dark2         #87d75f           113               darkgreen
-" Color: dark3         #d7af5f           179               darkyellow
-" Color: dark4         #87afd7           110               darkblue
-" Color: dark5         #af87d7           140               darkmagenta
-" Color: dark6         #5fafaf           73                darkcyan
-" Color: dark7         #dadada           253               grey
-" Color: dark8         #707070           242               darkgrey
-" Color: dark9         #ff5f5f           203               red
-" Color: dark10        #87ff5f           119               green
-" Color: dark11        #ffd75f           221               yellow
-" Color: dark12        #87d7ff           117               blue
-" Color: dark13        #d787ff           177               magenta
-" Color: dark14        #5fd7d7           80                cyan
-" Color: dark15        #ffffff           231               white
-" Color: diffred       #d7005f           161               darkred
-" Color: diffgreen     #00af5f           35                darkgreen
-" Color: diffblue      #87afff           111               darkblue
-" Color: diffpink      #ff87ff           213               darkmagenta
-" Color: uipink        #ff00af           199               magenta
-" Color: uilime        #afff00           154               green
-" Color: uiteal        #5fd7af           79                green
-" Color: uiblue        #00afff           39                blue
-" Color: uipurple      #af00ff           129               darkmagenta
-" Color: uiamber       #ffaf00           214               darkyellow
-" Color: uiblack       #363841           237               darkgrey
-" Color: yasogrey      #262831           235               black
-" Color: linenrblack   #585858           240               darkgrey
-" Color: uicursearch   #ff5fff           207               magenta
-" Color: invisigrey    #a6a8b1           248               darkgrey
-" Color: errorred      #ff5f5f           203               red
-" Term colors: dark0 dark1 dark2 dark3 dark4 dark5 dark6 dark7
-" Term colors: dark8 dark9 dark10 dark11 dark12 dark13 dark14 dark15
 " vim: et ts=8 sw=2 sts=2

runtime/colors/tools/check_colors.vim

@@ -34,7 +34,7 @@ def Test_check_colors()
         'Comment',
         'Conceal',
         'Constant',
-	'CurSearch',
+        'CurSearch',
         'Cursor',
         'CursorColumn',
         'CursorLine',
@@ -66,6 +66,7 @@ def Test_check_colors()
         'PmenuSbar',
         'PmenuSel',
         'PmenuThumb',
+        'PopupNotification',
         'PreProc',
         'Question',
         'QuickFixLine',
@@ -156,7 +157,7 @@ def Test_check_colors()
     cursor(1, 1)
 
     # 4) Check, that t_Co is checked
-    var pat = '[&]t_Co\s*[<>=]=\?\s*\d\+'
+    var pat = '[&]t_Co)\?\s*\%(\%([<>=]=\?\)\|??\)\s*\d\+'
     if search(pat, 'ncW') == 0
         err['t_Co'] = 'Does not check terminal for capable colors'
     endif
@@ -175,7 +176,7 @@ def Test_check_colors()
 
     # 7) Normal should be defined first, not use reverse, fg or bg
     cursor(1, 1)
-    pat = 'hi\%[light] \+\%(link\|clear\)\@!\w\+\>'
+    pat = 'hi\%[ghlight] \+\%(link\|clear\)\@!\w\+\>'
     search(pat, 'cW') # Look for the first hi def, skipping `hi link` and `hi clear`
     if getline('.') !~# '\m\<Normal\>'
         err['highlight']['Normal'] = 'Should be defined first'

runtime/colors/torte.vim

@@ -2,432 +2,251 @@
 " Description:  Remake of torte (grey on black)
 " Author:       Original maintainer Thorsten Maerz <info@netztorte.de>
 " Maintainer:   Original maintainer Thorsten Maerz <info@netztorte.de>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'torte'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
-endif
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link Float Number
+hi! link Function Identifier
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link MessageWindow Pmenu
+hi! link Number Constant
+hi! link PopupNotification Todo
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
-hi! link PopupSelected PmenuSel
-hi Normal guifg=#cccccc guibg=#000000 gui=NONE cterm=NONE
-hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#40ffff guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffff60 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#ff80ff guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#60ff60 guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ffa500 guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
-hi Ignore guifg=#000000 guibg=#000000 gui=NONE cterm=NONE
-hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
-hi Todo guifg=#ffff00 guibg=#000000 gui=reverse cterm=reverse
-hi Folded guifg=#00cdcd guibg=#3a3a3a gui=NONE cterm=NONE
-hi Visual guifg=#000000 guibg=#a9a9a9 gui=bold cterm=NONE
-hi CursorColumn guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffff00 guibg=#666666 gui=NONE cterm=NONE
-hi SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi ColorColumn guifg=#cccccc guibg=#8b0000 gui=NONE cterm=NONE
-hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#00ff00 gui=bold cterm=NONE
-hi lCursor guifg=#000000 guibg=#e5e5e5 gui=NONE cterm=NONE
-hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
-hi Title guifg=#ff00ff guibg=NONE gui=bold cterm=bold
-hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi Search guifg=#ff0000 guibg=#000000 gui=reverse cterm=reverse
-hi IncSearch guifg=#00cd00 guibg=#000000 gui=reverse cterm=reverse
-hi NonText guifg=#0000ff guibg=NONE gui=bold cterm=NONE
-hi EndOfBuffer guifg=#0000ff guibg=NONE gui=bold cterm=NONE
-hi ErrorMsg guifg=#ffffff guibg=#cd0000 gui=NONE cterm=NONE
-hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi LineNr guifg=#7f7f7f guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
-hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold
-hi SpecialKey guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
-hi VisualNOS guifg=NONE guibg=#000000 gui=bold,underline cterm=underline
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi QuickFixLine guifg=#000000 guibg=#cdcd00 gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#5c5cff guibg=NONE guisp=#5c5cff gui=undercurl cterm=underline
-hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl cterm=underline
-hi SpellRare guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl cterm=underline
-hi StatusLine guifg=#ffffff guibg=#0000ee gui=bold cterm=bold
-hi StatusLineNC guifg=#000000 guibg=#e5e5e5 gui=NONE cterm=NONE
-hi VertSplit guifg=#000000 guibg=#e5e5e5 gui=NONE cterm=NONE
-hi TabLine guifg=#ffffff guibg=#7f7f7f gui=NONE cterm=NONE
-hi TabLineFill guifg=NONE guibg=#000000 gui=reverse cterm=reverse
-hi TabLineSel guifg=#cccccc guibg=#000000 gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=bold
-hi PmenuMatch guifg=#ff00ff guibg=#303030 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ff00ff guibg=#ffff00 gui=NONE cterm=NONE
-hi Pmenu guifg=fg guibg=#303030 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#bebebe gui=NONE cterm=NONE
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link TabPanel Normal
+hi! link TabPanelFill EndOfBuffer
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi! link PopupSelected PmenuSel
-  hi Normal ctermfg=251 ctermbg=16 cterm=NONE
-  hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=87 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=227 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=213 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=83 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=214 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=111 ctermbg=NONE cterm=underline
-  hi Ignore ctermfg=16 ctermbg=16 cterm=NONE
-  hi Error ctermfg=231 ctermbg=196 cterm=NONE
-  hi Todo ctermfg=226 ctermbg=16 cterm=reverse
-  hi Folded ctermfg=44 ctermbg=237 cterm=NONE
-  hi Visual ctermfg=16 ctermbg=248 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=242 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=242 cterm=NONE
-  hi CursorLineNr ctermfg=226 ctermbg=242 cterm=NONE
-  hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=51 ctermbg=NONE cterm=NONE
-  hi ColorColumn ctermfg=251 ctermbg=88 cterm=NONE
-  hi Conceal ctermfg=242 ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=46 cterm=NONE
-  hi lCursor ctermfg=16 ctermbg=254 cterm=NONE
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi Title ctermfg=201 ctermbg=NONE cterm=bold
-  hi Directory ctermfg=51 ctermbg=NONE cterm=NONE
-  hi Search ctermfg=196 ctermbg=16 cterm=reverse
-  hi IncSearch ctermfg=40 ctermbg=16 cterm=reverse
-  hi NonText ctermfg=21 ctermbg=NONE cterm=NONE
-  hi EndOfBuffer ctermfg=21 ctermbg=NONE cterm=NONE
-  hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
-  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
-  hi LineNr ctermfg=102 ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=NONE ctermbg=30 cterm=NONE
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=bold
-  hi Question ctermfg=46 ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=51 ctermbg=NONE cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=16 cterm=underline
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
-  hi QuickFixLine ctermfg=16 ctermbg=184 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=63 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=201 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=51 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=231 ctermbg=20 cterm=bold
-  hi StatusLineNC ctermfg=16 ctermbg=254 cterm=NONE
-  hi VertSplit ctermfg=16 ctermbg=254 cterm=NONE
-  hi TabLine ctermfg=231 ctermbg=102 cterm=NONE
-  hi TabLineFill ctermfg=NONE ctermbg=16 cterm=reverse
-  hi TabLineSel ctermfg=251 ctermbg=16 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
-  hi ToolbarButton ctermfg=16 ctermbg=254 cterm=bold
-  hi PmenuMatch ctermfg=201 ctermbg=236 cterm=NONE
-  hi PmenuMatchSel ctermfg=201 ctermbg=226 cterm=NONE
-  hi Pmenu ctermfg=fg ctermbg=236 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=250 cterm=NONE
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#cccccc guibg=#000000 guisp=NONE gui=NONE ctermfg=251 ctermbg=16 cterm=NONE term=NONE
+hi ColorColumn guifg=#cccccc guibg=#8b0000 guisp=NONE gui=NONE ctermfg=251 ctermbg=88 cterm=NONE term=reverse
+hi Comment guifg=#80a0ff guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#666666 guibg=NONE guisp=NONE gui=NONE ctermfg=242 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ffa0a0 guibg=NONE guisp=NONE gui=NONE ctermfg=217 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#000000 guibg=#00ff00 guisp=NONE gui=bold ctermfg=16 ctermbg=46 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=242 cterm=NONE term=NONE
+hi CursorIM guifg=NONE guibg=fg guisp=NONE gui=NONE ctermfg=NONE ctermbg=fg cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#666666 guisp=NONE gui=NONE ctermfg=NONE ctermbg=242 cterm=NONE term=underline
+hi CursorLineNr guifg=#ffff00 guibg=#666666 guisp=NONE gui=NONE ctermfg=226 ctermbg=242 cterm=NONE term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi EndOfBuffer guifg=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=21 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=#ffffff guibg=#ff0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=196 cterm=NONE term=bold,reverse
+hi ErrorMsg guifg=#ffffff guibg=#cd0000 guisp=NONE gui=NONE ctermfg=231 ctermbg=160 cterm=NONE term=bold,reverse
+hi FoldColumn guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00cdcd guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=44 ctermbg=237 cterm=NONE term=NONE
+hi Identifier guifg=#40ffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#000000 guibg=#000000 guisp=NONE gui=NONE ctermfg=16 ctermbg=16 cterm=NONE term=NONE
+hi IncSearch guifg=#00cd00 guibg=#000000 guisp=NONE gui=reverse ctermfg=40 ctermbg=16 cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#7f7f7f guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=NONE guibg=#008b8b guisp=NONE gui=NONE ctermfg=NONE ctermbg=30 cterm=NONE term=bold,underline
+hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#2e8b57 guibg=NONE guisp=NONE gui=bold ctermfg=29 ctermbg=NONE cterm=bold term=NONE
+hi NonText guifg=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=21 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=fg guibg=#303030 guisp=NONE gui=NONE ctermfg=fg ctermbg=236 cterm=NONE term=reverse
+hi PmenuMatch guifg=#ff00ff guibg=#303030 guisp=NONE gui=NONE ctermfg=201 ctermbg=236 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#ffff00 guisp=NONE gui=NONE ctermfg=201 ctermbg=226 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#bebebe guisp=NONE gui=NONE ctermfg=NONE ctermbg=250 cterm=NONE term=NONE
+hi PreProc guifg=#ff80ff guibg=NONE guisp=NONE gui=NONE ctermfg=213 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#00ff00 guibg=NONE guisp=NONE gui=bold ctermfg=46 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#000000 guibg=#cdcd00 guisp=NONE gui=NONE ctermfg=16 ctermbg=184 cterm=NONE term=NONE
+hi Search guifg=#ff0000 guibg=#000000 guisp=NONE gui=reverse ctermfg=196 ctermbg=16 cterm=reverse term=reverse
+hi SignColumn guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ffa500 guibg=NONE guisp=NONE gui=NONE ctermfg=214 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#00ffff guibg=NONE guisp=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#5c5cff guibg=NONE guisp=#5c5cff gui=undercurl ctermfg=63 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#ff00ff guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=201 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#00ffff guibg=NONE guisp=#00ffff gui=undercurl ctermfg=51 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#ffff60 guibg=NONE guisp=NONE gui=NONE ctermfg=227 ctermbg=NONE cterm=NONE term=NONE
+hi StatusLine guifg=#ffffff guibg=#0000ee guisp=NONE gui=bold ctermfg=231 ctermbg=20 cterm=bold term=bold,reverse
+hi StatusLineNC guifg=#000000 guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 cterm=NONE term=bold,underline
+hi TabLine guifg=#ffffff guibg=#7f7f7f guisp=NONE gui=NONE ctermfg=231 ctermbg=102 cterm=NONE term=bold,underline
+hi TabLineFill guifg=NONE guibg=#000000 guisp=NONE gui=reverse ctermfg=NONE ctermbg=16 cterm=reverse term=NONE
+hi TabLineSel guifg=#cccccc guibg=#000000 guisp=NONE gui=bold ctermfg=251 ctermbg=16 cterm=bold term=bold,reverse
+hi Title guifg=#ff00ff guibg=NONE guisp=NONE gui=bold ctermfg=201 ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#ffff00 guibg=#000000 guisp=NONE gui=reverse ctermfg=226 ctermbg=16 cterm=reverse term=bold,reverse
+hi ToolbarButton guifg=#000000 guibg=#e5e5e5 guisp=NONE gui=bold ctermfg=16 ctermbg=254 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=#000000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=reverse
+hi Type guifg=#60ff60 guibg=NONE guisp=NONE gui=NONE ctermfg=83 ctermbg=NONE cterm=NONE term=NONE
+hi Underlined guifg=#80a0ff guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#000000 guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 cterm=NONE term=NONE
+hi Visual guifg=#000000 guibg=#a9a9a9 guisp=NONE gui=bold ctermfg=16 ctermbg=248 cterm=NONE term=reverse
+hi VisualNOS guifg=NONE guibg=#000000 guisp=NONE gui=bold,underline ctermfg=NONE ctermbg=16 cterm=underline term=NONE
+hi WarningMsg guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
+hi lCursor guifg=#000000 guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=16 ctermbg=254 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=white ctermbg=black cterm=NONE
+  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
   hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
   hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Type ctermfg=green ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
-  hi Ignore ctermfg=black ctermbg=black cterm=NONE
-  hi Error ctermfg=white ctermbg=red cterm=NONE
-  hi Todo ctermfg=yellow ctermbg=black cterm=reverse
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=black ctermbg=grey cterm=NONE
+  hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=bold
-  hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=black ctermbg=green cterm=NONE
-  hi lCursor ctermfg=black ctermbg=grey cterm=NONE
-  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
-  hi Title ctermfg=magenta ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
   hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Search ctermfg=red ctermbg=black cterm=reverse
-  hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse
-  hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Error ctermfg=white ctermbg=red cterm=NONE
   hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
-  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=black cterm=NONE
+  hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse
   hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=darkcyan cterm=NONE
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=fg ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=fg ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
   hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Search ctermfg=red ctermbg=black cterm=reverse
+  hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=cyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=blue ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=magenta ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=cyan ctermbg=NONE cterm=underline
+  hi Statement ctermfg=yellow ctermbg=NONE cterm=NONE
   hi StatusLine ctermfg=white ctermbg=darkblue cterm=bold
   hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
-  hi VertSplit ctermfg=black ctermbg=grey cterm=NONE
   hi TabLine ctermfg=white ctermbg=darkgrey cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=black cterm=reverse
   hi TabLineSel ctermfg=white ctermbg=black cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
+  hi Title ctermfg=magenta ctermbg=NONE cterm=bold
+  hi Todo ctermfg=yellow ctermbg=black cterm=reverse
   hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold
-  hi PmenuMatch ctermfg=fg ctermbg=darkgrey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
-  hi Pmenu ctermfg=fg ctermbg=darkgrey cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
+  hi Type ctermfg=green ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=black ctermbg=grey cterm=NONE
+  hi Visual ctermfg=black ctermbg=grey cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+  hi lCursor ctermfg=black ctermbg=grey cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
+  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
   hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
   hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Ignore ctermfg=black ctermbg=black cterm=NONE
-  hi Error ctermfg=grey ctermbg=darkred cterm=NONE
-  hi Todo ctermfg=darkyellow ctermbg=black cterm=reverse
-  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold,underline
-  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
   hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Search ctermfg=darkred ctermbg=black cterm=bold,reverse
-  hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse
-  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
   hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Error ctermfg=grey ctermbg=darkred cterm=NONE
   hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=black ctermbg=black cterm=NONE
+  hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse
   hi LineNr ctermfg=grey ctermbg=NONE cterm=bold
   hi MatchParen ctermfg=grey ctermbg=darkcyan cterm=NONE
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkmagenta cterm=NONE
+  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
   hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Search ctermfg=darkred ctermbg=black cterm=bold,reverse
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
   hi SpellCap ctermfg=darkblue ctermbg=darkyellow cterm=reverse
   hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
   hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=reverse
+  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi StatusLine ctermfg=grey ctermbg=darkblue cterm=bold
   hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
-  hi VertSplit ctermfg=black ctermbg=grey cterm=NONE
   hi TabLine ctermfg=black ctermbg=grey cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=black cterm=reverse
   hi TabLineSel ctermfg=white ctermbg=black cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Todo ctermfg=darkyellow ctermbg=black cterm=reverse
   hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
-  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=darkmagenta cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=black ctermbg=grey cterm=NONE
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=black cterm=underline
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi lCursor ctermfg=black ctermbg=grey cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: foreground     #CCCCCC     251            white
-" Color: background     #000000     16             black
-" Color: color00        #000000     16             black
-" Color: color08        #7f7f7f     102            darkgrey
-" Color: color01        #cd0000     160            darkred
-" Color: color09        #ff0000     196            red
-" Color: color02        #00cd00     40             darkgreen
-" Color: color10        #00ff00     46             green
-" Color: color03        #cdcd00     184            darkyellow
-" Color: color11        #ffff00     226            yellow
-" Color: color04        #0000ee     20             darkblue
-" Color: color12        #5c5cff     63             blue
-" Color: color05        #cd00cd     164            darkmagenta
-" Color: color13        #ff00ff     201            magenta
-" Color: color06        #00cdcd     44             darkcyan
-" Color: color14        #00ffff     51             cyan
-" Color: color07        #e5e5e5     254            grey
-" Color: color15        #ffffff     231            white
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
-" Color: rgbGrey40      #666666     242            grey
-" Color: rgbDarkGrey    #a9a9a9     248            grey
-" Color: rgbDarkBlue    #00008b     18             darkblue
-" Color: rgbDarkMagenta #8b008b     90             darkmagenta
-" Color: rgbBlue        #0000ff     21             blue
-" Color: rgbDarkCyan    #008b8b     30             darkcyan
-" Color: Directory      #00ffff     51             cyan
-" Color: rgbSeaGreen    #2e8b57     29             darkgreen
-" Color: rgbGrey        #bebebe     250            grey
-" Color: Question       #00ff00     46             green
-" Color: SignColumn     #a9a9a9     248            black
-" Color: SpecialKey     #00ffff     51             cyan
-" Color: StatusLineTerm #90ee90     120            darkgreen
-" Color: Title          #ff00ff     201            magenta
-" Color: WarningMsg     #ff0000     196            red
-" Color: ToolbarLine    #7f7f7f     243            black
-" Color: ToolbarButton  #d3d3d3     252            darkgrey
-" Color: Comment        #80a0ff     111            blue
-" Color: Constant       #ffa0a0     217            darkmagenta
-" Color: Special        #ffa500     214            darkred
-" Color: Identifier     #40ffff     87             cyan
-" Color: Statement      #ffff60     227            yellow
-" Color: PreProc        #ff80ff     213            darkcyan
-" Color: Type           #60ff60     83             green
-" Color: Underlined     #80a0ff     111            blue
-" Color: FoldedBG       #3a3a3a     237            darkgrey
-" Color: Pmenu          #303030     236            darkgrey
-" Color: rgbDarkRed     #8b0000     88             darkred
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/unokai.vim

@@ -1,521 +1,326 @@
 " Name:         unokai
 " Description:  Color scheme similar to Monokai originally created by Wimer Hazenberg for TextMate
 " Author:       k-37 <60838818+k-37@users.noreply.github.com>
-" Maintainer:   k-37 <60838818+k-37@users.noreply.github.com>
-" Website:      https://github.com/vim/colorschemes
-" License:      Vim License (see `:help license`)
-" Last Change:  2024 Dec 15
+" URL:          https://github.com/vim/colorschemes
+" Last Change:  2025 Jun 18
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'unokai'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
-let s:italics = has('gui_running') || (&t_ZH != '' && &t_ZH != '' && !has('win32'))
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#282923', '#c61e5c', '#81af24', '#fd971f', '#51aebe', '#ae81ff', '#80beb5', '#bababa', '#74705d', '#f92672', '#a6e22e', '#e6db74', '#66d9ef', '#fd5ff0', '#a1efe4', '#f8f8f2']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#282923', '#c61e5c', '#81af24', '#fd971f', '#51aebe', '#ae81ff', '#80beb5', '#bababa', '#74705d', '#f92672', '#a6e22e', '#e6db74', '#66d9ef', '#fd5ff0', '#a1efe4', '#f8f8f2']
-endif
 hi! link CursorLineFold FoldColumn
 hi! link CursorLineSign SignColumn
+hi! link Define Identifier
+hi! link Delimiter PreProc
+hi! link Float Number
+hi! link Label String
 hi! link MessageWindow Pmenu
+hi! link Number Constant
+hi! link Operator PreProc
 hi! link PopupNotification Todo
-hi! link PopupSelected PmenuSel
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
-hi! link Terminal Normal
-hi! link Delimiter PreProc
-hi! link Operator PreProc
 hi! link StorageClass PreProc
 hi! link Structure PreProc
-hi! link Define Identifier
-hi! link Label String
+hi! link TabPanel Normal
+hi! link TabPanelFill Normal
+hi! link Terminal Normal
 hi! link markdownCode Comment
 hi! link markdownCodeBlock markdownCode
 hi! link markdownCodeDelimiter markdownCode
-hi Normal guifg=#f8f8f2 guibg=#282923 gui=NONE cterm=NONE
-hi StatusLine guifg=#282923 guibg=#bababa gui=NONE cterm=NONE
-hi StatusLineNC guifg=#282923 guibg=#74705d gui=NONE cterm=NONE
-hi VertSplit guifg=#74705d guibg=#74705d gui=NONE cterm=NONE
-hi TabLine guifg=#282923 guibg=#74705d gui=NONE cterm=NONE
-hi TabLineFill guifg=#282923 guibg=#74705d gui=NONE cterm=NONE
-hi TabLineSel guifg=#282923 guibg=#bababa gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=#74705d guibg=#f8f8f2 gui=bold,reverse cterm=bold,reverse
-hi QuickFixLine guifg=#282923 guibg=#51aebe gui=NONE cterm=NONE
-hi CursorLineNr guifg=#dadada guibg=NONE gui=bold cterm=bold
-hi LineNr guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE
-hi LineNrAbove guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE
-hi LineNrBelow guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE
-hi NonText guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#a1efe4 guibg=#282923 gui=reverse cterm=reverse
-hi VisualNOS guifg=#282923 guibg=#80beb5 gui=NONE cterm=NONE
-hi Pmenu guifg=NONE guibg=#585858 gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#74705d gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi PmenuSel guifg=NONE guibg=#8a8a8a gui=NONE cterm=NONE
-hi PmenuKind guifg=#80beb5 guibg=#585858 gui=NONE cterm=NONE
-hi PmenuKindSel guifg=#80beb5 guibg=#8a8a8a gui=NONE cterm=NONE
-hi PmenuExtra guifg=#bababa guibg=#585858 gui=NONE cterm=NONE
-hi PmenuExtraSel guifg=#bababa guibg=#8a8a8a gui=NONE cterm=NONE
-hi PmenuMatch guifg=#ffaf5f guibg=#585858 gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#ffaf5f guibg=#8a8a8a gui=NONE cterm=NONE
-hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Error guifg=#f92672 guibg=#000000 gui=reverse cterm=reverse
-hi ErrorMsg guifg=#f92672 guibg=#000000 gui=reverse cterm=reverse
-hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-hi MoreMsg guifg=#81af24 guibg=NONE gui=NONE cterm=NONE
-hi Question guifg=#e6db74 guibg=NONE gui=NONE cterm=NONE
-hi WarningMsg guifg=#f92672 guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#dadada guibg=NONE gui=bold cterm=bold
-hi MatchParen guifg=#fd971f guibg=NONE gui=bold cterm=bold
-hi Search guifg=#66d9ef guibg=#282923 gui=reverse cterm=reverse
-hi IncSearch guifg=#ffaf5f guibg=#282923 gui=reverse cterm=reverse
-hi CurSearch guifg=#ffaf5f guibg=#282923 gui=reverse cterm=reverse
-hi WildMenu guifg=#282923 guibg=#e6db74 gui=bold cterm=bold
-hi debugPC guifg=#282923 guibg=#51aebe gui=NONE cterm=NONE
-hi debugBreakpoint guifg=#282923 guibg=#f92672 gui=NONE cterm=NONE
-hi Cursor guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
-hi lCursor guifg=#282923 guibg=#5fff00 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#3a392f gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#3a392f gui=NONE cterm=NONE
-hi Folded guifg=#bababa guibg=#414141 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#585858 gui=NONE cterm=NONE
-hi SpellBad guifg=NONE guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
-hi SpellCap guifg=NONE guibg=NONE guisp=#ffaf5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
-hi SpellLocal guifg=NONE guibg=NONE guisp=#5fd75f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
-hi SpellRare guifg=NONE guibg=NONE guisp=#fd5ff0 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
-hi Constant guifg=#ae81ff guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#fd971f guibg=NONE gui=bold cterm=bold
-hi Character guifg=#a6e22e guibg=NONE gui=NONE cterm=NONE
-hi Comment guifg=#74705d guibg=NONE gui=NONE cterm=NONE
-hi String guifg=#e6db74 guibg=NONE gui=NONE cterm=NONE
-hi Function guifg=#a6e22e guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#66d9ef guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#f92672 guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#80beb5 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#f92672 guibg=NONE gui=bold cterm=bold
-hi Underlined guifg=#66d9ef guibg=NONE gui=underline cterm=underline
-hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-hi Debug guifg=#80beb5 guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Directory guifg=#a1efe4 guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE
-hi DiffAdd guifg=#5faf5f guibg=NONE gui=reverse cterm=reverse
-hi DiffChange guifg=#5f87af guibg=NONE gui=reverse cterm=reverse
-hi DiffText guifg=#af87af guibg=NONE gui=reverse cterm=reverse
-hi DiffDelete guifg=#af5f5f guibg=NONE gui=reverse cterm=reverse
-hi Added guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
-hi Changed guifg=#ffaf5f guibg=NONE gui=NONE cterm=NONE
-hi Removed guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
-hi htmlBold guifg=#f8f8f2 guibg=NONE gui=bold cterm=bold
-hi htmlItalic guifg=#f8f8f2 guibg=NONE gui=italic cterm=italic
-hi markdownHeadingDelimiter guifg=#f8f8f2 guibg=NONE gui=NONE cterm=NONE
-hi markdownH1Delimiter guifg=#f92672 guibg=NONE gui=NONE cterm=NONE
-hi markdownH2Delimiter guifg=#e6db74 guibg=NONE gui=NONE cterm=NONE
-hi markdownH4Delimiter guifg=#66d9ef guibg=NONE gui=NONE cterm=NONE
-hi markdownH6Delimiter guifg=#a6e22e guibg=NONE gui=NONE cterm=NONE
-hi markdownH3Delimiter guifg=#fd971f guibg=NONE gui=NONE cterm=NONE
-hi markdownH5Delimiter guifg=#51aebe guibg=NONE gui=NONE cterm=NONE
-if !s:italics
-  hi htmlItalic gui=NONE cterm=NONE
+
+hi Normal guifg=#f8f8f2 guibg=#282923 guisp=NONE gui=NONE ctermfg=255 ctermbg=235 cterm=NONE term=NONE
+hi Added guifg=#5fd75f guibg=NONE guisp=NONE gui=NONE ctermfg=77 ctermbg=NONE cterm=NONE term=NONE
+hi Changed guifg=#ffaf5f guibg=NONE guisp=NONE gui=NONE ctermfg=215 ctermbg=NONE cterm=NONE term=NONE
+hi Character guifg=#a6e22e guibg=NONE guisp=NONE gui=NONE ctermfg=112 ctermbg=NONE cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#585858 guisp=NONE gui=NONE ctermfg=NONE ctermbg=240 cterm=NONE term=reverse
+hi Comment guifg=#74705d guibg=NONE guisp=NONE gui=NONE ctermfg=244 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ae81ff guibg=NONE guisp=NONE gui=NONE ctermfg=141 ctermbg=NONE cterm=NONE term=NONE
+hi CurSearch guifg=#ffaf5f guibg=#282923 guisp=NONE gui=reverse ctermfg=215 ctermbg=235 cterm=reverse term=reverse
+hi CursorColumn guifg=NONE guibg=#3a392f guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#3a392f guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=underline
+hi CursorLineNr guifg=#dadada guibg=NONE guisp=NONE gui=bold ctermfg=253 ctermbg=NONE cterm=bold term=bold
+hi Debug guifg=#80beb5 guibg=NONE guisp=NONE gui=NONE ctermfg=73 ctermbg=NONE cterm=NONE term=NONE
+hi DiffAdd guifg=#5faf5f guibg=NONE guisp=NONE gui=reverse ctermfg=71 ctermbg=NONE cterm=reverse term=reverse
+hi DiffChange guifg=#5f87af guibg=NONE guisp=NONE gui=reverse ctermfg=67 ctermbg=NONE cterm=reverse term=NONE
+hi DiffDelete guifg=#af5f5f guibg=NONE guisp=NONE gui=reverse ctermfg=131 ctermbg=NONE cterm=reverse term=reverse
+hi DiffText guifg=#af87af guibg=NONE guisp=NONE gui=reverse ctermfg=139 ctermbg=NONE cterm=reverse term=reverse
+hi Directory guifg=#a1efe4 guibg=NONE guisp=NONE gui=bold ctermfg=116 ctermbg=NONE cterm=bold term=NONE
+hi EndOfBuffer guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=#f92672 guibg=#000000 guisp=NONE gui=reverse ctermfg=197 ctermbg=16 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#f92672 guibg=#000000 guisp=NONE gui=reverse ctermfg=197 ctermbg=16 cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#bababa guibg=#414141 guisp=NONE gui=NONE ctermfg=250 ctermbg=238 cterm=NONE term=NONE
+hi Function guifg=#a6e22e guibg=NONE guisp=NONE gui=NONE ctermfg=112 ctermbg=NONE cterm=NONE term=NONE
+hi Identifier guifg=#66d9ef guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#ffaf5f guibg=#282923 guisp=NONE gui=reverse ctermfg=215 ctermbg=235 cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE
+hi LineNrAbove guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE
+hi LineNrBelow guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#fd971f guibg=NONE guisp=NONE gui=bold ctermfg=208 ctermbg=NONE cterm=bold term=bold,underline
+hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=bold
+hi MoreMsg guifg=#81af24 guibg=NONE guisp=NONE gui=NONE ctermfg=106 ctermbg=NONE cterm=NONE term=NONE
+hi NonText guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=NONE guibg=#585858 guisp=NONE gui=NONE ctermfg=NONE ctermbg=240 cterm=NONE term=reverse
+hi PmenuExtra guifg=#bababa guibg=#585858 guisp=NONE gui=NONE ctermfg=250 ctermbg=240 cterm=NONE term=NONE
+hi PmenuExtraSel guifg=#bababa guibg=#8a8a8a guisp=NONE gui=NONE ctermfg=250 ctermbg=245 cterm=NONE term=NONE
+hi PmenuKind guifg=#80beb5 guibg=#585858 guisp=NONE gui=NONE ctermfg=73 ctermbg=240 cterm=NONE term=NONE
+hi PmenuKindSel guifg=#80beb5 guibg=#8a8a8a guisp=NONE gui=NONE ctermfg=73 ctermbg=245 cterm=NONE term=NONE
+hi PmenuMatch guifg=#ffaf5f guibg=#585858 guisp=NONE gui=NONE ctermfg=215 ctermbg=240 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#ffaf5f guibg=#8a8a8a guisp=NONE gui=NONE ctermfg=215 ctermbg=245 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi PmenuSel guifg=NONE guibg=#8a8a8a guisp=NONE gui=NONE ctermfg=NONE ctermbg=245 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#74705d guisp=NONE gui=NONE ctermfg=NONE ctermbg=244 cterm=NONE term=NONE
+hi PreProc guifg=#f92672 guibg=NONE guisp=NONE gui=NONE ctermfg=197 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#e6db74 guibg=NONE guisp=NONE gui=NONE ctermfg=185 ctermbg=NONE cterm=NONE term=standout
+hi QuickFixLine guifg=#282923 guibg=#51aebe guisp=NONE gui=NONE ctermfg=235 ctermbg=141 cterm=NONE term=NONE
+hi Removed guifg=#d75f5f guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE term=NONE
+hi Search guifg=#66d9ef guibg=#282923 guisp=NONE gui=reverse ctermfg=81 ctermbg=235 cterm=reverse term=reverse
+hi SignColumn guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#80beb5 guibg=NONE guisp=NONE gui=NONE ctermfg=73 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#8a8a8a guibg=NONE guisp=NONE gui=NONE ctermfg=245 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=NONE guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=167 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=NONE guibg=NONE guisp=#ffaf5f gui=undercurl ctermfg=215 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=NONE guibg=NONE guisp=#5fd75f gui=undercurl ctermfg=77 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=NONE guibg=NONE guisp=#fd5ff0 gui=undercurl ctermfg=207 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#f92672 guibg=NONE guisp=NONE gui=bold ctermfg=197 ctermbg=NONE cterm=bold term=NONE
+hi StatusLine guifg=#282923 guibg=#bababa guisp=NONE gui=NONE ctermfg=235 ctermbg=250 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#282923 guibg=#74705d guisp=NONE gui=NONE ctermfg=235 ctermbg=244 cterm=NONE term=bold,underline
+hi String guifg=#e6db74 guibg=NONE guisp=NONE gui=NONE ctermfg=185 ctermbg=NONE cterm=NONE term=NONE
+hi TabLine guifg=#282923 guibg=#74705d guisp=NONE gui=NONE ctermfg=235 ctermbg=244 cterm=NONE term=bold,underline
+hi TabLineFill guifg=#282923 guibg=#74705d guisp=NONE gui=NONE ctermfg=235 ctermbg=244 cterm=NONE term=NONE
+hi TabLineSel guifg=#282923 guibg=#bababa guisp=NONE gui=bold ctermfg=235 ctermbg=250 cterm=bold term=bold,reverse
+hi Title guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#dadada guibg=NONE guisp=NONE gui=bold ctermfg=253 ctermbg=NONE cterm=bold term=bold,reverse
+hi ToolbarButton guifg=#74705d guibg=#f8f8f2 guisp=NONE gui=bold,reverse ctermfg=244 ctermbg=255 cterm=bold,reverse term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#fd971f guibg=NONE guisp=NONE gui=bold ctermfg=208 ctermbg=NONE cterm=bold term=NONE
+hi Underlined guifg=#66d9ef guibg=NONE guisp=NONE gui=underline ctermfg=81 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#74705d guibg=#74705d guisp=NONE gui=NONE ctermfg=244 ctermbg=244 cterm=NONE term=NONE
+hi Visual guifg=#a1efe4 guibg=#282923 guisp=NONE gui=reverse ctermfg=116 ctermbg=235 cterm=reverse term=reverse
+hi VisualNOS guifg=#282923 guibg=#80beb5 guisp=NONE gui=NONE ctermfg=235 ctermbg=73 cterm=NONE term=NONE
+hi WarningMsg guifg=#f92672 guibg=NONE guisp=NONE gui=NONE ctermfg=197 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#282923 guibg=#e6db74 guisp=NONE gui=bold ctermfg=235 ctermbg=185 cterm=bold term=bold
+hi debugBreakpoint guifg=#282923 guibg=#f92672 guisp=NONE gui=NONE ctermfg=235 ctermbg=197 cterm=NONE term=NONE
+hi debugPC guifg=#282923 guibg=#51aebe guisp=NONE gui=NONE ctermfg=235 ctermbg=73 cterm=NONE term=NONE
+hi htmlBold guifg=#f8f8f2 guibg=NONE guisp=NONE gui=bold ctermfg=255 ctermbg=NONE cterm=bold term=bold
+hi htmlItalic guifg=#f8f8f2 guibg=NONE guisp=NONE gui=italic ctermfg=255 ctermbg=NONE cterm=underline term=underline
+hi markdownH1Delimiter guifg=#f92672 guibg=NONE guisp=NONE gui=NONE ctermfg=197 ctermbg=NONE cterm=NONE term=NONE
+hi markdownH2Delimiter guifg=#e6db74 guibg=NONE guisp=NONE gui=NONE ctermfg=185 ctermbg=NONE cterm=NONE term=NONE
+hi markdownH3Delimiter guifg=#fd971f guibg=NONE guisp=NONE gui=NONE ctermfg=208 ctermbg=NONE cterm=NONE term=NONE
+hi markdownH4Delimiter guifg=#66d9ef guibg=NONE guisp=NONE gui=NONE ctermfg=81 ctermbg=NONE cterm=NONE term=NONE
+hi markdownH5Delimiter guifg=#51aebe guibg=NONE guisp=NONE gui=NONE ctermfg=73 ctermbg=NONE cterm=NONE term=NONE
+hi markdownH6Delimiter guifg=#a6e22e guibg=NONE guisp=NONE gui=NONE ctermfg=112 ctermbg=NONE cterm=NONE term=NONE
+hi markdownHeadingDelimiter guifg=#f8f8f2 guibg=NONE guisp=NONE gui=NONE ctermfg=255 ctermbg=NONE cterm=NONE term=NONE
+
+if has('gui_running') || s:tgc
+  hi Cursor guifg=#000000 guibg=#dadada guisp=NONE gui=NONE cterm=NONE
+  hi lCursor guifg=#282923 guibg=#5fff00 guisp=NONE gui=NONE cterm=NONE
 endif
 
-if s:t_Co >= 256
-  hi! link CursorLineFold FoldColumn
-  hi! link CursorLineSign SignColumn
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi! link PopupSelected PmenuSel
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link Terminal Normal
-  hi! link Delimiter PreProc
-  hi! link Operator PreProc
-  hi! link StorageClass PreProc
-  hi! link Structure PreProc
-  hi! link Define Identifier
-  hi! link Label String
-  hi! link markdownCode Comment
-  hi! link markdownCodeBlock markdownCode
-  hi! link markdownCodeDelimiter markdownCode
-  hi Normal ctermfg=255 ctermbg=235 cterm=NONE
-  hi StatusLine ctermfg=235 ctermbg=250 cterm=NONE
-  hi StatusLineNC ctermfg=235 ctermbg=244 cterm=NONE
-  hi VertSplit ctermfg=244 ctermbg=244 cterm=NONE
-  hi TabLine ctermfg=235 ctermbg=244 cterm=NONE
-  hi TabLineFill ctermfg=235 ctermbg=244 cterm=NONE
-  hi TabLineSel ctermfg=235 ctermbg=250 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=244 ctermbg=255 cterm=bold,reverse
-  hi QuickFixLine ctermfg=235 ctermbg=141 cterm=NONE
-  hi CursorLineNr ctermfg=253 ctermbg=NONE cterm=bold
-  hi LineNr ctermfg=245 ctermbg=NONE cterm=NONE
-  hi LineNrAbove ctermfg=245 ctermbg=NONE cterm=NONE
-  hi LineNrBelow ctermfg=245 ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=245 ctermbg=NONE cterm=NONE
-  hi EndOfBuffer ctermfg=245 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=245 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=245 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=116 ctermbg=235 cterm=reverse
-  hi VisualNOS ctermfg=235 ctermbg=73 cterm=NONE
-  hi Pmenu ctermfg=NONE ctermbg=240 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=244 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSel ctermfg=NONE ctermbg=245 cterm=NONE
-  hi PmenuKind ctermfg=73 ctermbg=240 cterm=NONE
-  hi PmenuKindSel ctermfg=73 ctermbg=245 cterm=NONE
-  hi PmenuExtra ctermfg=250 ctermbg=240 cterm=NONE
-  hi PmenuExtraSel ctermfg=250 ctermbg=245 cterm=NONE
-  hi PmenuMatch ctermfg=215 ctermbg=240 cterm=NONE
-  hi PmenuMatchSel ctermfg=215 ctermbg=245 cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Error ctermfg=197 ctermbg=16 cterm=reverse
-  hi ErrorMsg ctermfg=197 ctermbg=16 cterm=reverse
-  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg ctermfg=106 ctermbg=NONE cterm=NONE
-  hi Question ctermfg=185 ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=197 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=253 ctermbg=NONE cterm=bold
-  hi MatchParen ctermfg=208 ctermbg=NONE cterm=bold
-  hi Search ctermfg=81 ctermbg=235 cterm=reverse
-  hi IncSearch ctermfg=215 ctermbg=235 cterm=reverse
-  hi CurSearch ctermfg=215 ctermbg=235 cterm=reverse
-  hi WildMenu ctermfg=235 ctermbg=185 cterm=bold
-  hi debugPC ctermfg=235 ctermbg=73 cterm=NONE
-  hi debugBreakpoint ctermfg=235 ctermbg=197 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
-  hi Folded ctermfg=250 ctermbg=238 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=240 cterm=NONE
-  hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=215 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=77 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=207 ctermbg=NONE cterm=underline
-  hi Constant ctermfg=141 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=208 ctermbg=NONE cterm=bold
-  hi Character ctermfg=112 ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=244 ctermbg=NONE cterm=NONE
-  hi String ctermfg=185 ctermbg=NONE cterm=NONE
-  hi Function ctermfg=112 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=81 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=197 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=73 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=197 ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=81 ctermbg=NONE cterm=underline
-  hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Debug ctermfg=73 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=116 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=245 ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=71 ctermbg=NONE cterm=reverse
-  hi DiffChange ctermfg=67 ctermbg=NONE cterm=reverse
-  hi DiffText ctermfg=139 ctermbg=NONE cterm=reverse
-  hi DiffDelete ctermfg=131 ctermbg=NONE cterm=reverse
-  hi Added ctermfg=77 ctermbg=NONE cterm=NONE
-  hi Changed ctermfg=215 ctermbg=NONE cterm=NONE
-  hi Removed ctermfg=167 ctermbg=NONE cterm=NONE
-  hi htmlBold ctermfg=255 ctermbg=NONE cterm=bold
-  hi htmlItalic ctermfg=255 ctermbg=NONE cterm=underline
-  hi markdownHeadingDelimiter ctermfg=255 ctermbg=NONE cterm=NONE
-  hi markdownH1Delimiter ctermfg=197 ctermbg=NONE cterm=NONE
-  hi markdownH2Delimiter ctermfg=185 ctermbg=NONE cterm=NONE
-  hi markdownH4Delimiter ctermfg=81 ctermbg=NONE cterm=NONE
-  hi markdownH6Delimiter ctermfg=112 ctermbg=NONE cterm=NONE
-  hi markdownH3Delimiter ctermfg=208 ctermbg=NONE cterm=NONE
-  hi markdownH5Delimiter ctermfg=73 ctermbg=NONE cterm=NONE
-  unlet s:t_Co s:italics
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=gray cterm=NONE
-  hi StatusLineNC ctermfg=black ctermbg=darkgray cterm=NONE
-  hi VertSplit ctermfg=darkgray ctermbg=darkgray cterm=NONE
-  hi TabLine ctermfg=black ctermbg=darkgray cterm=NONE
-  hi TabLineFill ctermfg=black ctermbg=darkgray cterm=NONE
-  hi TabLineSel ctermfg=black ctermbg=gray cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=darkgray ctermbg=white cterm=bold,reverse
-  hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Character ctermfg=green ctermbg=NONE cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi CurSearch ctermfg=red ctermbg=black cterm=reverse
+  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=white ctermbg=NONE cterm=bold
+  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=NONE cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse
+  hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Error ctermfg=red ctermbg=black cterm=reverse
+  hi ErrorMsg ctermfg=red ctermbg=black cterm=reverse
+  hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Function ctermfg=green ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=red ctermbg=black cterm=reverse
   hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi LineNrAbove ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi LineNrBelow ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=cyan ctermbg=black cterm=reverse
-  hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
-  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
-  hi PmenuExtra ctermfg=darkgray ctermbg=gray cterm=NONE
-  hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=gray cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Error ctermfg=red ctermbg=black cterm=reverse
-  hi ErrorMsg ctermfg=red ctermbg=black cterm=reverse
+  hi MatchParen ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuExtra ctermfg=darkgray ctermbg=gray cterm=NONE
+  hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
+  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=gray cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
+  hi PreProc ctermfg=red ctermbg=NONE cterm=NONE
   hi Question ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=white ctermbg=NONE cterm=bold
-  hi MatchParen ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
   hi Search ctermfg=blue ctermbg=black cterm=reverse
-  hi IncSearch ctermfg=red ctermbg=black cterm=reverse
-  hi CurSearch ctermfg=red ctermbg=black cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
-  hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE
-  hi debugBreakpoint ctermfg=black ctermbg=red cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
-  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Character ctermfg=green ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi String ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Function ctermfg=green ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=blue ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=red ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Statement ctermfg=red ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=black ctermbg=gray cterm=NONE
+  hi StatusLineNC ctermfg=black ctermbg=darkgray cterm=NONE
+  hi String ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi TabLine ctermfg=black ctermbg=darkgray cterm=NONE
+  hi TabLineFill ctermfg=black ctermbg=darkgray cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=gray cterm=bold
   hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi DiffChange ctermfg=darkblue ctermbg=NONE cterm=reverse
-  hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse
-  hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse
-  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=white ctermbg=NONE cterm=bold
+  hi ToolbarButton ctermfg=darkgray ctermbg=white cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=darkgray ctermbg=darkgray cterm=NONE
+  hi Visual ctermfg=cyan ctermbg=black cterm=reverse
+  hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
+  hi debugBreakpoint ctermfg=black ctermbg=red cterm=NONE
+  hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE
   hi htmlBold ctermfg=white ctermbg=NONE cterm=bold
   hi htmlItalic ctermfg=white ctermbg=NONE cterm=underline
-  hi markdownHeadingDelimiter ctermfg=white ctermbg=NONE cterm=NONE
   hi markdownH1Delimiter ctermfg=red ctermbg=NONE cterm=NONE
   hi markdownH2Delimiter ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi markdownH4Delimiter ctermfg=blue ctermbg=NONE cterm=NONE
-  hi markdownH6Delimiter ctermfg=green ctermbg=NONE cterm=NONE
   hi markdownH3Delimiter ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi markdownH4Delimiter ctermfg=blue ctermbg=NONE cterm=NONE
   hi markdownH5Delimiter ctermfg=darkblue ctermbg=NONE cterm=NONE
-  unlet s:t_Co s:italics
+  hi markdownH6Delimiter ctermfg=green ctermbg=NONE cterm=NONE
+  hi markdownHeadingDelimiter ctermfg=white ctermbg=NONE cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=gray ctermbg=black cterm=NONE
-  hi StatusLine ctermfg=gray ctermbg=black cterm=bold,reverse
-  hi StatusLineNC ctermfg=gray ctermbg=black cterm=reverse
-  hi VertSplit ctermfg=gray ctermbg=gray cterm=NONE
-  hi TabLine ctermfg=black ctermbg=gray cterm=NONE
-  hi TabLineFill ctermfg=gray ctermbg=gray cterm=NONE
-  hi TabLineSel ctermfg=black ctermbg=gray cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=gray ctermbg=black cterm=reverse
-  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Comment ctermfg=gray ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=NONE cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse
+  hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=gray ctermbg=NONE cterm=bold
+  hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse
+  hi FoldColumn ctermfg=gray ctermbg=NONE cterm=bold
+  hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Function ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
   hi LineNr ctermfg=gray ctermbg=NONE cterm=bold
   hi LineNrAbove ctermfg=gray ctermbg=NONE cterm=bold
   hi LineNrBelow ctermfg=gray ctermbg=NONE cterm=bold
-  hi NonText ctermfg=gray ctermbg=NONE cterm=bold
-  hi EndOfBuffer ctermfg=gray ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold
-  hi FoldColumn ctermfg=gray ctermbg=NONE cterm=bold
-  hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
-  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
-  hi PmenuExtra ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=gray cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse
-  hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse
+  hi MatchParen ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=gray ctermbg=NONE cterm=bold
+  hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuExtra ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
+  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=gray cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
+  hi PreProc ctermfg=darkred ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=gray ctermbg=NONE cterm=bold
-  hi MatchParen ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
   hi Search ctermfg=black ctermbg=darkblue cterm=NONE
-  hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE
-  hi debugBreakpoint ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold
   hi SpellBad ctermfg=darkred ctermbg=gray cterm=reverse
   hi SpellCap ctermfg=darkblue ctermbg=gray cterm=reverse
   hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse
   hi SpellRare ctermfg=darkmagenta ctermbg=gray cterm=reverse
-  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=gray ctermbg=NONE cterm=bold
-  hi String ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Function ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
-  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=gray ctermbg=black cterm=reverse
+  hi String ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi TabLine ctermfg=black ctermbg=gray cterm=NONE
+  hi TabLineFill ctermfg=gray ctermbg=gray cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=gray cterm=bold
   hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=darkgreen ctermbg=NONE cterm=reverse
-  hi DiffChange ctermfg=darkblue ctermbg=NONE cterm=reverse
-  hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse
-  hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse
-  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=gray ctermbg=NONE cterm=bold
+  hi ToolbarButton ctermfg=gray ctermbg=black cterm=reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=gray ctermbg=gray cterm=NONE
+  hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi debugBreakpoint ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE
   hi htmlBold ctermfg=gray ctermbg=NONE cterm=bold
   hi htmlItalic ctermfg=gray ctermbg=NONE cterm=underline
-  hi markdownHeadingDelimiter ctermfg=gray ctermbg=NONE cterm=NONE
   hi markdownH1Delimiter ctermfg=darkred ctermbg=NONE cterm=NONE
   hi markdownH2Delimiter ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi markdownH4Delimiter ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi markdownH6Delimiter ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi markdownH3Delimiter ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi markdownH4Delimiter ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi markdownH5Delimiter ctermfg=darkblue ctermbg=NONE cterm=NONE
-  unlet s:t_Co s:italics
+  hi markdownH6Delimiter ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi markdownHeadingDelimiter ctermfg=gray ctermbg=NONE cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
   hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
   hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
-  hi CurSearch term=reverse
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co s:italics
+  hi Float term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: color00               #282923        235            black
-" Color: color08               #74705d        244            darkgray
-" Color: color01               #c61e5c        125            darkred
-" Color: color09               #f92672        197            red
-" Color: color02               #81af24        106            darkgreen
-" Color: color10               #a6e22e        112            green
-" Color: color03               #fd971f        208            darkyellow
-" Color: color11               #e6db74        185            yellow
-" Color: color04               #51aebe        73             darkblue
-" Color: color12               #66d9ef        81             blue
-" Color: color05               #ae81ff        141            darkmagenta
-" Color: color13               #fd5ff0        207            magenta
-" Color: color06               #80beb5        73             darkcyan
-" Color: color14               #a1efe4        116            cyan
-" Color: color07               #bababa        250            gray
-" Color: color15               #f8f8f2        255            white
-" Color: colorLine             #3a392f        237            darkgrey
-" Color: colorB                #585858        240            darkgrey
-" Color: colorF                #414141        238            darkgrey
-" Color: colorNonT             #8a8a8a        245            darkgrey
-" Color: colorC                #ffaf5f        215            red
-" Color: colorlC               #5fff00        82             green
-" Color: colorV                #1f3f5f        109            cyan
-" Color: colorMP               #fd971f        208            darkyellow
-" Color: diffAdd               #5faf5f        71             darkgreen
-" Color: diffDelete            #af5f5f        131            darkred
-" Color: diffChange            #5f87af        67             darkblue
-" Color: diffText              #af87af        139            darkmagenta
-" Color: black                 #000000        16             black
-" Color: white                 #dadada        253            white
-" Color: Added                 #5fd75f        77             darkgreen
-" Color: Changed               #ffaf5f        215            darkyellow
-" Color: Removed               #d75f5f        167            darkred
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
 " vim: et ts=8 sw=2 sts=2

runtime/colors/zaibatsu.vim

@@ -1,100 +1,29 @@
 " Name:         zaibatsu
 " Description:  "If you believe the journalists, he's the single wealthiest individual, period. As rich as some zaibatsu. But there's the catch, really: is he an individual? In the sense that you are, or I am? No." -- William Gibson, Count Zero
 " Author:       Romain Lafourcade <romainlafourcade@gmail.com>
-" Maintainer:   Romain Lafourcade <romainlafourcade@gmail.com>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Jun 18
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=dark
 
 hi clear
 let g:colors_name = 'zaibatsu'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#0e0024', '#d7005f', '#00af5f', '#ffaf00', '#5f5fff', '#d700ff', '#00afff', '#d7d5db', '#878092', '#ff5faf', '#00d700', '#ffd700', '#8787ff', '#ff87ff', '#00ffff', '#ffffff']
-endif
-hi Normal guifg=#ffffff guibg=#0e0024 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#afafff guibg=#0e0024 gui=NONE cterm=NONE
-hi NonText guifg=#878092 guibg=#0e0024 gui=NONE cterm=NONE
-hi SpellBad guifg=NONE guibg=NONE guisp=#ff5faf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
-hi SpellCap guifg=NONE guibg=NONE guisp=#87ff00 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
-hi SpellLocal guifg=NONE guibg=NONE guisp=#ffffff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
-hi SpellRare guifg=NONE guibg=NONE guisp=#ffafff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
-hi StatusLine guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE
-hi StatusLineNC guifg=#0e0024 guibg=#afaab6 gui=NONE cterm=NONE
-hi Pmenu guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuSbar guifg=#d7d5db guibg=#d7d5db gui=NONE cterm=NONE
-hi PmenuSel guifg=#0e0024 guibg=#afafff gui=NONE cterm=NONE
-hi PmenuThumb guifg=#878092 guibg=#878092 gui=NONE cterm=NONE
-hi PmenuExtra guifg=#878092 guibg=#ffffff gui=NONE cterm=NONE
-hi! link PmenuExtraSel PmenuSel
-hi PmenuKind guifg=#878092 guibg=#ffffff gui=NONE cterm=NONE
-hi! link PmenuKindSel PmenuSel
-hi PmenuMatch guifg=#d700ff guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#d700ff guibg=#afafff gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#510039 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#362b49 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#362b49 gui=NONE cterm=NONE
-hi WildMenu guifg=#0e0024 guibg=#afafff gui=NONE cterm=NONE
-hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Cursor guifg=#0e0024 guibg=#ffff5f gui=NONE cterm=NONE
-hi CursorIM guifg=#0e0024 guibg=#ffff5f gui=NONE cterm=NONE
-hi Error guifg=#d70000 guibg=#ffffff gui=reverse cterm=reverse
-hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
-hi FoldColumn guifg=#00afff guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#ffaf00 guibg=#0e0024 gui=reverse cterm=reverse
-hi IncSearch guifg=#ffaf00 guibg=#0e0024 gui=reverse cterm=reverse
-hi LineNr guifg=#afafff guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi ModeMsg guifg=#0e0024 guibg=#87ff00 gui=NONE cterm=NONE
-hi MoreMsg guifg=#87ffff guibg=NONE gui=NONE cterm=NONE
-hi Question guifg=#87ff00 guibg=NONE gui=NONE cterm=NONE
-hi QuickFixLine guifg=#ffafff guibg=#0e0024 gui=reverse cterm=reverse
-hi Search guifg=#87ffff guibg=#0e0024 gui=reverse cterm=reverse
-hi SignColumn guifg=#00afff guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#878092 guibg=NONE gui=NONE cterm=NONE
-hi ToolbarButton guifg=#ffffff guibg=#5e556d gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi VertSplit guifg=#afafff guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#0e0024 guibg=#5fd7ff gui=NONE cterm=NONE
-hi VisualNOS guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE
-hi WarningMsg guifg=#ffafff guibg=NONE gui=NONE cterm=NONE
-hi debugBreakpoint guifg=#87ff00 guibg=#5f00d7 gui=reverse cterm=reverse
-hi debugPC guifg=#87ffff guibg=#5f00d7 gui=reverse cterm=reverse
-hi Directory guifg=#87ffff guibg=NONE gui=NONE cterm=NONE
-hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Comment guifg=#afafff guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ffff5f guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#87ffff guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#878092 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#00afff guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#87ff00 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffafff guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi Type guifg=#ff5faf guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+let g:terminal_ansi_colors = ['#0e0024', '#d7005f', '#00af5f', '#ffaf00', '#5f5fff', '#d700ff', '#00afff', '#d7d5db', '#878092', '#ff5faf', '#00d700', '#ffd700', '#8787ff', '#ff87ff', '#00ffff', '#ffffff']
+
+hi! link Boolean Constant
+hi! link Character Constant
+hi! link Conditional Statement
 hi! link CurSearch IncSearch
 hi! link CursorLineFold CursorLine
 hi! link CursorLineNr CursorLine
 hi! link CursorLineSign CursorLine
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link StatusLineTerm StatusLine
-hi! link StatusLineTermNC StatusLineNC
-hi! link TabLine StatusLineNC
-hi! link TabLineFill StatusLineNC
-hi! link TabLineSel StatusLine
-hi! link Terminal Normal
-hi! link lCursor Cursor
-hi! link PopupSelected PmenuSel
-hi! link Boolean Constant
-hi! link Character Constant
-hi! link Conditional Statement
 hi! link Define PreProc
 hi! link Delimiter Special
 hi! link Exception Statement
@@ -103,473 +32,250 @@ hi! link Function Identifier
 hi! link Include PreProc
 hi! link Keyword Statement
 hi! link Label Statement
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link Macro PreProc
+hi! link MessageWindow Pmenu
 hi! link Number Constant
 hi! link Operator Statement
+hi! link PmenuExtraSel PmenuSel
+hi! link PmenuKindSel PmenuSel
+hi! link PopupNotification Todo
 hi! link PreCondit PreProc
 hi! link Repeat Statement
 hi! link SpecialChar Special
 hi! link SpecialComment Special
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
 hi! link StorageClass Type
 hi! link String Constant
 hi! link Structure Type
+hi! link TabLine StatusLineNC
+hi! link TabLineFill StatusLineNC
+hi! link TabLineSel StatusLine
 hi! link Tag Special
-hi! link Typedef Type
 hi! link Terminal Normal
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
-hi DiffAdd guifg=#87ff00 guibg=#362b49 gui=reverse cterm=reverse
-hi DiffChange guifg=#afafff guibg=#362b49 gui=reverse cterm=reverse
-hi DiffText guifg=#d7d5db guibg=#362b49 gui=reverse cterm=reverse
-hi DiffDelete guifg=#ff5faf guibg=#362b49 gui=reverse cterm=reverse
+hi! link Typedef Type
+hi! link lCursor Cursor
 
-if s:t_Co >= 256
-  hi Normal ctermfg=231 ctermbg=16 cterm=NONE
-  hi EndOfBuffer ctermfg=147 ctermbg=16 cterm=NONE
-  hi NonText ctermfg=103 ctermbg=16 cterm=NONE
-  hi SpellBad ctermfg=205 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=118 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=231 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=219 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=16 ctermbg=231 cterm=NONE
-  hi StatusLineNC ctermfg=16 ctermbg=146 cterm=NONE
-  hi Pmenu ctermfg=16 ctermbg=231 cterm=NONE
-  hi PmenuSbar ctermfg=189 ctermbg=189 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=147 cterm=NONE
-  hi PmenuThumb ctermfg=103 ctermbg=103 cterm=NONE
-  hi PmenuExtra ctermfg=103 ctermbg=231 cterm=NONE
-  hi! link PmenuExtraSel PmenuSel
-  hi PmenuKind ctermfg=103 ctermbg=231 cterm=NONE
-  hi! link PmenuKindSel PmenuSel
-  hi PmenuMatch ctermfg=165 ctermbg=231 cterm=NONE
-  hi PmenuMatchSel ctermfg=165 ctermbg=147 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=52 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
-  hi WildMenu ctermfg=16 ctermbg=147 cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=227 cterm=NONE
-  hi CursorIM ctermfg=16 ctermbg=227 cterm=NONE
-  hi Error ctermfg=160 ctermbg=231 cterm=reverse
-  hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
-  hi FoldColumn ctermfg=39 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=214 ctermbg=16 cterm=reverse
-  hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
-  hi LineNr ctermfg=147 ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi ModeMsg ctermfg=16 ctermbg=118 cterm=NONE
-  hi MoreMsg ctermfg=123 ctermbg=NONE cterm=NONE
-  hi Question ctermfg=118 ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=219 ctermbg=16 cterm=reverse
-  hi Search ctermfg=123 ctermbg=16 cterm=reverse
-  hi SignColumn ctermfg=39 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=103 ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=231 ctermbg=60 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit ctermfg=147 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=16 ctermbg=81 cterm=NONE
-  hi VisualNOS ctermfg=16 ctermbg=231 cterm=NONE
-  hi WarningMsg ctermfg=219 ctermbg=NONE cterm=NONE
-  hi debugBreakpoint ctermfg=118 ctermbg=56 cterm=reverse
-  hi debugPC ctermfg=123 ctermbg=56 cterm=reverse
-  hi Directory ctermfg=123 ctermbg=NONE cterm=NONE
-  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=147 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=227 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=123 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=103 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=39 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=118 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=219 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=205 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi! link CurSearch IncSearch
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineNr CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
-  hi! link Terminal Normal
-  hi! link lCursor Cursor
-  hi! link PopupSelected PmenuSel
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Label Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Statement
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link Terminal Normal
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=118 ctermbg=237 cterm=reverse
-  hi DiffChange ctermfg=147 ctermbg=237 cterm=reverse
-  hi DiffText ctermfg=189 ctermbg=237 cterm=reverse
-  hi DiffDelete ctermfg=205 ctermbg=237 cterm=reverse
-  unlet s:t_Co
+hi Normal guifg=#ffffff guibg=#0e0024 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#510039 guisp=NONE gui=NONE ctermfg=NONE ctermbg=52 cterm=NONE term=reverse
+hi Comment guifg=#afafff guibg=NONE guisp=NONE gui=NONE ctermfg=147 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ffff5f guibg=NONE guisp=NONE gui=NONE ctermfg=227 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#0e0024 guibg=#ffff5f guisp=NONE gui=NONE ctermfg=16 ctermbg=227 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#362b49 guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=NONE
+hi CursorIM guifg=#0e0024 guibg=#ffff5f guisp=NONE gui=NONE ctermfg=16 ctermbg=227 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#362b49 guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=underline
+hi DiffAdd guifg=#87ff00 guibg=#362b49 guisp=NONE gui=reverse ctermfg=118 ctermbg=237 cterm=reverse term=reverse
+hi DiffChange guifg=#afafff guibg=#362b49 guisp=NONE gui=reverse ctermfg=147 ctermbg=237 cterm=reverse term=NONE
+hi DiffDelete guifg=#ff5faf guibg=#362b49 guisp=NONE gui=reverse ctermfg=205 ctermbg=237 cterm=reverse term=reverse
+hi DiffText guifg=#d7d5db guibg=#362b49 guisp=NONE gui=reverse ctermfg=189 ctermbg=237 cterm=reverse term=reverse
+hi Directory guifg=#87ffff guibg=NONE guisp=NONE gui=NONE ctermfg=123 ctermbg=NONE cterm=NONE term=NONE
+hi EndOfBuffer guifg=#afafff guibg=#0e0024 guisp=NONE gui=NONE ctermfg=147 ctermbg=16 cterm=NONE term=NONE
+hi Error guifg=#d70000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=160 ctermbg=231 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#ffffff guibg=#d70000 guisp=NONE gui=NONE ctermfg=231 ctermbg=160 cterm=NONE term=bold,reverse
+hi FoldColumn guifg=#00afff guibg=NONE guisp=NONE gui=NONE ctermfg=39 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#ffaf00 guibg=#0e0024 guisp=NONE gui=reverse ctermfg=214 ctermbg=16 cterm=reverse term=NONE
+hi Identifier guifg=#87ffff guibg=NONE guisp=NONE gui=NONE ctermfg=123 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=#878092 guibg=NONE guisp=NONE gui=NONE ctermfg=103 ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#ffaf00 guibg=#0e0024 guisp=NONE gui=reverse ctermfg=214 ctermbg=16 cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#afafff guibg=NONE guisp=NONE gui=NONE ctermfg=147 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=bold,underline
+hi ModeMsg guifg=#0e0024 guibg=#87ff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=118 cterm=NONE term=bold
+hi MoreMsg guifg=#87ffff guibg=NONE guisp=NONE gui=NONE ctermfg=123 ctermbg=NONE cterm=NONE term=NONE
+hi NonText guifg=#878092 guibg=#0e0024 guisp=NONE gui=NONE ctermfg=103 ctermbg=16 cterm=NONE term=NONE
+hi Pmenu guifg=#0e0024 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=reverse
+hi PmenuExtra guifg=#878092 guibg=#ffffff guisp=NONE gui=NONE ctermfg=103 ctermbg=231 cterm=NONE term=NONE
+hi PmenuKind guifg=#878092 guibg=#ffffff guisp=NONE gui=NONE ctermfg=103 ctermbg=231 cterm=NONE term=NONE
+hi PmenuMatch guifg=#d700ff guibg=#ffffff guisp=NONE gui=NONE ctermfg=165 ctermbg=231 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#d700ff guibg=#afafff guisp=NONE gui=NONE ctermfg=165 ctermbg=147 cterm=NONE term=NONE
+hi PmenuSbar guifg=#d7d5db guibg=#d7d5db guisp=NONE gui=NONE ctermfg=189 ctermbg=189 cterm=NONE term=reverse
+hi PmenuSel guifg=#0e0024 guibg=#afafff guisp=NONE gui=NONE ctermfg=16 ctermbg=147 cterm=NONE term=bold
+hi PmenuThumb guifg=#878092 guibg=#878092 guisp=NONE gui=NONE ctermfg=103 ctermbg=103 cterm=NONE term=NONE
+hi PreProc guifg=#00afff guibg=NONE guisp=NONE gui=NONE ctermfg=39 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#87ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=118 ctermbg=NONE cterm=NONE term=standout
+hi QuickFixLine guifg=#ffafff guibg=#0e0024 guisp=NONE gui=reverse ctermfg=219 ctermbg=16 cterm=reverse term=NONE
+hi Search guifg=#87ffff guibg=#0e0024 guisp=NONE gui=reverse ctermfg=123 ctermbg=16 cterm=reverse term=reverse
+hi SignColumn guifg=#00afff guibg=NONE guisp=NONE gui=NONE ctermfg=39 ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#87ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=118 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#878092 guibg=NONE guisp=NONE gui=NONE ctermfg=103 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=NONE guibg=NONE guisp=#ff5faf gui=undercurl ctermfg=205 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=NONE guibg=NONE guisp=#87ff00 gui=undercurl ctermfg=118 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=NONE guibg=NONE guisp=#ffffff gui=undercurl ctermfg=231 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=NONE guibg=NONE guisp=#ffafff gui=undercurl ctermfg=219 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#ffafff guibg=NONE guisp=NONE gui=NONE ctermfg=219 ctermbg=NONE cterm=NONE term=NONE
+hi StatusLine guifg=#0e0024 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#0e0024 guibg=#afaab6 guisp=NONE gui=NONE ctermfg=16 ctermbg=146 cterm=NONE term=bold,underline
+hi Title guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi Todo guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=bold,reverse
+hi ToolbarButton guifg=#ffffff guibg=#5e556d guisp=NONE gui=NONE ctermfg=231 ctermbg=60 cterm=NONE term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Type guifg=#ff5faf guibg=NONE guisp=NONE gui=NONE ctermfg=205 ctermbg=NONE cterm=NONE term=NONE
+hi Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#afafff guibg=NONE guisp=NONE gui=NONE ctermfg=147 ctermbg=NONE cterm=NONE term=NONE
+hi Visual guifg=#0e0024 guibg=#5fd7ff guisp=NONE gui=NONE ctermfg=16 ctermbg=81 cterm=NONE term=reverse
+hi VisualNOS guifg=#0e0024 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=NONE
+hi WarningMsg guifg=#ffafff guibg=NONE guisp=NONE gui=NONE ctermfg=219 ctermbg=NONE cterm=NONE term=standout
+hi WildMenu guifg=#0e0024 guibg=#afafff guisp=NONE gui=NONE ctermfg=16 ctermbg=147 cterm=NONE term=bold
+hi debugBreakpoint guifg=#87ff00 guibg=#5f00d7 guisp=NONE gui=reverse ctermfg=118 ctermbg=56 cterm=reverse term=reverse
+hi debugPC guifg=#87ffff guibg=#5f00d7 guisp=NONE gui=reverse ctermfg=123 ctermbg=56 cterm=reverse term=reverse
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
-  hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE
-  hi NonText ctermfg=darkgray ctermbg=black cterm=NONE
-  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=white ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=white ctermbg=black cterm=reverse
-  hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=white cterm=NONE
-  hi PmenuSbar ctermfg=gray ctermbg=gray cterm=NONE
-  hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE
-  hi PmenuThumb ctermfg=darkgray ctermbg=darkgray cterm=NONE
-  hi PmenuExtra ctermfg=darkgray ctermbg=white cterm=NONE
   hi! link PmenuExtraSel PmenuSel
-  hi PmenuKind ctermfg=darkgray ctermbg=white cterm=NONE
   hi! link PmenuKindSel PmenuSel
-  hi PmenuMatch ctermfg=black ctermbg=white cterm=bold
-  hi PmenuMatchSel ctermfg=white ctermbg=blue cterm=bold
+  hi Normal ctermfg=white ctermbg=black cterm=NONE
   hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
-  hi WildMenu ctermfg=white ctermbg=blue cterm=NONE
+  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
   hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse
+  hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse
+  hi DiffText ctermfg=grey ctermbg=black cterm=reverse
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE
   hi Error ctermfg=red ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
   hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
   hi LineNr ctermfg=blue ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ModeMsg ctermfg=black ctermbg=green cterm=NONE
   hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkgray ctermbg=black cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=white cterm=NONE
+  hi PmenuExtra ctermfg=darkgray ctermbg=white cterm=NONE
+  hi PmenuKind ctermfg=darkgray ctermbg=white cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=white cterm=bold
+  hi PmenuMatchSel ctermfg=white ctermbg=blue cterm=bold
+  hi PmenuSbar ctermfg=gray ctermbg=gray cterm=NONE
+  hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE
+  hi PmenuThumb ctermfg=darkgray ctermbg=darkgray cterm=NONE
+  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
   hi QuickFixLine ctermfg=magenta ctermbg=black cterm=reverse
   hi Search ctermfg=cyan ctermbg=black cterm=reverse
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=green ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=white ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=white ctermbg=black cterm=reverse
+  hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=reverse
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ToolbarButton ctermfg=white ctermbg=darkgray cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=red ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=blue ctermbg=NONE cterm=NONE
   hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
   hi VisualNOS ctermfg=black ctermbg=white cterm=NONE
   hi WarningMsg ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=white ctermbg=blue cterm=NONE
   hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
   hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Special ctermfg=green ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=red ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi! link CurSearch IncSearch
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineNr CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
-  hi! link Terminal Normal
-  hi! link lCursor Cursor
-  hi! link PopupSelected PmenuSel
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Label Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Statement
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link Terminal Normal
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse
-  hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse
-  hi DiffText ctermfg=grey ctermbg=black cterm=reverse
-  hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 8
-  hi Normal ctermfg=gray ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE
-  hi NonText ctermfg=darkgray ctermbg=black cterm=NONE
-  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=white ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=white ctermbg=black cterm=reverse
-  hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=bold,reverse
-  hi Pmenu ctermfg=black ctermbg=white cterm=NONE
-  hi PmenuSbar ctermfg=white ctermbg=white cterm=NONE
-  hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE
-  hi PmenuThumb ctermfg=blue ctermbg=blue cterm=NONE
   hi! link PmenuExtra Pmenu
   hi! link PmenuExtraSel PmenuSel
   hi! link PmenuKind Pmenu
   hi! link PmenuKindSel PmenuSel
-  hi PmenuMatch ctermfg=black ctermbg=white cterm=bold
-  hi PmenuMatchSel ctermfg=white ctermbg=blue cterm=bold
+  hi Normal ctermfg=gray ctermbg=black cterm=NONE
   hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
-  hi WildMenu ctermfg=white ctermbg=blue cterm=NONE
+  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
   hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse
+  hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse
+  hi DiffText ctermfg=grey ctermbg=black cterm=reverse
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE
   hi Error ctermfg=red ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
   hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
   hi LineNr ctermfg=blue ctermbg=NONE cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ModeMsg ctermfg=black ctermbg=green cterm=NONE
   hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkgray ctermbg=black cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=white cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=white cterm=bold
+  hi PmenuMatchSel ctermfg=white ctermbg=blue cterm=bold
+  hi PmenuSbar ctermfg=white ctermbg=white cterm=NONE
+  hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE
+  hi PmenuThumb ctermfg=blue ctermbg=blue cterm=NONE
+  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
   hi QuickFixLine ctermfg=magenta ctermbg=black cterm=reverse
   hi Search ctermfg=cyan ctermbg=black cterm=reverse
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=green ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=white ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi Statement ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=white ctermbg=black cterm=reverse
+  hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=bold,reverse
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
   hi ToolbarButton ctermfg=white ctermbg=darkgray cterm=NONE
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=red ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
   hi VertSplit ctermfg=blue ctermbg=NONE cterm=NONE
   hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
   hi VisualNOS ctermfg=black ctermbg=white cterm=NONE
   hi WarningMsg ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=white ctermbg=blue cterm=NONE
   hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
   hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Special ctermfg=green ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=red ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi! link CurSearch IncSearch
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineNr CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
-  hi! link Terminal Normal
-  hi! link lCursor Cursor
-  hi! link PopupSelected PmenuSel
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  hi! link Delimiter Special
-  hi! link Exception Statement
-  hi! link Float Constant
-  hi! link Function Identifier
-  hi! link Include PreProc
-  hi! link Keyword Statement
-  hi! link Label Statement
-  hi! link Macro PreProc
-  hi! link Number Constant
-  hi! link Operator Statement
-  hi! link PreCondit PreProc
-  hi! link Repeat Statement
-  hi! link SpecialChar Special
-  hi! link SpecialComment Special
-  hi! link StorageClass Type
-  hi! link String Constant
-  hi! link Structure Type
-  hi! link Tag Special
-  hi! link Typedef Type
-  hi! link Terminal Normal
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse
-  hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse
-  hi DiffText ctermfg=grey ctermbg=black cterm=reverse
-  hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse
-  unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
   hi CursorLineFold term=underline
+  hi CursorLineNr term=bold
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi StatusLineTerm term=bold,reverse
+  hi StatusLineTermNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: dark
-" Color: background    #0e0024           16                black
-" Color: darkred       #510039           52                darkred
-" Color: darkgreen     #5faf00           70                darkgreen
-" Color: darkyellow    #ffaf00           214               darkyellow
-" Color: darkblue      #5f00d7           56                darkblue
-" Color: darkmagenta   #d700ff           165               darkmagenta
-" Color: darkcyan      #00afff           39                darkcyan
-" Color: red           #ff5faf           205               red
-" Color: green         #87ff00           118               green
-" Color: yellow        #ffff5f           227               yellow
-" Color: blue          #afafff           147               blue
-" Color: magenta       #ffafff           219               magenta
-" Color: cyan          #87ffff           123               cyan
-" Color: white         #ffffff           231               white
-" Color: neutral1      #D7D5DB           189               gray
-" Color: neutral2      #AFAAB6           146               gray
-" Color: neutral3      #878092           103               darkgray
-" Color: neutral4      #5E556D           60                darkgray
-" Color: neutral5      #362B49           237               darkgray
-" Color: error         #d70000           160               red
-" Color: visual        #5FD7FF           81                darkcyan
-" Color: Xdarkred      #d7005f           ~
-" Color: Xdarkgreen    #00af5f           ~
-" Color: Xdarkblue     #5f5fff           ~
-" Color: Xdarkwhite    #d7d7d7           ~
-" Color: Xgrey         #878787           ~
-" Color: Xbrightgreen  #00d700           ~
-" Color: Xbrightyellow #ffd700           ~
-" Color: Xbrightblue   #8787ff           ~
-" Color: Xbrightmagenta #ff87ff          ~
-" Color: Xbrightcyan   #00ffff           ~
-" Term colors: background
-" Term colors: Xdarkred
-" Term colors: Xdarkgreen
-" Term colors: darkyellow
-" Term colors: Xdarkblue
-" Term colors: darkmagenta
-" Term colors: darkcyan
-" Term colors: neutral1
-" Term colors: neutral3
-" Term colors: red
-" Term colors: Xbrightgreen
-" Term colors: Xbrightyellow
-" Term colors: Xbrightblue
-" Term colors: Xbrightmagenta
-" Term colors: Xbrightcyan
-" Term colors: white
-" Color: bgDiffA       #5F875F           65                darkgreen
-" Color: bgDiffT       #C6C6C6           251               grey
-" Color: fgDiffW       #FFFFFF           231               white
-" Color: fgDiffB       #000000           16                black
-" Color: bgDiffC8      #5F87AF           67                darkblue
-" Color: bgDiffD8      #AF5FAF           133               darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/colors/zellner.vim

@@ -2,420 +2,254 @@
 " Description:  Light background colorscheme.
 " Author:       Original author Ron Aaron <ron@ronware.org>
 " Maintainer:   Original maintainer Ron Aaron <ron@ronware.org>
-" Website:      https://github.com/vim/colorschemes
+" URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Jan 07
+" Last Change:  2025 Aug 03
 
-" Generated by Colortemplate v2.2.3
+" Generated by Colortemplate v3.0.0-beta9
 
 set background=light
 
 hi clear
 let g:colors_name = 'zellner'
 
-let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
+let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co)
+let s:tgc = has('termguicolors') && &termguicolors
+
+let g:terminal_ansi_colors = ['#ffffff', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#a9a9a9', '#ff0000', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#000000']
 
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#ffffff', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#a9a9a9', '#ff0000', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#000000']
-endif
-hi! link Terminal Normal
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link Float Number
+hi! link Function Identifier
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
+hi! link Number Constant
 hi! link PopupNotification Todo
-hi! link PopupSelected PmenuSel
-hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
-hi Folded guifg=#00008b guibg=#d3d3d3 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#e5e5e5 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#e5e5e5 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#a52a2a guibg=NONE gui=bold cterm=bold
-hi QuickFixLine guifg=#ffffff guibg=#6a5acd gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE
-hi StatusLine guifg=#ffff00 guibg=#a9a9a9 gui=NONE cterm=NONE
-hi StatusLineNC guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
-hi StatusLineTerm guifg=#ffffff guibg=#006400 gui=NONE cterm=NONE
-hi StatusLineTermNC guifg=#ffffff guibg=#0000ff gui=NONE cterm=NONE
-hi VertSplit guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
-hi Pmenu guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi PmenuSbar guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuThumb guifg=NONE guibg=#a9a9a9 gui=NONE cterm=NONE
-hi PmenuMatch guifg=#a52a2a guibg=#dadada gui=NONE cterm=NONE
-hi PmenuMatchSel guifg=#a52a2a guibg=#ffff00 gui=NONE cterm=NONE
-hi TabLine guifg=#000000 guibg=#a9a9a9 gui=underline cterm=underline
-hi TabLineFill guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi TabLineSel guifg=#000000 guibg=#ffffff gui=bold cterm=bold
-hi ToolbarLine guifg=NONE guibg=#d3d3d3 gui=NONE cterm=NONE
-hi ToolbarButton guifg=NONE guibg=#a9a9a9 gui=bold cterm=bold
-hi NonText guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi VisualNOS guifg=NONE guibg=#ff0000 gui=NONE cterm=NONE
-hi LineNr guifg=#a52a2a guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#00008b guibg=NONE gui=NONE cterm=NONE
-hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Underlined guifg=#6a5acd guibg=NONE gui=underline cterm=underline
-hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi ErrorMsg guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
-hi WarningMsg guifg=#a020f0 guibg=#ffffff gui=NONE cterm=NONE
-hi MoreMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
-hi ModeMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
-hi Question guifg=#ff00ff guibg=NONE gui=bold cterm=bold
-hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi MatchParen guifg=#ffffff guibg=#ff00ff gui=NONE cterm=NONE
-hi Search guifg=#ffffff guibg=#a020f0 gui=NONE cterm=NONE
-hi IncSearch guifg=#000000 guibg=NONE gui=reverse cterm=reverse
-hi WildMenu guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-hi Cursor guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
-hi lCursor guifg=#000000 guibg=#ff00ff gui=NONE cterm=NONE
-hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
-hi SpellCap guifg=#0000ff guibg=NONE guisp=#0000ff gui=undercurl cterm=underline
-hi SpellLocal guifg=#878700 guibg=NONE guisp=#878700 gui=undercurl cterm=underline
-hi SpellRare guifg=#008787 guibg=NONE guisp=#008787 gui=undercurl cterm=underline
-hi Comment guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#0000ff guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#a52a2a guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#a020f0 guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#0000ff guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
-hi Tag guifg=#006400 guibg=NONE gui=NONE cterm=NONE
-hi Directory guifg=#0000ff guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Title guifg=#a020f0 guibg=NONE gui=bold cterm=bold
-hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
-hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
-hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE
+hi! link TabPanel Normal
+hi! link TabPanelFill EndOfBuffer
+hi! link Terminal Normal
 
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi! link PopupSelected PmenuSel
-  hi Normal ctermfg=16 ctermbg=231 cterm=NONE
-  hi Folded ctermfg=18 ctermbg=252 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE
-  hi CursorLineNr ctermfg=124 ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=231 ctermbg=62 cterm=NONE
-  hi EndOfBuffer ctermfg=248 ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=226 ctermbg=248 cterm=NONE
-  hi StatusLineNC ctermfg=231 ctermbg=16 cterm=NONE
-  hi StatusLineTerm ctermfg=231 ctermbg=22 cterm=NONE
-  hi StatusLineTermNC ctermfg=231 ctermbg=21 cterm=NONE
-  hi VertSplit ctermfg=231 ctermbg=16 cterm=NONE
-  hi Pmenu ctermfg=16 ctermbg=253 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=231 cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=248 cterm=NONE
-  hi PmenuMatch ctermfg=124 ctermbg=253 cterm=NONE
-  hi PmenuMatchSel ctermfg=124 ctermbg=226 cterm=NONE
-  hi TabLine ctermfg=16 ctermbg=248 cterm=underline
-  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=16 ctermbg=231 cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=252 cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=248 cterm=bold
-  hi NonText ctermfg=248 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=248 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=16 ctermbg=226 cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=196 cterm=NONE
-  hi LineNr ctermfg=124 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=18 ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=62 ctermbg=NONE cterm=underline
-  hi Error ctermfg=196 ctermbg=231 cterm=reverse
-  hi ErrorMsg ctermfg=196 ctermbg=231 cterm=reverse
-  hi WarningMsg ctermfg=129 ctermbg=231 cterm=NONE
-  hi MoreMsg ctermfg=16 ctermbg=231 cterm=bold
-  hi ModeMsg ctermfg=16 ctermbg=231 cterm=bold
-  hi Question ctermfg=201 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=16 ctermbg=226 cterm=NONE
-  hi MatchParen ctermfg=231 ctermbg=201 cterm=NONE
-  hi Search ctermfg=231 ctermbg=129 cterm=NONE
-  hi IncSearch ctermfg=16 ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=16 ctermbg=226 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=255 cterm=NONE
-  hi Cursor ctermfg=231 ctermbg=16 cterm=NONE
-  hi lCursor ctermfg=16 ctermbg=201 cterm=NONE
-  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=21 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=100 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=30 ctermbg=NONE cterm=underline
-  hi Comment ctermfg=196 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=21 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=124 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=129 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=21 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=201 ctermbg=NONE cterm=NONE
-  hi Tag ctermfg=22 ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=21 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=248 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=129 ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
-  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
-  hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE
-  unlet s:t_Co
+hi Normal guifg=#000000 guibg=#ffffff guisp=NONE gui=NONE ctermfg=16 ctermbg=231 cterm=NONE term=NONE
+hi ColorColumn guifg=NONE guibg=#eeeeee guisp=NONE gui=NONE ctermfg=NONE ctermbg=255 cterm=NONE term=reverse
+hi Comment guifg=#ff0000 guibg=NONE guisp=NONE gui=NONE ctermfg=196 ctermbg=NONE cterm=NONE term=bold
+hi Conceal guifg=#a9a9a9 guibg=NONE guisp=NONE gui=NONE ctermfg=248 ctermbg=NONE cterm=NONE term=NONE
+hi Constant guifg=#ff00ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE
+hi Cursor guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=reverse
+hi CursorColumn guifg=NONE guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=NONE
+hi CursorLine guifg=NONE guibg=#e5e5e5 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=underline
+hi CursorLineNr guifg=#a52a2a guibg=NONE guisp=NONE gui=bold ctermfg=124 ctermbg=NONE cterm=bold term=bold
+hi DiffAdd guifg=#ffffff guibg=#5f875f guisp=NONE gui=NONE ctermfg=231 ctermbg=65 cterm=NONE term=reverse
+hi DiffChange guifg=#ffffff guibg=#5f87af guisp=NONE gui=NONE ctermfg=231 ctermbg=67 cterm=NONE term=NONE
+hi DiffDelete guifg=#ffffff guibg=#af5faf guisp=NONE gui=NONE ctermfg=231 ctermbg=133 cterm=NONE term=reverse
+hi DiffText guifg=#000000 guibg=#c6c6c6 guisp=NONE gui=NONE ctermfg=16 ctermbg=251 cterm=NONE term=reverse
+hi Directory guifg=#0000ff guibg=NONE guisp=NONE gui=bold ctermfg=21 ctermbg=NONE cterm=bold term=NONE
+hi EndOfBuffer guifg=#a9a9a9 guibg=NONE guisp=NONE gui=NONE ctermfg=248 ctermbg=NONE cterm=NONE term=NONE
+hi Error guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi ErrorMsg guifg=#ff0000 guibg=#ffffff guisp=NONE gui=reverse ctermfg=196 ctermbg=231 cterm=reverse term=bold,reverse
+hi FoldColumn guifg=#00008b guibg=NONE guisp=NONE gui=NONE ctermfg=18 ctermbg=NONE cterm=NONE term=NONE
+hi Folded guifg=#00008b guibg=#d3d3d3 guisp=NONE gui=NONE ctermfg=18 ctermbg=252 cterm=NONE term=NONE
+hi Identifier guifg=#0000ff guibg=NONE guisp=NONE gui=NONE ctermfg=21 ctermbg=NONE cterm=NONE term=NONE
+hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=NONE
+hi IncSearch guifg=#000000 guibg=NONE guisp=NONE gui=reverse ctermfg=16 ctermbg=NONE cterm=reverse term=bold,reverse,underline
+hi LineNr guifg=#a52a2a guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE
+hi MatchParen guifg=#ffffff guibg=#ff00ff guisp=NONE gui=NONE ctermfg=231 ctermbg=201 cterm=NONE term=bold,underline
+hi ModeMsg guifg=#000000 guibg=#ffffff guisp=NONE gui=bold ctermfg=16 ctermbg=231 cterm=bold term=bold
+hi MoreMsg guifg=#000000 guibg=#ffffff guisp=NONE gui=bold ctermfg=16 ctermbg=231 cterm=bold term=NONE
+hi NonText guifg=#a9a9a9 guibg=NONE guisp=NONE gui=NONE ctermfg=248 ctermbg=NONE cterm=NONE term=NONE
+hi Pmenu guifg=#000000 guibg=#dadada guisp=NONE gui=NONE ctermfg=16 ctermbg=253 cterm=NONE term=reverse
+hi PmenuMatch guifg=#a52a2a guibg=#dadada guisp=NONE gui=NONE ctermfg=124 ctermbg=253 cterm=NONE term=NONE
+hi PmenuMatchSel guifg=#a52a2a guibg=#ffff00 guisp=NONE gui=NONE ctermfg=124 ctermbg=226 cterm=NONE term=NONE
+hi PmenuSbar guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=reverse
+hi PmenuSel guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
+hi PmenuThumb guifg=NONE guibg=#a9a9a9 guisp=NONE gui=NONE ctermfg=NONE ctermbg=248 cterm=NONE term=NONE
+hi PreProc guifg=#a020f0 guibg=NONE guisp=NONE gui=NONE ctermfg=129 ctermbg=NONE cterm=NONE term=NONE
+hi Question guifg=#ff00ff guibg=NONE guisp=NONE gui=bold ctermfg=201 ctermbg=NONE cterm=bold term=standout
+hi QuickFixLine guifg=#ffffff guibg=#6a5acd guisp=NONE gui=NONE ctermfg=231 ctermbg=62 cterm=NONE term=NONE
+hi Search guifg=#ffffff guibg=#a020f0 guisp=NONE gui=NONE ctermfg=231 ctermbg=129 cterm=NONE term=reverse
+hi SignColumn guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
+hi Special guifg=#ff00ff guibg=NONE guisp=NONE gui=NONE ctermfg=201 ctermbg=NONE cterm=NONE term=NONE
+hi SpecialKey guifg=#a9a9a9 guibg=NONE guisp=NONE gui=NONE ctermfg=248 ctermbg=NONE cterm=NONE term=bold
+hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl ctermfg=196 ctermbg=NONE cterm=underline term=underline
+hi SpellCap guifg=#0000ff guibg=NONE guisp=#0000ff gui=undercurl ctermfg=21 ctermbg=NONE cterm=underline term=underline
+hi SpellLocal guifg=#878700 guibg=NONE guisp=#878700 gui=undercurl ctermfg=100 ctermbg=NONE cterm=underline term=underline
+hi SpellRare guifg=#008787 guibg=NONE guisp=#008787 gui=undercurl ctermfg=30 ctermbg=NONE cterm=underline term=underline
+hi Statement guifg=#a52a2a guibg=NONE guisp=NONE gui=NONE ctermfg=124 ctermbg=NONE cterm=NONE term=NONE
+hi StatusLine guifg=#ffff00 guibg=#a9a9a9 guisp=NONE gui=NONE ctermfg=226 ctermbg=248 cterm=NONE term=bold,reverse
+hi StatusLineNC guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=bold,underline
+hi StatusLineTerm guifg=#ffffff guibg=#006400 guisp=NONE gui=NONE ctermfg=231 ctermbg=22 cterm=NONE term=bold,reverse
+hi StatusLineTermNC guifg=#ffffff guibg=#0000ff guisp=NONE gui=NONE ctermfg=231 ctermbg=21 cterm=NONE term=bold,underline
+hi TabLine guifg=#000000 guibg=#a9a9a9 guisp=NONE gui=underline ctermfg=16 ctermbg=248 cterm=underline term=bold,underline
+hi TabLineFill guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse term=NONE
+hi TabLineSel guifg=#000000 guibg=#ffffff guisp=NONE gui=bold ctermfg=16 ctermbg=231 cterm=bold term=bold,reverse
+hi Tag guifg=#006400 guibg=NONE guisp=NONE gui=NONE ctermfg=22 ctermbg=NONE cterm=NONE term=NONE
+hi Title guifg=#a020f0 guibg=NONE guisp=NONE gui=bold ctermfg=129 ctermbg=NONE cterm=bold term=NONE
+hi Todo guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold,reverse
+hi ToolbarButton guifg=NONE guibg=#a9a9a9 guisp=NONE gui=bold ctermfg=NONE ctermbg=248 cterm=bold term=bold,reverse
+hi ToolbarLine guifg=NONE guibg=#d3d3d3 guisp=NONE gui=NONE ctermfg=NONE ctermbg=252 cterm=NONE term=reverse
+hi Type guifg=#0000ff guibg=NONE guisp=NONE gui=NONE ctermfg=21 ctermbg=NONE cterm=NONE term=NONE
+hi Underlined guifg=#6a5acd guibg=NONE guisp=NONE gui=underline ctermfg=62 ctermbg=NONE cterm=underline term=underline
+hi VertSplit guifg=#ffffff guibg=#000000 guisp=NONE gui=NONE ctermfg=231 ctermbg=16 cterm=NONE term=NONE
+hi Visual guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=reverse
+hi VisualNOS guifg=NONE guibg=#ff0000 guisp=NONE gui=NONE ctermfg=NONE ctermbg=196 cterm=NONE term=NONE
+hi WarningMsg guifg=#a020f0 guibg=#ffffff guisp=NONE gui=NONE ctermfg=129 ctermbg=231 cterm=NONE term=standout
+hi WildMenu guifg=#000000 guibg=#ffff00 guisp=NONE gui=NONE ctermfg=16 ctermbg=226 cterm=NONE term=bold
+hi lCursor guifg=#000000 guibg=#ff00ff guisp=NONE gui=NONE ctermfg=16 ctermbg=201 cterm=NONE term=NONE
+
+if s:tgc || s:t_Co >= 256
   finish
 endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=black ctermbg=white cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ColorColumn ctermfg=NONE ctermbg=grey cterm=NONE
+  hi Comment ctermfg=red ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=white ctermbg=black cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkred ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=blue ctermbg=NONE cterm=bold
   hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=yellow ctermbg=darkgrey cterm=NONE
-  hi StatusLineNC ctermfg=white ctermbg=black cterm=NONE
-  hi StatusLineTerm ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi StatusLineTermNC ctermfg=white ctermbg=blue cterm=NONE
-  hi VertSplit ctermfg=white ctermbg=black cterm=NONE
-  hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
-  hi TabLine ctermfg=black ctermbg=grey cterm=underline
-  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
-  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
-  hi ToolbarButton ctermfg=NONE ctermbg=grey cterm=bold
-  hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=black ctermbg=yellow cterm=NONE
-  hi VisualNOS ctermfg=NONE ctermbg=red cterm=NONE
-  hi LineNr ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
   hi Error ctermfg=red ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=red ctermbg=white cterm=reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=NONE
-  hi MoreMsg ctermfg=black ctermbg=white cterm=bold
-  hi ModeMsg ctermfg=black ctermbg=white cterm=bold
-  hi Question ctermfg=magenta ctermbg=NONE cterm=bold
-  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
-  hi MatchParen ctermfg=white ctermbg=magenta cterm=NONE
-  hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Identifier ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=black ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=grey cterm=NONE
-  hi Cursor ctermfg=white ctermbg=black cterm=NONE
-  hi lCursor ctermfg=black ctermbg=magenta cterm=NONE
+  hi LineNr ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=white ctermbg=magenta cterm=NONE
+  hi ModeMsg ctermfg=black ctermbg=white cterm=bold
+  hi MoreMsg ctermfg=black ctermbg=white cterm=bold
+  hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Question ctermfg=magenta ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=white ctermbg=blue cterm=NONE
+  hi Search ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=blue ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=darkyellow ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
-  hi Comment ctermfg=red ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=blue ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Type ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=yellow ctermbg=darkgrey cterm=NONE
+  hi StatusLineNC ctermfg=white ctermbg=black cterm=NONE
+  hi StatusLineTerm ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi StatusLineTermNC ctermfg=white ctermbg=blue cterm=NONE
+  hi TabLine ctermfg=black ctermbg=grey cterm=underline
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi TabLineSel ctermfg=black ctermbg=white cterm=bold
   hi Tag ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=blue ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
+  hi ToolbarButton ctermfg=NONE ctermbg=grey cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
+  hi Type ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=white ctermbg=black cterm=NONE
+  hi Visual ctermfg=black ctermbg=yellow cterm=NONE
+  hi VisualNOS ctermfg=NONE ctermbg=red cterm=NONE
+  hi WarningMsg ctermfg=darkmagenta ctermbg=white cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+  hi lCursor ctermfg=black ctermbg=magenta cterm=NONE
   finish
 endif
 
 if s:t_Co >= 8
   hi Normal ctermfg=black ctermbg=gray cterm=NONE
-  hi Folded ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=white ctermbg=black cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=darkred ctermbg=NONE cterm=bold
-  hi QuickFixLine ctermfg=gray ctermbg=darkblue cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
+  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
+  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+  hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
   hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=bold
-  hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse
-  hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse
-  hi StatusLineTerm ctermfg=black ctermbg=gray cterm=bold,reverse
-  hi StatusLineTermNC ctermfg=black ctermbg=gray cterm=reverse
-  hi VertSplit ctermfg=black ctermbg=gray cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=darkmagenta cterm=NONE
-  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
-  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
-  hi TabLine ctermfg=black ctermbg=gray cterm=reverse
-  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi TabLineSel ctermfg=gray ctermbg=black cterm=bold,reverse
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
-  hi NonText ctermfg=gray ctermbg=NONE cterm=bold
-  hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
-  hi LineNr ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi SignColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
   hi Error ctermfg=darkred ctermbg=black cterm=reverse
   hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
-  hi WarningMsg ctermfg=darkmagenta ctermbg=black cterm=NONE
-  hi MoreMsg ctermfg=gray ctermbg=black cterm=bold
-  hi ModeMsg ctermfg=gray ctermbg=black cterm=bold
-  hi Question ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi MatchParen ctermfg=black ctermbg=darkmagenta cterm=NONE
-  hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Identifier ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=gray ctermbg=NONE cterm=reverse
-  hi WildMenu ctermfg=gray ctermbg=darkyellow cterm=NONE
-  hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE
+  hi LineNr ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi ModeMsg ctermfg=gray ctermbg=black cterm=bold
+  hi MoreMsg ctermfg=gray ctermbg=black cterm=bold
+  hi NonText ctermfg=gray ctermbg=NONE cterm=bold
+  hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
+  hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkmagenta cterm=NONE
+  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi Question ctermfg=darkmagenta ctermbg=NONE cterm=bold
+  hi QuickFixLine ctermfg=gray ctermbg=darkblue cterm=NONE
+  hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi SignColumn ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
   hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=reverse
   hi SpellLocal ctermfg=darkyellow ctermbg=darkblue cterm=reverse
   hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=reverse
-  hi Comment ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkred ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi Type ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Special ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse
+  hi StatusLineTerm ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=black ctermbg=gray cterm=reverse
+  hi TabLine ctermfg=black ctermbg=gray cterm=reverse
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi TabLineSel ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi Tag ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
-  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-  hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE
-  unlet s:t_Co
+  hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi VertSplit ctermfg=black ctermbg=gray cterm=reverse
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
+  hi WarningMsg ctermfg=darkmagenta ctermbg=black cterm=NONE
+  hi WildMenu ctermfg=gray ctermbg=darkyellow cterm=NONE
+  hi lCursor ctermfg=black ctermbg=magenta cterm=NONE
   finish
 endif
 
 if s:t_Co >= 0
-  hi Normal term=NONE
-  hi ColorColumn term=reverse
-  hi Conceal term=NONE
-  hi Cursor term=reverse
-  hi CursorColumn term=NONE
-  hi CursorLine term=underline
-  hi CursorLineNr term=bold
-  hi DiffAdd term=reverse
-  hi DiffChange term=NONE
-  hi DiffDelete term=reverse
-  hi DiffText term=reverse
-  hi Directory term=NONE
-  hi EndOfBuffer term=NONE
-  hi ErrorMsg term=bold,reverse
-  hi FoldColumn term=NONE
-  hi Folded term=NONE
-  hi IncSearch term=bold,reverse,underline
-  hi LineNr term=NONE
-  hi MatchParen term=bold,underline
-  hi ModeMsg term=bold
-  hi MoreMsg term=NONE
-  hi NonText term=NONE
-  hi Pmenu term=reverse
-  hi PmenuSbar term=reverse
-  hi PmenuSel term=bold
-  hi PmenuThumb term=NONE
-  hi Question term=standout
-  hi Search term=reverse
-  hi SignColumn term=reverse
-  hi SpecialKey term=bold
-  hi SpellBad term=underline
-  hi SpellCap term=underline
-  hi SpellLocal term=underline
-  hi SpellRare term=underline
-  hi StatusLine term=bold,reverse
-  hi StatusLineNC term=bold,underline
-  hi TabLine term=bold,underline
-  hi TabLineFill term=NONE
-  hi Terminal term=NONE
-  hi TabLineSel term=bold,reverse
-  hi Title term=NONE
-  hi VertSplit term=NONE
-  hi Visual term=reverse
-  hi VisualNOS term=NONE
-  hi WarningMsg term=standout
-  hi WildMenu term=bold
-  hi CursorIM term=NONE
-  hi ToolbarLine term=reverse
-  hi ToolbarButton term=bold,reverse
   hi CurSearch term=reverse
+  hi CursorIM term=NONE
   hi CursorLineFold term=underline
   hi CursorLineSign term=underline
-  hi Comment term=bold
-  hi Constant term=NONE
-  hi Error term=bold,reverse
-  hi Identifier term=NONE
-  hi Ignore term=NONE
-  hi PreProc term=NONE
-  hi Special term=NONE
-  hi Statement term=NONE
-  hi Todo term=bold,reverse
-  hi Type term=NONE
-  hi Underlined term=underline
-  unlet s:t_Co
+  hi Float term=NONE
+  hi Function term=NONE
+  hi Number term=NONE
+  hi Terminal term=NONE
   finish
 endif
 
-" Background: light
-" Color: comment     #ff0000        196            red
-" Color: constant    #ff00ff        201            magenta
-" Color: identifier  #0000ff        21             blue
-" Color: statement   #a52a2a        124            darkred
-" Color: preproc     #a020f0        129            darkmagenta
-" Color: type        #0000ff        21             blue
-" Color: special     #ff00ff        201            magenta
-" Color: tag         #006400        22             darkgreen
-" Color: fg0         #000000        16             black
-" Color: bg0         #ffffff        231            white
-" Color: bg1         #a9a9a9        248            grey
-" Color: status      #a9a9a9        248            darkgrey
-" Color: visual      #ffff00        226            yellow
-" Color: folded      #d3d3d3        252            black
-" Color: folded_fg   #00008b        18             darkblue
-" Color: cursorline  #e5e5e5        254            black
-" Color: pmenu       #dadada        253            grey
-" Color: wildmenu    #ffff00        226            yellow
-" Color: error       #ff0000        196            red
-" Color: linenr      #a52a2a        124            darkred
-" Color: colorcolumn #eeeeee        255            grey
-" Color: slateblue   #6a5acd        62             blue
-" Color: black       #000000        16             black
-" Color: darkred     #870000        88             darkred
-" Color: darkgreen   #008700        28             darkgreen
-" Color: darkyellow  #878700        100            darkyellow
-" Color: darkblue    #000087        18             darkblue
-" Color: darkmagenta #870087        18             darkmagenta
-" Color: darkcyan    #008787        30             darkcyan
-" Color: gray        #878787        102            gray
-" Term colors: bg0     statement constant preproc identifier type special bg1
-" Term colors: comment statement constant preproc identifier type special fg0
-" Color: bgDiffA     #5F875F        65             darkgreen
-" Color: bgDiffC     #5F87AF        67             blue
-" Color: bgDiffD     #AF5FAF        133            magenta
-" Color: bgDiffT     #C6C6C6        251            grey
-" Color: fgDiffW     #FFFFFF        231            white
-" Color: fgDiffB     #000000        16             black
-" Color: bgDiffC8    #5F87AF        67             darkblue
-" Color: bgDiffD8    #AF5FAF        133            darkmagenta
 " vim: et ts=8 sw=2 sts=2

runtime/doc/builtin.txt

@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 9.1.  Last change: 2025 Aug 20
+*builtin.txt*	For Vim version 9.1.  Last change: 2025 Aug 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -344,7 +344,7 @@ isinf({expr})			Number	determine if {expr} is infinity value
 					(positive or negative)
 islocked({expr})		Number	|TRUE| if {expr} is locked
 isnan({expr})			Number	|TRUE| if {expr} is NaN
-items({expr})			List	key-value pairs in {expr}
+items({expr})			List	key/index-value pairs in {expr}
 job_getchannel({job})		Channel	get the channel handle for {job}
 job_info([{job}])		Dict	get information about {job}
 job_setoptions({job}, {options}) none	set options for {job}
@@ -747,6 +747,8 @@ undofile({name})		String	undo file name for {name}
 undotree([{buf}])		List	undo file tree for buffer {buf}
 uniq({list} [, {func} [, {dict}]])
 				List	remove adjacent duplicates from a list
+uri_decode({string})		String	URI-decode a string
+uri_encode({string})		String	URI-encode a string
 utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
 				Number	UTF-16 index of byte {idx} in {string}
 values({dict})			List	values in {dict}
@@ -6314,7 +6316,8 @@ items({expr})						*items()*
 		Return a |List| with all key/index and value pairs of {expr}.
 		Each |List| item is a list with two items:
 		- for a |Dict|: the key and the value
-		- for a |List|, |Tuple| or |String|: the index and the value
+		- for a |List|, |Tuple|, |Blob| or |String|: the index and the
+		  value
 		The returned |List| is in arbitrary order for a |Dict|,
 		otherwise it's in ascending order of the index.
 
@@ -6328,6 +6331,7 @@ items({expr})						*items()*
 			echo items([1, 2, 3])
 			echo items(('a', 'b', 'c'))
 			echo items("foobar")
+			echo items(0z0102)
 <
 		Can also be used as a |method|: >
 			mydict->items()
@@ -12185,6 +12189,59 @@ uniq({list} [, {func} [, {dict}]])			*uniq()* *E882*
 		Return type: list<{type}>
 
 
+uri_decode({string})					*uri_decode()*
+		Returns the URI-decoded form of {string}, reversing
+		percent-encoding (converting sequences like "%3D" back to
+		the corresponding character).
+
+		The decoding follows standard percent-decoding rules:
+		    - "%HH" is replaced with the character for the hex value
+		      HH.
+		    - If the decoded bytes form valid UTF-8, they are combined
+		      into the corresponding character(s).  Otherwise, the
+		      bytes are kept as-is.
+		    - Invalid or incomplete encodings (e.g. "%GZ", "%3", or a
+		      trailing "%") are left unchanged.
+
+		Returns an empty String if {string} is empty.
+
+		Example: >
+			:echo uri_decode('c%3A%5Cmy%5Cdir%5Cfoo%20bar')
+			c:\my\dir\foo bar
+			:echo uri_decode('%CE%B1%CE%B2%CE%B3')
+			αβγ
+<
+		Can also be used as a |method|: >
+			mystr->uri_decode()
+<
+		Return type: |String|
+
+uri_encode({string})					*uri_encode()*
+		Returns the URI-encoded form of {string}.  URI encoding
+		replaces unsafe or reserved characters with percent-encoded
+		sequences.
+
+		The encoding follows standard percent-encoding rules:
+                    - Alphanumeric characters [0-9A-Za-z] remain unchanged.
+                    - The characters "-", "_", ".", and "~" also remain
+                      unchanged.
+                    - All other characters are replaced with "%HH", where HH
+                      is the two-digit uppercase hexadecimal value.
+                    - Existing percent-encoded sequences are not modified.
+
+		Returns an empty String if {string} is empty.
+
+		Example: >
+			:echo uri_encode('c:\my\dir\foo bar')
+			c%3A%5Cmy%5Cdir%5Cfoo%20bar
+			:echo uri_encode('key=value&name=αβγ')
+			key%3Dvalue%26name%3D%CE%B1%CE%B2%CE%B3
+<
+		Can also be used as a |method|: >
+			mystr->uri_encode()
+<
+		Return type: |String|
+
 							*utf16idx()*
 utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
 		Same as |charidx()| but returns the UTF-16 code unit index of

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 9.1.  Last change: 2025 Aug 20
+*eval.txt*	For Vim version 9.1.  Last change: 2025 Aug 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2911,6 +2911,12 @@ v:termu7resp	The escape sequence returned by the terminal for the |t_u7|
 		this option is set, the TermResponseAll autocommand event is
 		fired, with <amatch> set to "ambiguouswidth".
 
+						*v:termda1*
+v:termda1	The escape sequence returned by a primary device attributes
+		(DA1) query from the terminal.  When this option is set, the
+		TermResponseAll autocommand event is fired, with <amatch> set
+		to "da1".  Can be used to detect OSC 52 support in a terminal.
+
 					*v:testing* *testing-variable*
 v:testing	Must be set before using `test_garbagecollect_now()`.
 		Also, when set certain error messages won't be shown for 2

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.1.  Last change: 2025 Aug 20
+*options.txt*	For Vim version 9.1.  Last change: 2025 Aug 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -922,8 +922,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'autocompletedelay' 'acl'	number	(default 0)
 				global
 	Delay in milliseconds before the autocomplete menu appears after
-	typing. If you prefer it not to open too quickly, set this value
-	slightly above your typing speed. See |ins-autocompletion|.
+	typing.  If you prefer it not to open too quickly, set this value
+	slightly above your typing speed.  See |ins-autocompletion|.
 
 			*'autoindent'* *'ai'* *'noautoindent'* *'noai'*
 'autoindent' 'ai'	boolean	(default off)

runtime/doc/pattern.txt

@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 9.1.  Last change: 2025 Aug 13
+*pattern.txt*   For Vim version 9.1.  Last change: 2025 Aug 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1505,11 +1505,11 @@ Fuzzy matching scores how well a string matches a pattern when the pattern
 characters appear in order but not necessarily contiguously.
 
 Example: >
-    Pattern:    "vim"
-    Candidates: "vim"        -> perfect
-                "vimeo"      -> good (v i m)
-                "voice mail" -> weaker (v _ i _ _ _ m)
-                "vintage"    -> no match (no "m")
+    Pattern:	"vim"
+    Candidates:	"vim"	     -> perfect
+		"vimeo"	     -> good (v i m)
+		"voice mail" -> weaker (v _ i _ _ _ m)
+		"vintage"    -> no match (no "m")
 <
 If the search string has multiple words, each word is matched separately and
 may appear in any order in the candidate.  For example "get pat" matches

runtime/doc/remote.txt

@@ -1,4 +1,4 @@
-*remote.txt*    For Vim version 9.1.  Last change: 2025 Aug 18
+*remote.txt*    For Vim version 9.1.  Last change: 2025 Aug 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -9,6 +9,7 @@ Vim client-server communication				*client-server*
 1. Common functionality		|clientserver|
 2. X11 specific items		|x11-clientserver|
 3. MS-Windows specific items	|w32-clientserver|
+4. Socket server specific items	|socketserver-clientserver|
 
 ==============================================================================
 1. Common functionality					*clientserver*
@@ -77,10 +78,10 @@ The following command line arguments are available:
    --serverlist			Output a list of server names.
 								*--clientserver*
    --clientserver {method}	Use the specified method {method} as the
-				backend for clientserver functionality. Can
+				backend for clientserver functionality.  Can
 				either be "socket" or "x11".
-				{only available when Vim is compiled with both
-				|+X11| and |+socketserver| features}
+				{only available when compiled with both |+X11|
+				and |+socketserver| features}
 
 
 Examples ~
@@ -218,16 +219,16 @@ When using gvim, the --remote-wait only works properly this way: >
 	start /w gvim --remote-wait file.txt
 <
 ==============================================================================
-3. Socket server specific items			    *socketserver-clientserver*
+4. Socket server specific items			    *socketserver-clientserver*
 				    *E1563* *E1564* *E1565* *E1566* *E1567*
 
 The communication between client and server is done using Unix domain sockets.
 These sockets are either placed in these directories in the following order of
 availability:
     1. "$XDG_RUTIME_DIR/vim" if $XDG_RUNTIME_DIR is set in the environment.
-    2. "$TMPDIR/vim-[uid]", where "[uid]" is the uid of the user. This
+    2. "$TMPDIR/vim-[uid]", where "[uid]" is the uid of the user.  This
        directory will have the access permissions set to 700 so only the user
-       can read or write from/to it. If $TMPDIR is not set, "/tmp" is used.
+       can read or write from/to it.  If $TMPDIR is not set, "/tmp" is used.
 
 						    *socketserver-name*
 When specifying the server id/name, it can be taken as a generic name or an
@@ -238,9 +239,9 @@ placed in the above common directories.  Note that a server id/name can only
 contain slashes "/" if it is taken as a path, so names such as "abc/dir" will
 be invalid.
 
-Socket server functionality is available in both GTK GUI and terminal versions of
-Vim.  Unless Vim is compiled with |+autoservername| feature, the socket server
-will have to started explicitly, just like X11, even in the GUI.
+Socket server functionality is available in both GTK GUI and terminal versions
+of Vim.  Unless Vim is compiled with |+autoservername| feature, the socket
+server will have to started explicitly, just like X11, even in the GUI.
 
 If Vim crashes or does not exit cleanly, the socket server will not remove the
 socket file and it will be left around.  This is generally not a problem,

runtime/doc/tags

@@ -1102,6 +1102,7 @@ $quote	eval.txt	/*$quote*
 't_KJ'	term.txt	/*'t_KJ'*
 't_KK'	term.txt	/*'t_KK'*
 't_KL'	term.txt	/*'t_KL'*
+'t_Ms'	term.txt	/*'t_Ms'*
 't_PE'	term.txt	/*'t_PE'*
 't_PS'	term.txt	/*'t_PS'*
 't_RB'	term.txt	/*'t_RB'*
@@ -10587,6 +10588,7 @@ t_KI	term.txt	/*t_KI*
 t_KJ	term.txt	/*t_KJ*
 t_KK	term.txt	/*t_KK*
 t_KL	term.txt	/*t_KL*
+t_Ms	term.txt	/*t_Ms*
 t_PE	term.txt	/*t_PE*
 t_PS	term.txt	/*t_PS*
 t_RB	term.txt	/*t_RB*
@@ -11099,6 +11101,8 @@ unix	os_unix.txt	/*unix*
 unlisted-buffer	windows.txt	/*unlisted-buffer*
 up-down-motions	motion.txt	/*up-down-motions*
 uppercase	change.txt	/*uppercase*
+uri_decode()	builtin.txt	/*uri_decode()*
+uri_encode()	builtin.txt	/*uri_encode()*
 urxvt-mouse	options.txt	/*urxvt-mouse*
 use-visual-cmds	version4.txt	/*use-visual-cmds*
 useful-mappings	tips.txt	/*useful-mappings*
@@ -11257,6 +11261,7 @@ v:t_string	eval.txt	/*v:t_string*
 v:t_tuple	eval.txt	/*v:t_tuple*
 v:t_typealias	eval.txt	/*v:t_typealias*
 v:termblinkresp	eval.txt	/*v:termblinkresp*
+v:termda1	eval.txt	/*v:termda1*
 v:termrbgresp	eval.txt	/*v:termrbgresp*
 v:termresponse	eval.txt	/*v:termresponse*
 v:termrfgresp	eval.txt	/*v:termrfgresp*

runtime/doc/term.txt

@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 9.1.  Last change: 2025 Aug 06
+*term.txt*      For Vim version 9.1.  Last change: 2025 Aug 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -644,6 +644,9 @@ Note: Use the <> form if possible
 		<FocusGained>	Vim window got focus (internal only)
 		<FocusLost>	Vim window lost focus (internal only)
 
+	t_Ms			OSC 52 command format (empty	*t_Ms* *'t_Ms'*
+				if terminal doesn't support it)
+
 Note about t_so and t_mr: When the termcap entry "so" is not present the
 entry for "mr" is used.  And vice versa.  The same is done for "se" and "me".
 If your terminal supports both inversion and standout mode, you can see two

runtime/doc/usr_41.txt

@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 9.1.  Last change: 2025 Aug 18
+*usr_41.txt*	For Vim version 9.1.  Last change: 2025 Aug 23
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -807,6 +807,8 @@ String manipulation:					*string-functions*
 	str2blob()		convert a list of strings into a blob
 	blob2str()		convert a blob into a list of strings
 	items()			get List of String index-character pairs
+	uri_encode()		URI-encode a string
+	uri_decode()		URI-decode a string
 
 List manipulation:					*list-functions*
 	get()			get an item without error for wrong index
@@ -920,6 +922,7 @@ Blob manipulation:					*blob-functions*
 	reverse()		reverse the order of numbers in a blob
 	index()			index of a value in a Blob
 	indexof()		index in a Blob where an expression is true
+	items()			get List of Blob index-value pairs
 
 Other computation:					*bitwise-function*
 	and()			bitwise AND

runtime/doc/version9.txt

@@ -1,4 +1,4 @@
-*version9.txt*  For Vim version 9.1.  Last change: 2025 Aug 17
+*version9.txt*  For Vim version 9.1.  Last change: 2025 Aug 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -41648,6 +41648,8 @@ Other new features ~
 - Add the new default highlighting groups "Bold", "Italic" and "BoldItalic"
   for use in syntax scripts.
 
+- |items()| function now supports Blob.
+
 							*changed-9.2*
 Changed~
 -------
@@ -41786,6 +41788,8 @@ Functions: ~
 |str2blob()|		convert a List of strings into a blob
 |test_null_tuple()|	return a null tuple
 |tuple2list()|		turn a Tuple of items into a List
+|uri_decode()|		URI-decode a string
+|uri_encode()|		URI-encode a string
 |wildtrigger()|		trigger wildcard expansion
 
 
@@ -41827,7 +41831,7 @@ Ex-Commands: ~
 
 Options: ~
 
-'autocompletion'	Enable auto completion |ins-autocompletion|
+'autocomplete'		Enable auto completion |ins-autocompletion|
 'autocompletedelay'	Delay in msec before menu appears after typing
 'chistory'		Size of the quickfix stack |quickfix-stack|.
 'clipmethod'		How to access the clipboard.
@@ -41851,12 +41855,17 @@ Options: ~
 'tabpanelopt'		Optional settings for the |tabpanel|
 't_xo'			Terminal uses XON/XOFF handshaking (e.g. vt420)
 't_CF'			Support for alternate font highlighting terminal code
+'t_Ms'			OSC 52 command format
 'winfixbuf'		Keep buffer focused in a window
 'wlseat'		Specify Wayland seat to use for the |wayland| feature
 'wlsteal'		Steal focus to access the |wayland| clipboard
 'wltimeout'		Specify the connection timeout for the |wayland|
 			compositor
 
+Vim Variables: ~
+|v:termda1|		The escape sequence returned for the primary device
+			attribute query (DA1).
+
 Vim Arguments: ~
 |-Y|			Do not connect to the |wayland| compositor.
 |--clientserver|	Specify backend for clientserver functionality.

runtime/syntax/vim.vim

@@ -2,7 +2,7 @@
 " Language:	   Vim script
 " Maintainer:	   Hirohito Higashi <h.east.727 ATMARK gmail.com>
 "	   Doug Kearns <dougkearns@gmail.com>
-" Last Change:	   2025 Aug 18
+" Last Change:	   2025 Aug 23
 " Former Maintainer: Charles E. Campbell
 
 " DO NOT CHANGE DIRECTLY.
@@ -165,7 +165,7 @@ syn keyword vimFuncName contained win_getid win_gettype win_gotoid win_id2tabwin
 " Predefined variable names {{{2
 " GEN_SYN_VIM: vimVarName, START_STR='syn keyword vimVimVarName contained', END_STR=''
 syn keyword vimVimVarName contained count count1 prevcount errmsg warningmsg statusmsg shell_error this_session version lnum termresponse fname lang lc_time ctype charconvert_from charconvert_to fname_in fname_out fname_new fname_diff cmdarg foldstart foldend folddashes foldlevel progname servername dying exception throwpoint register cmdbang insertmode val key profiling fcs_reason fcs_choice beval_bufnr beval_winnr beval_winid beval_lnum beval_col beval_text scrollstart swapname swapchoice swapcommand char mouse_win mouse_winid mouse_lnum mouse_col operator searchforward hlsearch oldfiles windowid progpath completed_item option_new option_old option_oldlocal option_oldglobal option_command option_type errors false true none null numbermax numbermin numbersize
-syn keyword vimVimVarName contained vim_did_enter testing t_number t_string t_func t_list t_dict t_float t_bool t_none t_job t_channel t_blob t_class t_object termrfgresp termrbgresp termu7resp termstyleresp termblinkresp event versionlong echospace argv collate exiting colornames sizeofint sizeoflong sizeofpointer maxcol python3_version t_typealias t_enum t_enumvalue stacktrace t_tuple wayland_display clipmethod
+syn keyword vimVimVarName contained vim_did_enter testing t_number t_string t_func t_list t_dict t_float t_bool t_none t_job t_channel t_blob t_class t_object termrfgresp termrbgresp termu7resp termstyleresp termblinkresp event versionlong echospace argv collate exiting colornames sizeofint sizeoflong sizeofpointer maxcol python3_version t_typealias t_enum t_enumvalue stacktrace t_tuple wayland_display clipmethod termda1
 
 "--- syntax here and above generated by runtime/syntax/generator/gen_syntax_vim.vim ---
 

src/auto/configure

@@ -2968,6 +2968,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 ac_config_headers="$ac_config_headers auto/config.h:config.h.in"
 
 
@@ -14507,18 +14508,18 @@ then :
 fi
 if test "$enable_largefile,$enable_year2038" != no,no
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5
-printf %s "checking for $CC option to enable large file support... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CPPFLAGS option for large files" >&5
+printf %s "checking for $CPPFLAGS option for large files... " >&6; }
 if test ${ac_cv_sys_largefile_opts+y}
 then :
   printf %s "(cached) " >&6
 else case e in #(
-  e) ac_save_CC="$CC"
+  e) ac_save_CPPFLAGS=$CPPFLAGS
   ac_opt_found=no
-  for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do
+  for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1"; do
     if test x"$ac_opt" != x"none needed"
 then :
-  CC="$ac_save_CC $ac_opt"
+  CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"
 fi
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -14547,12 +14548,12 @@ then :
   if test x"$ac_opt" = x"none needed"
 then :
   # GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t.
-	 CC="$CC -DFTYPE=ino_t"
+	 CPPFLAGS="$CPPFLAGS -DFTYPE=ino_t"
 	 if ac_fn_c_try_compile "$LINENO"
 then :
 
 else case e in #(
-  e) CC="$CC -D_FILE_OFFSET_BITS=64"
+  e) CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
 	    if ac_fn_c_try_compile "$LINENO"
 then :
   ac_opt='-D_FILE_OFFSET_BITS=64'
@@ -14568,7 +14569,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     test $ac_opt_found = no || break
   done
-  CC="$ac_save_CC"
+  CPPFLAGS=$ac_save_CPPFLAGS
 
   test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" ;;
 esac
@@ -14592,16 +14593,14 @@ printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h
 
 printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h
  ;; #(
-  "-n32") :
-    CC="$CC -n32" ;; #(
   *) :
     as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;;
 esac
 
 if test "$enable_year2038" != no
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option for timestamps after 2038" >&5
-printf %s "checking for $CC option for timestamps after 2038... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CPPFLAGS option for timestamps after 2038" >&5
+printf %s "checking for $CPPFLAGS option for timestamps after 2038... " >&6; }
 if test ${ac_cv_sys_year2038_opts+y}
 then :
   printf %s "(cached) " >&6

src/blob.c

@@ -289,6 +289,38 @@ blob2string(blob_T *blob, char_u **tofree, char_u *numbuf)
     return *tofree;
 }
 
+/*
+ * "items(blob)" function
+ * Converts a Blob into a List of [index, byte] pairs.
+ * Caller must have already checked that argvars[0] is a Blob.
+ * A null blob behaves like an empty blob.
+ */
+    void
+blob2items(typval_T *argvars, typval_T *rettv)
+{
+    blob_T	*blob = argvars[0].vval.v_blob;
+
+    if (rettv_list_alloc(rettv) == FAIL)
+	return;
+
+    for (int i = 0; i < blob_len(blob); i++)
+    {
+	list_T	*l2 = list_alloc();
+	if (l2 == NULL)
+	    return;
+
+	if (list_append_list(rettv->vval.v_list, l2) == FAIL)
+	{
+	    vim_free(l2);
+	    return;
+	}
+
+	if (list_append_number(l2, i) == FAIL
+		|| list_append_number(l2, blob_get(blob, i)) == FAIL)
+	    return;
+    }
+}
+
 /*
  * Convert a string variable, in the format of blob2string(), to a blob.
  * Return NULL when conversion failed.

src/configure.ac

@@ -1,17 +1,39 @@
-dnl configure.ac: autoconf script for Vim
+dnl +----------------------------------------------------------------------+
+dnl   configure.ac: autoconf script for Vim
+dnl +----------------------------------------------------------------------+
+dnl
+dnl   This file is processed by autoconf to generate the 'configure' script.
+dnl
+dnl   ==> IMPORTANT NOTE FOR DEVELOPERS <==
+dnl
+dnl   Do NOT run 'autoconf' directly on this file.  You must use the provided
+dnl   make target, like this:
+dnl
+dnl     make autoconf
+dnl
+dnl   This is required because the Makefile handles placing the generated
+dnl   script into its final location: 'auto/configure'.
+dnl
+dnl +----------------------------------------------------------------------+
 
-dnl Process this file with autoconf 2.72 to produce "configure".
+dnl You should use Autoconf 2.72 but to simplify CI on Ubuntu 24.04 we only
+dnl use AC_PREREQ([2.71])
+AC_PREREQ([2.71])
 
 dnl Normally, AC_INIT([package],[version],[bug-report],[tarname],[url])
 dnl provides PACKAGE_* macros, used by Autoconf on UNIX to inject version
 dnl info into config.h, --version output, and "make dist".
 dnl
-dnl Vim does not rely on that: versioning is centralized in version.h/version.c,
-dnl which ensures a single cross-platform source of truth for both UNIX and
-dnl non-UNIX platforms.
+dnl Vim does not rely on that: versioning is centralized in
+dnl version.h/version.c, dnl which ensures a single cross-platform source of
+dnl truth for both UNIX and non-UNIX platforms.
 dnl
 dnl Therefore we call AC_INIT without arguments.
 AC_INIT
+
+dnl Use vim.h as the source-tree anchor: AC_CONFIG_SRCDIR verifies that
+dnl configure is run in (or pointed to) the correct source directory.
+dnl vim.h is always present at the top level.
 AC_CONFIG_SRCDIR([vim.h])
 AC_CONFIG_HEADERS(auto/config.h:config.h.in)
 

src/dict.c

@@ -1557,9 +1557,7 @@ dict2list(typval_T *argvars, typval_T *rettv, dict2list_T what)
     if (rettv_list_alloc(rettv) == FAIL)
 	return;
 
-    if ((what == DICT2LIST_ITEMS
-		? check_for_string_list_tuple_or_dict_arg(argvars, 0)
-		: check_for_dict_arg(argvars, 0)) == FAIL)
+    if (check_for_dict_arg(argvars, 0) == FAIL)
 	return;
 
     d = argvars[0].vval.v_dict;
@@ -1612,19 +1610,12 @@ dict2list(typval_T *argvars, typval_T *rettv, dict2list_T what)
 }
 
 /*
- * "items(dict)" function
+ * "items()" function
  */
     void
-f_items(typval_T *argvars, typval_T *rettv)
+dict2items(typval_T *argvars, typval_T *rettv)
 {
-    if (argvars[0].v_type == VAR_STRING)
-	string2items(argvars, rettv);
-    else if (argvars[0].v_type == VAR_LIST)
-	list2items(argvars, rettv);
-    else if (argvars[0].v_type == VAR_TUPLE)
-	tuple2items(argvars, rettv);
-    else
-	dict2list(argvars, rettv, DICT2LIST_ITEMS);
+    dict2list(argvars, rettv, DICT2LIST_ITEMS);
 }
 
 /*

src/edit.c

@@ -664,9 +664,6 @@ edit(
 		    continue;
 		}
 
-		if (p_ac)
-		    ins_compl_set_autocomplete(TRUE);
-
 		// A non-white character that fits in with the current
 		// completion: Add to "compl_leader".
 		if (ins_compl_accept_char(c))
@@ -688,9 +685,6 @@ edit(
 		    continue;
 		}
 
-		if (p_ac)
-		    ins_compl_set_autocomplete(FALSE);
-
 		// Pressing CTRL-Y selects the current match.  When
 		// ins_compl_enter_selects() is set the Enter key does the
 		// same.
@@ -997,7 +991,7 @@ doESCkey:
 		{
 		    update_screen(UPD_VALID); // Show char deletion immediately
 		    out_flush();
-		    ins_compl_set_autocomplete(TRUE);
+		    ins_compl_enable_autocomplete();
 		    goto docomplete; // Trigger autocompletion
 		}
 	    }
@@ -1424,7 +1418,7 @@ normalchar:
 	    {
 		update_screen(UPD_VALID); // Show character immediately
 		out_flush();
-		ins_compl_set_autocomplete(TRUE);
+		ins_compl_enable_autocomplete();
 		goto docomplete;
 	    }
 

src/eval.c

@@ -3398,7 +3398,6 @@ skipwhite_and_linebreak(char_u *arg, evalarg_T *evalarg)
  * Handle zero level expression.
  * This calls eval1() and handles error message and nextcmd.
  * Put the result in "rettv" when returning OK and "evaluate" is TRUE.
- * Note: "rettv.v_lock" is not set.
  * "evalarg" can be NULL, EVALARG_EVALUATE or a pointer.
  * Return OK or FAIL.
  */
@@ -3550,8 +3549,6 @@ eval0_retarg(
  * "arg" must point to the first non-white of the expression.
  * "arg" is advanced to just after the recognized expression.
  *
- * Note: "rettv.v_lock" is not set.
- *
  * Return OK or FAIL.
  */
     int

src/evalfunc.c

@@ -97,6 +97,7 @@ static void f_inputsecret(typval_T *argvars, typval_T *rettv);
 static void f_interrupt(typval_T *argvars, typval_T *rettv);
 static void f_invert(typval_T *argvars, typval_T *rettv);
 static void f_islocked(typval_T *argvars, typval_T *rettv);
+static void f_items(typval_T *argvars, typval_T *rettv);
 static void f_keytrans(typval_T *argvars, typval_T *rettv);
 static void f_last_buffer_nr(typval_T *argvars, typval_T *rettv);
 static void f_libcall(typval_T *argvars, typval_T *rettv);
@@ -726,11 +727,12 @@ arg_list_tuple_dict_blob_or_string(
 	    || type->tt_type == VAR_STRING
 	    || type_any_or_unknown(type))
 	return OK;
-    arg_type_mismatch(&t_list_any, type, context->arg_idx + 1);
+
+    semsg(_(e_list_tuple_dict_blob_or_string_required_for_argument_nr),
+						 context->arg_idx + 1);
     return FAIL;
 }
 
-
 /*
  * Check second argument of map(), filter(), foreach().
  */
@@ -1248,7 +1250,7 @@ static argcheck_T arg1_list_number[] = {arg_list_number};
 static argcheck_T arg1_reverse[] = {arg_reverse};
 static argcheck_T arg1_list_or_tuple_or_dict[] = {arg_list_or_tuple_or_dict};
 static argcheck_T arg1_list_string[] = {arg_list_string};
-static argcheck_T arg1_string_list_tuple_or_dict[] = {arg_string_list_tuple_or_dict};
+static argcheck_T arg1_list_tuple_dict_blob_or_string[] = {arg_list_tuple_dict_blob_or_string};
 static argcheck_T arg1_lnum[] = {arg_lnum};
 static argcheck_T arg1_number[] = {arg_number};
 static argcheck_T arg1_string[] = {arg_string};
@@ -2432,7 +2434,7 @@ static funcentry_T global_functions[] =
 			ret_number_bool,    f_islocked},
     {"isnan",		1, 1, FEARG_1,	    arg1_float_or_nr,
 			ret_number_bool,    MATH_FUNC(f_isnan)},
-    {"items",		1, 1, FEARG_1,	    arg1_string_list_tuple_or_dict,
+    {"items",		1, 1, FEARG_1,	    arg1_list_tuple_dict_blob_or_string,
 			ret_list_items,	    f_items},
     {"job_getchannel",	1, 1, FEARG_1,	    arg1_job,
 			ret_channel,	    JOB_FUNC(f_job_getchannel)},
@@ -3114,6 +3116,10 @@ static funcentry_T global_functions[] =
 			ret_dict_any,	    f_undotree},
     {"uniq",		1, 3, FEARG_1,	    arg13_sortuniq,
 			ret_first_arg,	    f_uniq},
+    {"uri_decode",	1, 1, FEARG_1,	    arg1_string,
+			ret_string,	    f_uridecode},
+    {"uri_encode",	1, 1, FEARG_1,	    arg1_string,
+			ret_string,	    f_uriencode},
     {"utf16idx",	2, 4, FEARG_1,	    arg4_string_number_bool_bool,
 			ret_number,	    f_utf16idx},
     {"values",		1, 1, FEARG_1,	    arg1_dict_any,
@@ -8716,6 +8722,26 @@ f_islocked(typval_T *argvars, typval_T *rettv)
     clear_lval(&lv);
 }
 
+/*
+ * "items(dict)" function
+ */
+    static void
+f_items(typval_T *argvars, typval_T *rettv)
+{
+    if (argvars[0].v_type == VAR_STRING)
+	string2items(argvars, rettv);
+    else if (argvars[0].v_type == VAR_LIST)
+	list2items(argvars, rettv);
+    else if (argvars[0].v_type == VAR_TUPLE)
+	tuple2items(argvars, rettv);
+    else if (argvars[0].v_type == VAR_BLOB)
+	blob2items(argvars, rettv);
+    else if (argvars[0].v_type == VAR_DICT)
+	dict2items(argvars, rettv);
+    else
+	semsg(_(e_list_tuple_dict_blob_or_string_required_for_argument_nr), 1);
+}
+
 /*
  * "keytrans()" function
  */

src/evalvars.c

@@ -164,7 +164,8 @@ static struct vimvar
     {VV_NAME("stacktrace",	 VAR_LIST), &t_list_dict_any, VV_RO},
     {VV_NAME("t_tuple",		 VAR_NUMBER), NULL, VV_RO},
     {VV_NAME("wayland_display",  VAR_STRING), NULL, VV_RO},
-    {VV_NAME("clipmethod",  VAR_STRING), NULL, VV_RO},
+    {VV_NAME("clipmethod",	 VAR_STRING), NULL, VV_RO},
+    {VV_NAME("termda1",		 VAR_STRING), NULL, VV_RO},
 };
 
 // shorthand

src/insexpand.c

@@ -7078,8 +7078,11 @@ ins_complete(int c, int enable_pum)
     int		insert_match;
     int		no_matches_found;
 #ifdef ELAPSED_FUNC
-    // Timestamp when match collection starts
-    elapsed_T	compl_start_tv = {0};
+    elapsed_T	compl_start_tv = {0}; // Time when match collection starts
+    int		disable_ac_delay;
+
+    disable_ac_delay = compl_started && ctrl_x_mode_normal()
+	&& (c == Ctrl_N || c == Ctrl_P || c == Ctrl_R || ins_compl_pum_key(c));
 #endif
 
     compl_direction = ins_compl_key2dir(c);
@@ -7088,16 +7091,13 @@ ins_complete(int c, int enable_pum)
     if (!compl_started)
     {
 	if (ins_compl_start() == FAIL)
-	{
-	    compl_autocomplete = FALSE;
 	    return FAIL;
-	}
     }
     else if (insert_match && stop_arrow() == FAIL)
 	return FAIL;
 
 #ifdef ELAPSED_FUNC
-    if (compl_autocomplete && p_acl > 0)
+    if (compl_autocomplete && p_acl > 0 && !disable_ac_delay)
 	ELAPSED_INIT(compl_start_tv);
 #endif
     compl_curr_win = curwin;
@@ -7152,8 +7152,8 @@ ins_complete(int c, int enable_pum)
 
     // Wait for the autocompletion delay to expire
 #ifdef ELAPSED_FUNC
-    if (compl_autocomplete && p_acl > 0 && !no_matches_found
-	    && ELAPSED_FUNC(compl_start_tv) < p_acl)
+    if (compl_autocomplete && p_acl > 0 && !disable_ac_delay
+	    && !no_matches_found && ELAPSED_FUNC(compl_start_tv) < p_acl)
     {
 	cursor_on();
 	setcursor();
@@ -7178,19 +7178,18 @@ ins_complete(int c, int enable_pum)
 
     compl_was_interrupted = compl_interrupted;
     compl_interrupted = FALSE;
-    compl_autocomplete = FALSE;
 
     return OK;
 }
 
 /*
- * Enable/disable autocompletion
+ * Enable autocompletion
  */
     void
-ins_compl_set_autocomplete(int value)
+ins_compl_enable_autocomplete(void)
 {
 #ifdef ELAPSED_FUNC
-    compl_autocomplete = value;
+    compl_autocomplete = TRUE;
 #endif
 }
 

src/proto/blob.pro

@@ -13,6 +13,7 @@ int blob_equal(blob_T *b1, blob_T *b2);
 int read_blob(FILE *fd, typval_T *rettv, off_T offset, off_T size_arg);
 int write_blob(FILE *fd, blob_T *blob);
 char_u *blob2string(blob_T *blob, char_u **tofree, char_u *numbuf);
+void blob2items(typval_T *argvars, typval_T *rettv);
 blob_T *string2blob(char_u *str);
 int blob_slice_or_index(blob_T *blob, int is_range, varnumber_T n1, varnumber_T n2, int exclusive, typval_T *rettv);
 int check_blob_index(long bloblen, varnumber_T n1, int quiet);

src/proto/dict.pro

@@ -46,7 +46,7 @@ long dict_count(dict_T *d, typval_T *needle, int ic);
 void dict_extend_func(typval_T *argvars, type_T *type, char *func_name, char_u *arg_errmsg, int is_new, typval_T *rettv);
 void dict_filter_map(dict_T *d, filtermap_T filtermap, type_T *argtype, char *func_name, char_u *arg_errmsg, typval_T *expr, typval_T *rettv);
 void dict_remove(typval_T *argvars, typval_T *rettv, char_u *arg_errmsg);
-void f_items(typval_T *argvars, typval_T *rettv);
+void dict2items(typval_T *argvars, typval_T *rettv);
 void f_keys(typval_T *argvars, typval_T *rettv);
 void f_values(typval_T *argvars, typval_T *rettv);
 void dict_set_items_ro(dict_T *di);

src/proto/insexpand.pro

@@ -72,6 +72,6 @@ void ins_compl_delete(void);
 void ins_compl_insert(int move_cursor);
 void ins_compl_check_keys(int frequency, int in_compl_func);
 int ins_complete(int c, int enable_pum);
-void ins_compl_set_autocomplete(int val);
+void ins_compl_enable_autocomplete(void);
 void free_insexpand_stuff(void);
 /* vim: set ft=c : */

src/proto/strings.pro

@@ -52,4 +52,6 @@ void f_tolower(typval_T *argvars, typval_T *rettv);
 void f_toupper(typval_T *argvars, typval_T *rettv);
 void f_tr(typval_T *argvars, typval_T *rettv);
 void f_trim(typval_T *argvars, typval_T *rettv);
+void f_uridecode(typval_T *argvars, typval_T *rettv);
+void f_uriencode(typval_T *argvars, typval_T *rettv);
 /* vim: set ft=c : */

src/strings.c

@@ -2310,6 +2310,151 @@ f_trim(typval_T *argvars, typval_T *rettv)
     rettv->vval.v_string = vim_strnsave(head, tail - head);
 }
 
+/*
+ * Decodes a URI-encoded string.
+ *
+ * Parameters:
+ *   str - The URI-encoded input string (may contain %XX sequences and '+').
+ *
+ * Returns:
+ *   A newly allocated string with URI encoding decoded:
+ *     - %XX sequences are converted to the corresponding character.
+ *     - If the input is malformed (e.g., incomplete % sequence), the original
+ *       characters are copied.
+ *   The output string will never be longer than the input string.
+ *   The caller is responsible for freeing the returned string.
+ *
+ * Returns NULL if input is NULL or memory allocation fails.
+ */
+    static char_u *
+uri_decode(char_u *str)
+{
+    if (str == NULL)
+	return NULL;
+
+    size_t len = STRLEN(str);
+
+    char_u *decoded = alloc(len + 1);
+    if (!decoded)
+	return NULL;
+
+    char_u	*p = decoded;
+    size_t	i = 0;
+
+    while (i < len)
+    {
+	if (str[i] == '%')
+	{
+	    if (i + 2 >= len)
+	    {
+		// Malformed encoding
+		*p++ = str[i++];
+		if (str[i] != NUL)
+		    *p++ = str[i++];
+	    }
+	    else
+	    {
+		int val = hexhex2nr(&str[i + 1]);
+		if (val != -1)
+		{
+		    *p++ = (char_u)val;
+		    i += 3;
+		}
+		else
+		{
+		    // invalid hex digits following "%"
+		    for (int j = 0; j < 3; j++)
+			*p++ = str[i++];
+		}
+	    }
+
+	}
+	else
+	    *p++ = str[i++];
+    }
+
+    *p = NUL;
+
+    return decoded;
+}
+
+/*
+ * "uri_decode({str})" function
+ */
+    void
+f_uridecode(typval_T *argvars, typval_T *rettv)
+{
+    rettv->v_type = VAR_STRING;
+    rettv->vval.v_string = NULL;
+
+    if (check_for_string_arg(argvars, 0) == FAIL)
+	return;
+
+    rettv->vval.v_string = uri_decode(tv_get_string(&argvars[0]));
+}
+
+/*
+ * Encodes a string for safe use in a URI.
+ *
+ * Parameters:
+ *   str - The input string to encode.
+ *
+ * Returns:
+ *   A newly allocated string where:
+ *     - Alphanumeric characters and '-', '_', '.', '~' are left unchanged.
+ *     - All other bytes are encoded as %XX (uppercase hex).
+ *   The caller is responsible for freeing the returned string.
+ *
+ *   Returns NULL if input is NULL or memory allocation fails.
+ */
+    static char_u *
+uri_encode(char_u *str)
+{
+    if (str == NULL)
+	return NULL;
+
+    size_t len = STRLEN(str);
+
+    // Worst case: every character needs encoding => 3x size + 1 for null
+    // terminator
+    char_u *encoded = alloc(len * 3 + 1);
+    if (encoded == NULL)
+	return NULL;
+
+    char_u *p = encoded;
+
+    for (size_t i = 0; i < len; ++i)
+    {
+	char_u c = str[i];
+	if (ASCII_ISALNUM(c) || c == '-' || c == '_' || c == '.' || c == '~')
+	    *p++ = c;
+	else
+	{
+	    sprintf((char *)p, "%%%02X", c);
+	    p += 3;
+	}
+    }
+
+    *p = NUL;
+
+    return encoded;
+}
+
+/*
+ * "uri_encode({str})" function
+ */
+    void
+f_uriencode(typval_T *argvars, typval_T *rettv)
+{
+    rettv->v_type = VAR_STRING;
+    rettv->vval.v_string = NULL;
+
+    if (check_for_string_arg(argvars, 0) == FAIL)
+	return;
+
+    rettv->vval.v_string = uri_encode(tv_get_string(&argvars[0]));
+}
+
 static char *e_printf = N_(e_insufficient_arguments_for_printf);
 
 /*

src/term.c

@@ -1719,7 +1719,7 @@ static char *(key_names[]) =
     "k7", "k8", "k9", "k;", "F1", "F2",
     "%1", "&8", "kb", "kI", "kD", "kh",
     "@7", "kP", "kN", "K1", "K3", "K4", "K5", "kB",
-    "PS", "PE",
+    "PS", "PE", "Ms",
     NULL
 };
 #endif
@@ -5495,6 +5495,8 @@ handle_csi_function_key(
  *	{lead}[ABCDEFHPQRS]
  *	{lead}1;{modifier}[ABCDEFHPQRS]
  *
+ * - DA1 query response: {lead}?...;c
+ *
  * Return 0 for no match, -1 for partial match, > 0 for full match.
  */
     static int
@@ -5607,6 +5609,22 @@ handle_csi(
 	*slen = csi_len;
     }
 
+    // Primary device attributes (DA1) response
+    else if (first == '?' && trail == 'c')
+    {
+	LOG_TRN("Received DA1 response: %s", tp);
+
+	*slen = csi_len;
+#ifdef FEAT_EVAL
+	set_vim_var_string(VV_TERMDA1, tp, *slen);
+#endif
+	apply_autocmds(EVENT_TERMRESPONSEALL,
+					(char_u *)"da1", NULL, FALSE, curbuf);
+
+	key_name[0] = (int)KS_EXTRA;
+	key_name[1] = (int)KE_IGNORE;
+    }
+
     // Version string: Eat it when there is at least one digit and
     // it ends in 'c'
     else if (*T_CRV != NUL && ap > argp + 1 && trail == 'c')

src/testdir/test_blob.vim

@@ -865,4 +865,15 @@ func Test_indexof()
   call assert_fails('let i = indexof(b, " ")', 'E15:')
 endfunc
 
+" Test for using the items() function with a blob
+func Test_blob_items()
+  let lines =<< trim END
+    call assert_equal([[0, 0xAA], [1, 0xBB], [2, 0xCC]], 0zAABBCC->items())
+    call assert_equal([[0, 0]], 0z00->items())
+    call assert_equal([], 0z->items())
+    call assert_equal([], test_null_blob()->items())
+  END
+  call v9.CheckSourceLegacyAndVim9Success(lines)
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

src/testdir/test_filter_map.vim

@@ -221,6 +221,16 @@ func Test_mapnew_dict()
 
   const dconst = #{one: 1, two: 2, three: 3}
   call assert_equal(#{one: 2, two: 3, three: 4}, mapnew(dconst, {_, v -> v + 1}))
+
+  " return value of mapnew() can be modified
+  let dout = mapnew(dconst, {k, v -> $'{k}={v}'})
+  let dout.one ..= '!'
+  call assert_equal(#{one: 'one=1!', two: 'two=2', three: 'three=3'}, dout)
+  unlet dout.three
+  call assert_equal(#{one: 'one=1!', two: 'two=2'}, dout)
+  " original Dict is still locked
+  call assert_fails('unlet dconst.three', 'E741:')
+  call assert_fails('let dconst.one += 1', 'E741:')
 endfunc
 
 func Test_mapnew_list()
@@ -231,6 +241,16 @@ func Test_mapnew_list()
 
   const lconst = [1, 2, 3]
   call assert_equal([2, 3, 4], mapnew(lconst, {_, v -> v + 1}))
+
+  " return value of mapnew() can be modified
+  let lout = mapnew(lconst, {k, v -> $'{k}={v}'})
+  let lout[0] ..= '!'
+  call assert_equal(['0=1!', '1=2', '2=3'], lout)
+  unlet lout[2]
+  call assert_equal(['0=1!', '1=2'], lout)
+  " original List is still locked
+  call assert_fails('unlet lconst[2]', 'E741:')
+  call assert_fails('let lconst[0] += 1', 'E741:')
 endfunc
 
 func Test_mapnew_blob()

src/testdir/test_functions.vim

@@ -4503,4 +4503,61 @@ func Test_blob2str()
   call v9.CheckLegacyAndVim9Success(lines)
 endfunc
 
+" Test for uri_encode() and uri_decode() functions
+func Test_uriencoding()
+  let lines =<< trim END
+    #" uri encoding
+    call assert_equal('a1%20b2', uri_encode('a1 b2'))
+    call assert_equal('-%3F%26%2F%23%2B%3D%3A%5B%5D%40-', uri_encode('-?&/#+=:[]@-'))
+    call assert_equal('%22%3C%3E%5E%60%7B%7C%7D', uri_encode('"<>^`{|}'))
+    call assert_equal('%CE%B1%CE%B2%CE%B3%CE%B4%CE%B5', 'αβγδε'->uri_encode())
+    call assert_equal('r%C3%A9sum%C3%A9', uri_encode('résumé'))
+    call assert_equal('%E4%BD%A0%E5%A5%BD', uri_encode('你好'))
+    call assert_equal('%F0%9F%98%8A%F0%9F%98%8A', uri_encode('😊😊'))
+    call assert_equal('-_.~', uri_encode('-_.~'))
+    call assert_equal('', uri_encode(''))
+    call assert_equal('%2520%2523', uri_encode('%20%23'))
+    call assert_equal('', uri_encode(test_null_string()))
+    call assert_equal('a', uri_encode('a'))
+    call assert_equal('%20', uri_encode(' '))
+    call assert_equal('%CE%B1', uri_encode('α'))
+    call assert_equal('c%3A%5Cmy%5Cdir%5Ca%20b%20c', uri_encode('c:\my\dir\a b c'))
+    call assert_fails('call uri_encode([])', 'E1174: String required for argument 1')
+
+    #" uri decoding
+    call assert_equal('a1 b2', uri_decode('a1%20b2'))
+    call assert_equal('-?&/#+=:[]@-', uri_decode('-%3F%26%2F%23%2B%3D%3A%5B%5D%40-'))
+    call assert_equal('"<>^`{|}', uri_decode('%22%3C%3E%5E%60%7B%7C%7D'))
+    call assert_equal('αβγδε', '%CE%B1%CE%B2%CE%B3%CE%B4%CE%B5'->uri_decode())
+    call assert_equal('résumé', uri_decode('r%C3%A9sum%C3%A9'))
+    call assert_equal('你好', uri_decode('%E4%BD%A0%E5%A5%BD'))
+    call assert_equal('😊😊', uri_decode('%F0%9F%98%8A%F0%9F%98%8A'))
+    call assert_equal('a+b', uri_decode('a+b'))
+    call assert_equal('-_.~', uri_decode('-_.~'))
+    call assert_equal('', uri_decode(''))
+    call assert_equal('%20%23', uri_decode('%2520%2523'))
+    call assert_equal('', uri_decode(test_null_string()))
+    call assert_equal('a', uri_decode('a'))
+    call assert_equal(' ', uri_decode('%20'))
+    call assert_equal('α', uri_decode('%CE%B1'))
+    call assert_equal('c:\my\dir\a b c', uri_decode('c%3A%5Cmy%5Cdir%5Ca%20b%20c'))
+    call assert_equal('%', uri_decode('%'))
+    call assert_equal('%3', uri_decode('%3'))
+    call assert_equal(';', uri_decode('%3b'))
+    call assert_equal('a%xyb', uri_decode('a%xyb'))
+    call assert_fails('call uri_decode([])', 'E1174: String required for argument 1')
+
+    #" control characters
+    VAR cstr = "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10"
+    LET cstr ..= "\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"
+    VAR expected = ''
+    for i in range(1, 31)
+      LET expected ..= printf("%%%02X", i)
+    endfor
+    call assert_equal(expected, uri_encode(cstr))
+    call assert_equal(cstr, uri_decode(expected))
+  END
+  call v9.CheckLegacyAndVim9Success(lines)
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

src/testdir/test_ins_complete.vim

@@ -5358,7 +5358,7 @@ func Test_autocomplete_timer()
   call assert_equal(['abc', 'ab'], b:matches->mapnew('v:val.word'))
   call assert_equal(0, b:selected)
   call assert_equal(1, g:CallCount)
-  call assert_equal('ab', getline(4))
+  call assert_equal('abc', getline(4))
   set completeopt&
 
   " Test 8: {func} completes after space, but not '.'

src/testdir/test_listdict.vim

@@ -230,7 +230,7 @@ func Test_list_items()
   endfor
   call assert_equal([[0, 'a'], [1, 'b'], [2, 'c']], r)
 
-  call assert_fails('call items(3)', 'E1225:')
+  call assert_fails('call items(3)', 'E1251:')
 endfunc
 
 func Test_string_items()

src/testdir/test_method.vim

@@ -76,7 +76,7 @@ func Test_string_method()
   eval "a\rb\ec"->strtrans()->assert_equal('a^Mb^[c')
   eval "aあb"->strwidth()->assert_equal(4)
   eval 'abc'->substitute('b', 'x', '')->assert_equal('axc')
-  call assert_fails('eval 123->items()', 'E1225:')
+  call assert_fails('eval 123->items()', 'E1251: List, Tuple, Dictionary, Blob or String required for argument 1')
 
   eval 'abc'->printf('the %s arg')->assert_equal('the abc arg')
 endfunc

src/testdir/test_termcodes.vim

@@ -2803,4 +2803,9 @@ func Test_xterm_direct_no_termguicolors()
   close
 endfunc
 
+func Test_da1_handling()
+  call feedkeys("\<Esc>[?62,52;c", 'Lx!')
+  call assert_equal("\<Esc>[?62,52;c", v:termda1)
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

src/testdir/test_vim9_builtin.vim

@@ -1655,7 +1655,7 @@ enddef
 
 def Test_foreach()
   CheckFeature job
-  v9.CheckSourceDefAndScriptFailure(['foreach(test_null_job(), "")'], ['E1013: Argument 1: type mismatch, expected list<any> but got job', 'E1251: List, Tuple, Dictionary, Blob or String required for argument 1'])
+  v9.CheckSourceDefAndScriptFailure(['foreach(test_null_job(), "")'], 'E1251: List, Tuple, Dictionary, Blob or String required for argument 1')
 enddef
 
 def Test_fullcommand()
@@ -2492,15 +2492,19 @@ def Test_islocked()
 enddef
 
 def Test_items()
-  v9.CheckSourceDefFailure(['123->items()'], 'E1225:')
+  v9.CheckSourceDefFailure(['123->items()'], 'E1251: List, Tuple, Dictionary, Blob or String required for argument 1')
+
+  # Dict
   assert_equal([['a', 10], ['b', 20]], {'a': 10, 'b': 20}->items())
   assert_equal([], {}->items())
   assert_equal(['x', 'x'], {'a': 10, 'b': 20}->items()->map((_, _) => 'x'))
 
+  # List
   assert_equal([[0, 'a'], [1, 'b']], ['a', 'b']->items())
   assert_equal([], []->items())
   assert_equal([], test_null_list()->items())
 
+  # String
   assert_equal([[0, 'a'], [1, '웃'], [2, 'ć']], 'a웃ć'->items())
   assert_equal([], ''->items())
   assert_equal([], test_null_string()->items())

src/version.c

@@ -724,6 +724,22 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1671,
+/**/
+    1670,
+/**/
+    1669,
+/**/
+    1668,
+/**/
+    1667,
+/**/
+    1666,
+/**/
+    1665,
+/**/
+    1664,
 /**/
     1663,
 /**/

src/vim.h

@@ -2239,7 +2239,8 @@ typedef int sock_T;
 #define VV_TYPE_TUPLE	111
 #define VV_WAYLAND_DISPLAY 112
 #define VV_CLIPMETHOD 113
-#define VV_LEN		114	// number of v: vars
+#define VV_TERMDA1 114
+#define VV_LEN		115	// number of v: vars
 
 // used for v_number in VAR_BOOL and VAR_SPECIAL
 #define VVAL_FALSE	0L	// VAR_BOOL