From e0c99e45ad80a26618de35891c5bc828a58d1891 Mon Sep 17 00:00:00 2001 From: Matthew Lyon Date: Mon, 20 Jan 2014 16:21:37 -0200 Subject: [PATCH 1/5] Migrate base syntax groups to color variables This covers all of the stuff under `:help w18`. The UI chrome parts will be harder, as there's a lot more one-offs and this function-calling style makes those a bit more difficult. The colors for the Nomral group will now toggle white/black based on the value of &background. Note that for `&background == 'dark'` it will use regular white on a darker black background and when light will use lighter black on regular white. The GUI colors for `Constant` and linked groups were varying shades of darkgreen, instead of the yellow they were grouped under, while the cterm values were still darkyellow. I have set these to the shade of dark yellow I chose for the iTerm version of pencil, for the sake of consistency. Changing these would be easy, so long as they are consistent. --- colors/pencil.vim | 120 ++++++++++++++++++++++++++++++---------------- 1 file changed, 80 insertions(+), 40 deletions(-) diff --git a/colors/pencil.vim b/colors/pencil.vim index fb283c1..0ef1474 100644 --- a/colors/pencil.vim +++ b/colors/pencil.vim @@ -6,7 +6,7 @@ " based on bubblegum and others " -set background=light +" set background=light hi clear if exists('syntax on') @@ -15,6 +15,26 @@ endif let g:colors_name='pencil' +" Colors +let s:black = { "gui": "#212121", "cterm": "black" } +let s:light_black = { "gui": "#424242", "cterm": "8" } +let s:white = { "gui": "#F1F1F1", "cterm": "white" } +let s:actual_white = { "gui": "#FFFFFF", "cterm": "231" } + +let s:pink = { "gui": "#C30771", "cterm": "red" } +let s:red = { "gui": "#C30771", "cterm": "darkred" } +let s:orange = { "gui": "#D75F5F", "cterm": "167" } + +let s:blue = { "gui": "#20BBFC", "cterm": "blue" } +let s:dark_blue = { "gui": "#008EC4", "cterm": "31" } + +let s:green = { "gui": "#10A778", "cterm": "darkgreen" } + +let s:purple = { "gui": "#8F8FB7", "cterm": "magenta" } + +let s:dark_yellow = { "gui": "#DFCF1D", "cterm": "darkyellow" } + + " maybe pursue something like this: https://github.com/noahfrederick/vim-hemisu/ "let s:iaWhite = { 'gui': '#F1F1F1' } "let s:iaOffWhiteIPad = { 'gui': '#F5F2EC' } @@ -42,59 +62,79 @@ let g:colors_name='pencil' " Purple: #8F8FB7 " Headings: #4242FF -" preferred groups +if &background == "dark" + let s:bg = s:black + let s:norm = s:white +else + let s:bg = s:white + let s:norm = s:light_black +endif + +function! s:h(group, style) + execute "highlight" a:group + \ "guifg=" (has_key(a:style, "fg") ? a:style.fg.gui : "NONE") + \ "guibg=" (has_key(a:style, "bg") ? a:style.bg.gui : "NONE") + \ "guisp=" (has_key(a:style, "sp") ? a:style.sp.gui : "NONE") + \ "gui=" (has_key(a:style, "gui") ? a:style.gui : "NONE") + \ "ctermfg=" (has_key(a:style, "fg") ? a:style.fg.cterm : "NONE") + \ "ctermbg=" (has_key(a:style, "bg") ? a:style.bg.cterm : "NONE") + \ "cterm=" (has_key(a:style, "cterm") ? a:style.cterm : "NONE") +endfunction + +" common groups ================================================================ " (see `:h w18`) -" -hi Cursor guifg=#424242 guibg=#20BBFC -hi Normal guifg=#424242 guibg=#f1f1f1 gui=none ctermfg=black ctermbg=white -hi Comment guifg=#10A778 gui=italic ctermfg=darkgreen + +call s:h("Normal", {"bg": s:bg, "fg": s:norm}) +call s:h("Cursor", {"bg": s:blue, "fg": s:norm }) +call s:h("Comment", {"fg": s:green, "gui": "italic"}) " yellow (was #c033ff) -hi Constant guifg=#679707 ctermfg=darkyellow -hi String guifg=#67972F ctermfg=darkyellow -hi Character guifg=#67972F ctermfg=darkyellow -hi Number guifg=#672F00 ctermfg=darkyellow -hi Boolean guifg=#67972F ctermfg=darkyellow -hi Float guifg=#A46F00 ctermfg=darkyellow +call s:h("Constant", {"fg": s:dark_yellow}) +hi! link String Constant +hi! link Character Constant +hi! link Number Constant +hi! link Boolean Constant +hi! link Float Constant " pink -hi Identifier guifg=#C30771 ctermfg=red -hi Function guifg=#C30771 ctermfg=red +call s:h("Identifier", {"fg": s:pink}) +hi! link Function Identifier " blue -hi Statement guifg=#008EC4 ctermfg=darkblue -hi Conditional guifg=#008EC4 ctermfg=darkblue -hi Repeat guifg=#008EC4 ctermfg=darkblue -hi Label guifg=#008EC4 ctermfg=darkblue -hi Operator guifg=#008EC4 ctermfg=darkblue -hi Keyword guifg=#008EC4 ctermfg=darkblue -hi Exception guifg=#008EC4 ctermfg=darkblue +call s:h("Statement", {"fg": s:dark_blue}) +hi! link Condiitonal Statement +hi! link Repeat Statement +hi! link Label Statement +hi! link Operator Statement +hi! link Keyword Statement +hi! link Exception Statement " green -hi PreProc guifg=#10A778 ctermfg=darkgreen -hi Include guifg=#10A778 ctermfg=darkgreen -hi Define guifg=#10A778 ctermfg=darkgreen -hi Macro guifg=#10A778 ctermfg=darkgreen -hi PreCondit guifg=#10A778 ctermfg=darkgreen +call s:h("PreProc", {"fg": s:green}) +hi! link Include PreProc +hi! link Include Define +hi! link Include Macro +hi! link Include PreCondit " purple -hi Type guifg=#8F8FB7 ctermfg=darkcyan -hi StorageClass guifg=#8F8FB7 ctermfg=darkcyan -hi Structure guifg=#8F8FB7 ctermfg=darkcyan -hi Typedef guifg=#8F8FB7 ctermfg=darkcyan +call s:h("Type", {"fg": s:purple}) +hi! link StorageClass Type +hi! link Structure Type +hi! link Typedef Type " red -hi Special guifg=#C30771 ctermfg=darkred -hi SpecialChar guifg=#C30771 ctermfg=darkred -hi Tag guifg=#C30771 ctermfg=darkred -hi Delimiter guifg=#C30771 ctermfg=darkred -hi SpecialComment guifg=#C30771 ctermfg=darkred -hi Debug guifg=#C30771 ctermfg=darkred +call s:h("Special", {"fg": s:red}) +hi! link Special Special +hi! link SpecialChar Special +hi! link Tag Special +hi! link Delimiter Special +hi! link SpecialComment Special +hi! link Debug Special -hi Underlined guifg=fg ctermfg=fg -hi Ignore guifg=bg ctermfg=bg -hi Error guifg=#FFFFFF guibg=#D75F5F ctermfg=231 ctermbg=167 cterm=bold -hi Todo guifg=#D7D7FF guibg=bg gui=none ctermfg=231 ctermbg=red cterm=bold +call s:h("Underlined", {"fg": s:norm, "gui": "underline", "cterm": "underline"}) +call s:h("Ignore", {"fg": s:bg}) +call s:h("Error", {"fg": s:actual_white, "bg": s:red, "cterm": "bold"}) +call s:h("Todo", {"fg": s:actual_white, "bg": s:pink, "gui": "bold", "cterm": "bold"}) " " minor groups From 6ad994fb3ca0e631316f64cf723720d5dbed2d0d Mon Sep 17 00:00:00 2001 From: Matthew Lyon Date: Mon, 20 Jan 2014 17:30:04 -0200 Subject: [PATCH 2/5] align color definitions - a few of them weren't really defined correctly across gui/cterm - using color names for cterm is unreliable; better to use codes --- colors/pencil.vim | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/colors/pencil.vim b/colors/pencil.vim index 0ef1474..530b8cf 100644 --- a/colors/pencil.vim +++ b/colors/pencil.vim @@ -16,23 +16,24 @@ endif let g:colors_name='pencil' " Colors -let s:black = { "gui": "#212121", "cterm": "black" } -let s:light_black = { "gui": "#424242", "cterm": "8" } -let s:white = { "gui": "#F1F1F1", "cterm": "white" } -let s:actual_white = { "gui": "#FFFFFF", "cterm": "231" } +let s:black = { "gui": "#212121", "cterm": "0" } +let s:light_black = { "gui": "#424242", "cterm": "8" } +let s:white = { "gui": "#F1F1F1", "cterm": "15" } +let s:actual_white = { "gui": "#FFFFFF", "cterm": "231" } -let s:pink = { "gui": "#C30771", "cterm": "red" } -let s:red = { "gui": "#C30771", "cterm": "darkred" } -let s:orange = { "gui": "#D75F5F", "cterm": "167" } +let s:pink = { "gui": "#C30771", "cterm": "9" } +let s:red = { "gui": "#C30771", "cterm": "1" } +let s:orange = { "gui": "#D75F5F", "cterm": "167" } -let s:blue = { "gui": "#20BBFC", "cterm": "blue" } -let s:dark_blue = { "gui": "#008EC4", "cterm": "31" } +let s:blue = { "gui": "#20BBFC", "cterm": "4" } +let s:light_blue = { "gui": "#b6d6fd", "cterm": "12" } +let s:dark_blue = { "gui": "#008EC4", "cterm": "31" } -let s:green = { "gui": "#10A778", "cterm": "darkgreen" } +let s:green = { "gui": "#10A778", "cterm": "2" } -let s:purple = { "gui": "#8F8FB7", "cterm": "magenta" } +let s:purple = { "gui": "#8F8FB7", "cterm": "5" } -let s:dark_yellow = { "gui": "#DFCF1D", "cterm": "darkyellow" } +let s:dark_yellow = { "gui": "#DFCF1D", "cterm": "3" } " maybe pursue something like this: https://github.com/noahfrederick/vim-hemisu/ From c717336714498937390d681ba105e63268cb5fec Mon Sep 17 00:00:00 2001 From: Matthew Lyon Date: Mon, 20 Jan 2014 17:37:50 -0200 Subject: [PATCH 3/5] reorder uichrome based on `:help hitest.vim` --- colors/pencil.vim | 63 ++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/colors/pencil.vim b/colors/pencil.vim index 530b8cf..5ef4b69 100644 --- a/colors/pencil.vim +++ b/colors/pencil.vim @@ -137,59 +137,54 @@ call s:h("Ignore", {"fg": s:bg}) call s:h("Error", {"fg": s:actual_white, "bg": s:red, "cterm": "bold"}) call s:h("Todo", {"fg": s:actual_white, "bg": s:pink, "gui": "bold", "cterm": "bold"}) -" -" minor groups -hi StatusLine guifg=fg guibg=#D9D9D9 gui=none ctermfg=fg ctermbg=bg cterm=none -hi StatusLineNC guifg=grey50 guibg=#D9D9D9 gui=none ctermfg=fg ctermbg=bg cterm=none -hi TabLine guifg=#F1F1F1 guibg=#545454 gui=none ctermfg=fg ctermbg=bg cterm=none -hi TabLineSel guifg=#F1F1F1 guibg=#2C81FB gui=none ctermfg=253 ctermbg=238 cterm=none -hi TabLineFill guifg=#F1F1F1 guibg=#181818 gui=none ctermfg=fg ctermbg=bg cterm=none +" ui chrome ==================================================================== +" ordered according to `:help hitest.vim` -hi Pmenu guifg=#F1F1F1 guibg=#545454 ctermfg=fg ctermbg=bg -hi PmenuSel guifg=#F1F1F1 guibg=#2C81FB ctermfg=231 ctermbg=244 -hi PmenuSbar guifg=#F1F1F1 guibg=#545454 ctermfg=231 ctermbg=244 -hi PmenuThumb guifg=#F1F1F1 guibg=#545454 -hi WildMenu guifg=#F1F1F1 guibg=#262626 gui=none ctermfg=71 ctermbg=bg cterm=none - -hi Visual guifg=fg guibg=#b6d6fd ctermfg=fg ctermbg=117 -hi VisualNOS guifg=fg guibg=#D4D4D4 ctermfg=bg ctermbg=244 -hi VertSplit guifg=fg guibg=#D9D9D9 gui=none ctermfg=244 ctermbg=bg cterm=none -hi LineNr guifg=#D9D9D9 guibg=NONE ctermfg=244 ctermbg=none -hi CursorLineNr guifg=#20BBFC guibg=NONE ctermfg=244 ctermbg=none - -hi Title guifg=DarkBlue ctermfg=109 hi SpecialKey guifg=#87D787 ctermfg=114 hi NonText guifg=DarkRed ctermfg=244 -hi MatchParen guifg=fg guibg=#F7DF94 ctermfg=16 ctermbg=72 hi Directory guifg=#8787AF ctermfg=103 - hi ErrorMsg guifg=#FF8787 guibg=bg ctermfg=210 ctermbg=bg -hi WarningMsg guifg=#AF87D7 ctermfg=140 +hi IncSearch guifg=fg guibg=#F3E430 gui=none ctermfg=231 ctermbg=168 cterm=none +hi Search guifg=fg guibg=#D9D9D9 gui=none ctermfg=16 ctermbg=179 cterm=none hi MoreMsg guifg=DarkBlue ctermfg=darkblue hi ModeMsg guifg=DarkGreen ctermfg=darkgreen - -hi Search guifg=fg guibg=#D9D9D9 gui=none ctermfg=16 ctermbg=179 cterm=none -hi IncSearch guifg=fg guibg=#F3E430 gui=none ctermfg=231 ctermbg=168 cterm=none +hi LineNr guifg=#D9D9D9 guibg=NONE ctermfg=244 ctermbg=none +hi CursorLineNr guifg=#20BBFC guibg=NONE ctermfg=244 ctermbg=none hi Question guifg=DarkRed ctermfg=38 - +hi StatusLine guifg=fg guibg=#D9D9D9 gui=none ctermfg=fg ctermbg=bg cterm=none +hi StatusLineNC guifg=grey50 guibg=#D9D9D9 gui=none ctermfg=fg ctermbg=bg cterm=none +hi VertSplit guifg=fg guibg=#D9D9D9 gui=none ctermfg=244 ctermbg=bg cterm=none +hi Title guifg=DarkBlue ctermfg=109 +hi Visual guifg=fg guibg=#b6d6fd ctermfg=fg ctermbg=117 +hi VisualNOS guifg=fg guibg=#D4D4D4 ctermfg=bg ctermbg=244 +hi WarningMsg guifg=#AF87D7 ctermfg=140 +hi WildMenu guifg=#F1F1F1 guibg=#262626 gui=none ctermfg=71 ctermbg=bg cterm=none hi Folded guifg=#808080 guibg=bg ctermfg=244 ctermbg=bg hi FoldColumn guifg=#5FD7AF guibg=bg ctermfg=79 ctermbg=bg -hi SignColumn guifg=#5FD7AF guibg=bg ctermfg=79 ctermbg=bg -hi ColorColumn guifg=#5FD7AF guibg=#D9D9D9 ctermbg=79 - -hi CursorColumn guibg=#E5E6E6 gui=none ctermbg=253 cterm=none -hi CursorLine guibg=#E5E6E6 gui=none ctermbg=253 cterm=none - hi DiffAdd guifg=#10A778 guibg=NONE ctermfg=darkgreen ctermbg=bg hi DiffDelete guifg=#C30771 guibg=NONE ctermfg=darkred ctermbg=bg hi DiffChange guifg=#F3E430 guibg=NONE ctermfg=darkyellow ctermbg=bg hi DiffText guifg=#008EC4 guibg=NONE ctermfg=darkblue ctermbg=bg - +hi SignColumn guifg=#5FD7AF guibg=bg ctermfg=79 ctermbg=bg +" hi Conceal hi SpellBad guifg=fg guibg=bg gui=undercurl guisp=#cc0000 ctermfg=210 ctermbg=bg cterm=underline hi SpellCap guifg=fg guibg=bg gui=undercurl guisp=#22cc22 ctermfg=174 ctermbg=bg cterm=underline hi SpellRare guifg=fg guibg=bg gui=undercurl ctermfg=181 ctermbg=bg cterm=underline hi SpellLocal guifg=fg guibg=bg gui=undercurl ctermfg=180 ctermbg=bg cterm=underline +hi Pmenu guifg=#F1F1F1 guibg=#545454 ctermfg=fg ctermbg=bg +hi PmenuSel guifg=#F1F1F1 guibg=#2C81FB ctermfg=231 ctermbg=244 +hi PmenuSbar guifg=#F1F1F1 guibg=#545454 ctermfg=231 ctermbg=244 +hi PmenuThumb guifg=#F1F1F1 guibg=#545454 +hi TabLine guifg=#F1F1F1 guibg=#545454 gui=none ctermfg=fg ctermbg=bg cterm=none +hi TabLineSel guifg=#F1F1F1 guibg=#2C81FB gui=none ctermfg=253 ctermbg=238 cterm=none +hi TabLineFill guifg=#F1F1F1 guibg=#181818 gui=none ctermfg=fg ctermbg=bg cterm=none +hi CursorColumn guibg=#E5E6E6 gui=none ctermbg=253 cterm=none +hi CursorLine guibg=#E5E6E6 gui=none ctermbg=253 cterm=none +hi ColorColumn guifg=#5FD7AF guibg=#D9D9D9 ctermbg=79 + +" remainder of syntax highlighting +hi MatchParen guifg=fg guibg=#F7DF94 ctermfg=16 ctermbg=72 hi vimFold guifg=#808080 ctermfg=244 hi vimCommentTitle guifg=fg ctermfg=fg hi helpHyperTextJump guifg=#5FAFD7 ctermfg=74 From 9e24802e0465a949fa2ae4695f7c8ac37da7bd74 Mon Sep 17 00:00:00 2001 From: Matthew Lyon Date: Mon, 20 Jan 2014 17:42:18 -0200 Subject: [PATCH 4/5] Visual, VisualNOS, fix blues & add light grey I had the alignments of blue/dark blue/light blue wrong :/ --- colors/pencil.vim | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/colors/pencil.vim b/colors/pencil.vim index 5ef4b69..c2b11cf 100644 --- a/colors/pencil.vim +++ b/colors/pencil.vim @@ -18,6 +18,7 @@ let g:colors_name='pencil' " Colors let s:black = { "gui": "#212121", "cterm": "0" } let s:light_black = { "gui": "#424242", "cterm": "8" } +let s:light_grey = { "gui": "#D9D9D9", "cterm": 7 } let s:white = { "gui": "#F1F1F1", "cterm": "15" } let s:actual_white = { "gui": "#FFFFFF", "cterm": "231" } @@ -25,9 +26,9 @@ let s:pink = { "gui": "#C30771", "cterm": "9" } let s:red = { "gui": "#C30771", "cterm": "1" } let s:orange = { "gui": "#D75F5F", "cterm": "167" } -let s:blue = { "gui": "#20BBFC", "cterm": "4" } -let s:light_blue = { "gui": "#b6d6fd", "cterm": "12" } -let s:dark_blue = { "gui": "#008EC4", "cterm": "31" } +let s:blue = { "gui": "#20BBFC", "cterm": "12" } +let s:light_blue = { "gui": "#b6d6fd", "cterm": "153" } +let s:dark_blue = { "gui": "#008EC4", "cterm": "4" } let s:green = { "gui": "#10A778", "cterm": "2" } @@ -155,8 +156,8 @@ hi StatusLine guifg=fg guibg=#D9D9D9 gui=none ctermfg=fg ctermbg=b hi StatusLineNC guifg=grey50 guibg=#D9D9D9 gui=none ctermfg=fg ctermbg=bg cterm=none hi VertSplit guifg=fg guibg=#D9D9D9 gui=none ctermfg=244 ctermbg=bg cterm=none hi Title guifg=DarkBlue ctermfg=109 -hi Visual guifg=fg guibg=#b6d6fd ctermfg=fg ctermbg=117 -hi VisualNOS guifg=fg guibg=#D4D4D4 ctermfg=bg ctermbg=244 +call s:h("Visual", {"bg": s:light_blue}) +call s:h("VisualNOS", {"bg": s:light_grey}) hi WarningMsg guifg=#AF87D7 ctermfg=140 hi WildMenu guifg=#F1F1F1 guibg=#262626 gui=none ctermfg=71 ctermbg=bg cterm=none hi Folded guifg=#808080 guibg=bg ctermfg=244 ctermbg=bg From b83fe865b4833e0c172fb807e3ba84aaffffa0aa Mon Sep 17 00:00:00 2001 From: Matthew Lyon Date: Mon, 20 Jan 2014 18:27:37 -0200 Subject: [PATCH 5/5] Converted easy UI Chrome colors to variables Mostly greys, but some yellow as well. --- colors/pencil.vim | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/colors/pencil.vim b/colors/pencil.vim index c2b11cf..7b94ee3 100644 --- a/colors/pencil.vim +++ b/colors/pencil.vim @@ -18,7 +18,9 @@ let g:colors_name='pencil' " Colors let s:black = { "gui": "#212121", "cterm": "0" } let s:light_black = { "gui": "#424242", "cterm": "8" } -let s:light_grey = { "gui": "#D9D9D9", "cterm": 7 } +let s:medium_grey = { "gui": "#808080", "cterm": "240" } +let s:light_grey = { "gui": "#D9D9D9", "cterm": "254" } +let s:lighter_grey = { "gui": "#E5E6E6", "cterm": "255" } let s:white = { "gui": "#F1F1F1", "cterm": "15" } let s:actual_white = { "gui": "#FFFFFF", "cterm": "231" } @@ -34,9 +36,11 @@ let s:green = { "gui": "#10A778", "cterm": "2" } let s:purple = { "gui": "#8F8FB7", "cterm": "5" } +let s:yellow = { "gui": "#F3E430", "cterm": "220" } let s:dark_yellow = { "gui": "#DFCF1D", "cterm": "3" } + " maybe pursue something like this: https://github.com/noahfrederick/vim-hemisu/ "let s:iaWhite = { 'gui': '#F1F1F1' } "let s:iaOffWhiteIPad = { 'gui': '#F5F2EC' } @@ -145,22 +149,22 @@ hi SpecialKey guifg=#87D787 ctermfg=114 hi NonText guifg=DarkRed ctermfg=244 hi Directory guifg=#8787AF ctermfg=103 hi ErrorMsg guifg=#FF8787 guibg=bg ctermfg=210 ctermbg=bg -hi IncSearch guifg=fg guibg=#F3E430 gui=none ctermfg=231 ctermbg=168 cterm=none -hi Search guifg=fg guibg=#D9D9D9 gui=none ctermfg=16 ctermbg=179 cterm=none +call s:h("IncSearch", {"bg": s:yellow, "fg": s:norm}) +call s:h("Search", {"bg": s:yellow, "fg": s:norm}) hi MoreMsg guifg=DarkBlue ctermfg=darkblue hi ModeMsg guifg=DarkGreen ctermfg=darkgreen -hi LineNr guifg=#D9D9D9 guibg=NONE ctermfg=244 ctermbg=none -hi CursorLineNr guifg=#20BBFC guibg=NONE ctermfg=244 ctermbg=none +call s:h("LineNr", {"fg": s:light_grey}) +call s:h("CursorLineNr", {"fg": s:blue, "bg": s:lighter_grey}) hi Question guifg=DarkRed ctermfg=38 -hi StatusLine guifg=fg guibg=#D9D9D9 gui=none ctermfg=fg ctermbg=bg cterm=none -hi StatusLineNC guifg=grey50 guibg=#D9D9D9 gui=none ctermfg=fg ctermbg=bg cterm=none -hi VertSplit guifg=fg guibg=#D9D9D9 gui=none ctermfg=244 ctermbg=bg cterm=none +call s:h("StatusLine", {"bg": s:light_grey}) +call s:h("StatusLineNC", {"bg": s:light_grey, "fg": s:medium_grey}) +call s:h("VertSplit", {"bg": s:light_grey, "fg": s:light_grey}) hi Title guifg=DarkBlue ctermfg=109 call s:h("Visual", {"bg": s:light_blue}) call s:h("VisualNOS", {"bg": s:light_grey}) hi WarningMsg guifg=#AF87D7 ctermfg=140 hi WildMenu guifg=#F1F1F1 guibg=#262626 gui=none ctermfg=71 ctermbg=bg cterm=none -hi Folded guifg=#808080 guibg=bg ctermfg=244 ctermbg=bg +call s:h("Folded", {"fg": s:medium_grey}) hi FoldColumn guifg=#5FD7AF guibg=bg ctermfg=79 ctermbg=bg hi DiffAdd guifg=#10A778 guibg=NONE ctermfg=darkgreen ctermbg=bg hi DiffDelete guifg=#C30771 guibg=NONE ctermfg=darkred ctermbg=bg @@ -179,8 +183,8 @@ hi PmenuThumb guifg=#F1F1F1 guibg=#545454 hi TabLine guifg=#F1F1F1 guibg=#545454 gui=none ctermfg=fg ctermbg=bg cterm=none hi TabLineSel guifg=#F1F1F1 guibg=#2C81FB gui=none ctermfg=253 ctermbg=238 cterm=none hi TabLineFill guifg=#F1F1F1 guibg=#181818 gui=none ctermfg=fg ctermbg=bg cterm=none -hi CursorColumn guibg=#E5E6E6 gui=none ctermbg=253 cterm=none -hi CursorLine guibg=#E5E6E6 gui=none ctermbg=253 cterm=none +call s:h("CursorColumn", {"bg": s:lighter_grey}) +call s:h("CursorLine", {"bg": s:lighter_grey}) hi ColorColumn guifg=#5FD7AF guibg=#D9D9D9 ctermbg=79