Update for Colortemplate v2.

templates/_bw.colortemplate

@@ -0,0 +1,71 @@
+# vim: ft=colortemplate fdm=marker cc=22
+
+# Template for black & white terminals
+Variant: 2
+
+Color: unused #000000 0
+
+# Default highlight groups {{{
+# Group              Unused   Unused   term
+Normal               unused unused
+ColorColumn          unused unused reverse
+Conceal              unused unused
+Cursor               unused unused
+CursorColumn         unused unused reverse
+CursorLine           unused unused underline
+CursorLineNr         unused unused reverse,italic,bold,underline
+DiffAdd              unused unused reverse,underline
+DiffChange           unused unused reverse,underline
+DiffDelete           unused unused reverse,underline
+DiffText             unused unused bold,reverse,underline
+Directory            unused unused
+EndOfBuffer          unused unused
+ErrorMsg             unused unused bold,reverse,italic
+FoldColumn           unused unused reverse
+Folded               unused unused italic,reverse,underline
+IncSearch            unused unused reverse,bold,italic
+LineNr               unused unused reverse
+MatchParen           unused unused bold,underline
+ModeMsg              unused unused
+MoreMsg              unused unused
+NonText              unused unused
+Pmenu                unused unused reverse
+PmenuSbar            unused unused
+PmenuSel             unused unused
+PmenuThumb           unused unused
+Question             unused unused standout
+Search               unused unused underline,italic
+SignColumn           unused unused reverse
+SpecialKey           unused unused bold
+SpellBad             unused unused underline,italic
+SpellCap             unused unused underline,italic
+SpellLocal           unused unused underline,italic
+SpellRare            unused unused underline,italic
+StatusLine           unused unused reverse,bold
+StatusLineNC         unused unused reverse
+TabLine              unused unused reverse,underline,italic
+TabLineFill          unused unused reverse,underline
+TabLineSel           unused unused bold
+Title                unused unused bold
+VertSplit            unused unused reverse
+Visual               unused unused reverse
+VisualNOS            unused unused
+WarningMsg           unused unused standout
+WildMenu             unused unused bold
+# Other conventional group names (see `:help group-name`)
+Comment              unused unused italic
+Constant             unused unused bold,italic
+Error                unused unused reverse
+Identifier           unused unused italic
+Ignore               unused unused
+PreProc              unused unused italic
+Special              unused unused bold,italic
+Statement            unused unused bold
+Todo                 unused unused bold,underline
+Type                 unused unused bold
+Underlined           unused unused underline
+CursorIM             unused unused
+ToolbarLine          unused unused reverse
+ToolbarButton        unused unused bold,reverse
+# }}}
+

templates/_dark_terminal.colortemplate

@@ -0,0 +1,3 @@
+# vim: ft=colortemplate fdm=marker
+Term Colors: base02 red    green  yellow blue  magenta cyan  base2
+Term Colors: base03 orange base01 base00 base0 violet  base1 base3

templates/_extra.colortemplate

@@ -1,7 +1,10 @@
 # vim: ft=colortemplate fdm=marker
 # Filetype specific highlight groups {{{
 verbatim
-if get(g:, '@optionprefix_extra_hi_groups', 0)
+if !get(g:, '@optionprefix_extra_hi_groups', 0)
+  unlet s:t_Co s:italics s:termtrans
+  finish
+endif
 endverbatim
 # vim {{{
 vimVar            -> Identifier
@@ -31,7 +34,7 @@ diffAdded         -> Statement
 diffLine          -> Identifier
 # }}}
 # git {{{
-gitcommitComment           base01          none              g=italic
+gitcommitComment           base01          none              italic
 gitcommitUntracked      -> gitcommitComment
 gitcommitDiscarded      -> gitcommitComment
 gitcommitSelected       -> gitcommitComment
@@ -56,7 +59,7 @@ htmlTag                    base01          none
 htmlEndTag                 base01          none
 htmlTagN                   base1           none              bold
 htmlTagName                blue            none              bold
-htmlSpecialTagName         blue            none              g=italic
+htmlSpecialTagName         blue            none              italic
 htmlArg                    base00          none
 javaScript                 yellow          none
 # }}}
@@ -87,10 +90,6 @@ rubyBoolean                magenta         back
 #
 # Treat True and False and highlight delims specially, see the plugin
 # referenced above.
-verbatim
-let hs_highlight_boolean=1
-let hs_highlight_delimiters=1
-endverbatim
 cPreCondit                 orange          none
 VarId                      blue            none
 ConId                      yellow          none
@@ -114,12 +113,14 @@ hsModuleWhereLabel      -> hsModuleStartLabel
 # the first two items don't have an impact, but better safe
 hsNiceOperator             cyan            none
 hsniceoperator             cyan            none
+#let hs_highlight_boolean=1
+#let hs_highlight_delimiters=1
 # }}}
 # pandoc {{{
 pandocTitleBlock                       blue               none
 pandocTitleBlockTitle                  blue               none           bold
 pandocTitleComment                     blue               none           bold
-pandocComment                          base01             none           g=italic
+pandocComment                          base01             none           italic
 pandocVerbatimBlock                    yellow             none
 pandocVerbatimBlockDeep             -> pandocVerbatimBlock
 pandocCodeBlock                     -> pandocVerbatimBlock
@@ -137,7 +138,7 @@ pandocListReference                    magenta            none
 pandocDefinitionBlock                  violet             none
 pandocDefinitionTerm                   violet             none           standout
 pandocDefinitionIndctr                 violet             none           bold
-pandocEmphasisDefinition               violet             none           g=italic
+pandocEmphasisDefinition               violet             none           italic
 pandocEmphasisNestedDefinition         violet             none           bold
 pandocStrongEmphasisDefinition         violet             none           bold
 pandocStrongEmphasisNestedDefinition   violet             none           bold
@@ -154,7 +155,7 @@ pandocTableStructureTop             -> pandocTableStructre
 pandocTableStructureEnd             -> pandocTableStructre
 pandocTableZebraLight                  blue               base03
 pandocTableZebraDark                   blue               base02
-pandocEmphasisTable                    blue               none           g=italic
+pandocEmphasisTable                    blue               none           italic
 pandocEmphasisNestedTable              blue               none           bold
 pandocStrongEmphasisTable              blue               none           bold
 pandocStrongEmphasisNestedTable        blue               none           bold
@@ -195,7 +196,7 @@ pandocCitationID                       magenta            none
 pandocCitationRef                      magenta            none
 # Main Styles
 pandocStyleDelim                       base01             none
-pandocEmphasis                         base0              none           g=italic
+pandocEmphasis                         base0              none           italic
 pandocEmphasisNested                   base0              none           bold
 pandocStrongEmphasis                   base0              none           bold
 pandocStrongEmphasisNested             base0              none           bold
@@ -218,22 +219,5 @@ pandocMetadataKey                      blue               none
 pandocMetadata                         blue               none           bold
 pandocMetadataTitle                 -> pandocMetadata
 # }}}
-verbatim
-endif
-endverbatim
-# }}}
-
-# Terminal italic {{{
-verbatim
-if get(g:, "@optionprefix_term_italics", 0)
-hi Comment cterm=italic
-hi gitcommitComment cterm=italic
-hi htmlSpecialTagName cterm=italic
-hi pandocComment cterm=italic
-hi pandocEmphasisDefinition cterm=italic
-hi pandocEmphasisTable cterm=italic
-hi pandocEmphasis cterm=italic
-endif
-endverbatim
 # }}}
 

templates/_help.colortemplate

@@ -1,7 +1,64 @@
-# vim: ft=colortemplate fdm=marker tw=78 ts=8 norl
-
 documentation
-*@shortname.txt*	For Vim version 7.4	Last change: 2019 March 26
+*@shortname.txt*	For Vim version @vimversion	Last change: @date
+
+
+			@fullname color scheme
+
+Modernized and actively maintained Solarized color scheme for Vim.
+
+==============================================================================
+Colorscheme options				*@shortname-options*
+
+						*g:@optionprefix_diffmode*
+Tweak the way diffs are displayed. Allowed values are `"normal"` (default),
+`"high"`, and `"low"`.
+>
+	let g:@optionprefix_diffmode = "normal"
+<
+					*g:@optionprefix_enable_extra_hi_groups*
+Set to 1 to enable filetype-specific syntax highlight group.
+>
+	let g:@optionprefix_enable_extra_hi_groups = 0
+<
+NOTE: setting this to 1 may leave "a wake of destruction when switching away"
+(T. Pope), that is, when you switch to a different colorscheme the
+highlighting may look wrong or disabled.
+
+						*g:@optionprefix_old_cursor_style*
+Set to 1 if you want to use the original Solarized's cursor style. By default,
+the cursor is blue. NOTE: your terminal may override the cursor's color.
+>
+	let g:@optionprefix_old_cursor_style = 0
+<
+						*g:@optionprefix_statusline*
+Set to `"low"` to reduce the contrast in the status line. Set to `"flat"` to
+make the status lines, tab bars and vertical splits similar to how they look
+in the flat variant (of course, `"flat"` does not have any effect in the flat
+variant).
+>
+	let g:@optionprefix_statusline = "normal"
+<
+						*g:@optionprefix_term_italics*
+Set to 0 if you do not want to enable italics in the terminal. Note that the
+color scheme in normal circumstances detects whether italics is available
+automatically. You should never need to set this option explicitly. You may
+want to unset it if you do not want Vim to display italics even when the
+feature is available (e.g., in GUI versions of Vim).
+>
+	let g:@optionprefix_term_italics = 1
+<
+						*g:@optionprefix_termtrans*
+Set to 1 if you want a transparent background. Takes effect only in the
+terminal.
+>
+	let g:@optionprefix_termtrans = 0
+<
+						*g:@optionprefix_visibility*
+Tweak the visibility of a few  elements. Allowed values are `"normal"`
+(default), `"high"`, and `"low"`.
+>
+	let g:@optionprefix_visibility = "normal"
+<
 ==============================================================================
 @fullname license				*@shortname-license*
 
@@ -25,53 +82,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ==============================================================================
-@fullname colorscheme			*@shortname*
 
-						*g:@optionprefix_diffmode*
+ vim:tw=78:ts=8:noet:ft=help:norl:
-Tweak the way diffs are displayed. Allowed values are `"normal"` (default),
-`"high"`, and `"low"`.
->
-	let g:@optionprefix_diffmode = "normal"
-<
-					*g:@optionprefix_enable_extra_hi_groups*
-Set to 1 to enable filetype-specific syntax highlight group.
->
-	let g:@optionprefix_enable_extra_hi_groups = 0
-<
-NOTE: setting this to 1 may leave "a wake of destruction when switching away"
-(T. Pope), that is, when you switch to a different colorscheme the
-highlighting may look wrong or disabled.
-						*g:@optionprefix_old_cursor_style*
-Set to 1 if you want to use the original Solarized's cursor style. By default,
-the cursor is blue. NOTE: your terminal may override the cursor's color.
->
-	let g:@optionprefix_old_cursor_style = 0
-<
-						*g:@optionprefix_statusline*
-Set to `"low"` to reduce the contrast in the status line. Set to `"flat"` to
-make the status lines, tab bars and vertical splits similar to how they look
-in the flat variant (of course, `"flat"` does not have any effect in the flat
-variant).
->
-	let g:@optionprefix_statusline = "normal"
-<
-						*g:@optionprefix_term_italics*
-Set to 1 if you want to enable italics in the terminal.
->
-	let g:@optionprefix_term_italics = 0
-<
-						*g:@optionprefix_termtrans*
-Set to 1 if you want a transparent background. Takes effect only in the
-terminal.
->
-	let g:@optionprefix_termtrans = 0
-<
-						*g:@optionprefix_visibility*
-Tweak the visibility of a few  elements. Allowed values are `"normal"`
-(default), `"high"`, and `"low"`.
->
-	let g:@optionprefix_visibility = "normal"
-<
 
 enddocumentation
 
+# vim: ft=colortemplate fdm=marker ts=8 tw=78
+

templates/_light_terminal.colortemplate

@@ -0,0 +1,4 @@
+# vim: ft=colortemplate fdm=marker
+Term Colors: base2  red    green  yellow blue   magenta cyan   base02
+Term Colors: base3  orange base1  base0  base00 violet  base01 base03
+

templates/_neovim_dark.colortemplate

@@ -1,27 +0,0 @@
-# vim: ft=colortemplate fdm=marker
-
-verbatim
-if has('nvim')
-endverbatim
-TermCursor        -> Cursor
-TermCursorNC         base03            base01
-verbatim
-let g:terminal_color_0='@guibase02'
-let g:terminal_color_1='@guired'
-let g:terminal_color_2='@guigreen'
-let g:terminal_color_3='@guiyellow'
-let g:terminal_color_4='@guiblue'
-let g:terminal_color_5='@guimagenta'
-let g:terminal_color_6='@guicyan'
-let g:terminal_color_7='@guibase2'
-let g:terminal_color_8='@guibase03'
-let g:terminal_color_9='@guiorange'
-let g:terminal_color_10='@guibase01'
-let g:terminal_color_11='@guibase00'
-let g:terminal_color_12='@guibase0'
-let g:terminal_color_13='@guiviolet'
-let g:terminal_color_14='@guibase1'
-let g:terminal_color_15='@guibase3'
-endif
-endverbatim
-

templates/_neovim_light.colortemplate

@@ -1,27 +0,0 @@
-# vim: ft=colortemplate fdm=marker
-
-verbatim
-if has('nvim')
-endverbatim
-TermCursor        -> Cursor
-TermCursorNC         base03            base01
-verbatim
-let g:terminal_color_0='@guibase2'
-let g:terminal_color_1='@guired'
-let g:terminal_color_2='@guigreen'
-let g:terminal_color_3='@guiyellow'
-let g:terminal_color_4='@guiblue'
-let g:terminal_color_5='@guimagenta'
-let g:terminal_color_6='@guicyan'
-let g:terminal_color_7='@guibase02'
-let g:terminal_color_8='@guibase3'
-let g:terminal_color_9='@guiorange'
-let g:terminal_color_10='@guibase1'
-let g:terminal_color_11='@guibase0'
-let g:terminal_color_12='@guibase00'
-let g:terminal_color_13='@guiviolet'
-let g:terminal_color_14='@guibase01'
-let g:terminal_color_15='@guibase03'
-endif
-endverbatim
-

templates/_terminal_ansi_colors_dark.colortemplate

@@ -1,5 +0,0 @@
-verbatim
-let g:terminal_ansi_colors = ['@guibase02', '@guired', '@guigreen', '@guiyellow', '@guiblue', '@guimagenta', '@guicyan', '@guibase2',
-\ '@guibase03', '@guiorange', '@guibase01', '@guibase00', '@guibase0', '@guiviolet', '@guibase1', '@guibase3']
-endverbatim
-

templates/_terminal_ansi_colors_light.colortemplate

@@ -1,5 +0,0 @@
-verbatim
-let g:terminal_ansi_colors = ['@guibase2', '@guired', '@guigreen', '@guiyellow', '@guiblue', '@guimagenta', '@guicyan', '@guibase02',
-\ '@guibase3', '@guiorange', '@guibase1', '@guibase0', '@guibase00', '@guiviolet', '@guibase01', '@guibase03']
-endverbatim
-

templates/solarized8.colortemplate

@@ -7,82 +7,101 @@ Author:          Ethan Schoonover
 Maintainer:      Lifepillar <lifepillar@lifepillar.me>
 Website:         https://github.com/lifepillar/vim-solarized8
 Description:     Precision colors for machines and people
-Terminal Colors: 256, 16
 Option Prefix:   solarized
 License:         OSI approved MIT license
+Neovim:          yes
 # }}}
-
 # Documentation {{{
 Include: _help.colortemplate
 # }}}
 
+#let s:italics = s:italics && get(g:, '@optionprefix_italics', 1)
+#let s:termtrans = get(g:, '@optionprefix_termtrans', 0) && !has('gui_running')
+
+# Common linked groups {{{
+Boolean           -> Constant
+Character         -> Constant
+Conditional       -> Statement
+Debug             -> Special
+Define            -> PreProc
+Delimiter         -> Special
+Exception         -> Statement
+Float             -> Constant
+Function          -> Identifier
+Include           -> PreProc
+Keyword           -> Statement
+Label             -> Statement
+Macro             -> PreProc
+Number            -> Constant
+Operator          -> Statement
+PreCondit         -> PreProc
+QuickFixLine      -> Search
+Repeat            -> Statement
+SpecialChar       -> Special
+SpecialComment    -> Special
+StatusLineTerm    -> StatusLine
+StatusLineTermNC  -> StatusLineNC
+StorageClass      -> Type
+String            -> Constant
+Structure         -> Type
+Tag               -> Special
+Typedef           -> Type
+lCursor           -> Cursor
+# }}}
+
+Variant: gui 256 16
+
 Background: dark
-
+# Dark color palette {{{
-# Color palette {{{
+# Color name                GUI                  Base256    Base16
-# Color name                GUI                  Base256    Base16 (optional)
+Color: base02               #073642              236        0
-Color: base03               #002b36                ~        8
+Color: red                  #dc322f              160        1
-Color: base02               #073642                ~        0
+Color: green                #859900              106        2
-Color: base01               #586e75                ~        10
-Color: base00               #657b83                ~        11
-Color: base0                #839496                ~        12
-Color: base1                #93a1a1                ~        14
-Color: base2                #eee8d5                ~        7
-Color: base3                #fdf6e3                ~        15
-Color: yellow               #b58900                ~        3
-Color: orange               #cb4b16                ~        9
-Color: red                  #dc322f                ~        1
-Color: magenta              #d33682                ~        5
-Color: violet               #6c71c4                ~        13
-Color: blue                 #268bd2                ~        4
-Color: cyan                 #2aa198                ~        6
-Color: green                #859900                ~        2
 #Color:green                #719e07              ~          2
-Color: back                 #002b36                ~        8
+Color: yellow               #b58900              136        3
-# }}}
+Color: blue                 #268bd2              32         4
+Color: magenta              #d33682              162        5
+Color: cyan                 #2aa198              37         6
+Color: base2                #eee8d5              254        7
+Color: base03               #002b36              235        8
+Color: back                 #002b36              235        8
+Color: orange               #cb4b16              166        9
+Color: base01               #586e75              242       10
+Color: base00               #657b83              66        11
+Color: base0                #839496              246       12
+Color: violet               #6c71c4              61        13
+Color: base1                #93a1a1              247       14
+Color: base3                #fdf6e3              230       15
 
-# Terminal colors {{{
+Include: _dark_terminal.colortemplate
-Include: _terminal_ansi_colors_dark.colortemplate
-Include: _neovim_dark.colortemplate
 # }}}
-
+# Fix 256-color palette in supported terminals (dark) {{{
-# Fix 256-color palette in supported terminals {{{
 Include: _fix-256-palette.colortemplate
 # }}}
-
+# Default highlight groups (dark) {{{
-# Default highlight groups {{{
+# Transparency (dark) {{{
-verbatim
+#if s:termtrans
-if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0)
-endverbatim
-
-  # Transparent background
   Normal             base1             none
+  CursorLine         none              none              underline s=base1
   FoldColumn         fg                none
   Folded             fg                none              bold s=base03
-  LineNr             base01            none
   Terminal           fg                none
-
+  ToolbarButton      base1             none              bold
-verbatim
+  ToolbarLine        none              none
-hi CursorLineNr ctermbg=NONE guifg=NONE
+#else " opaque
-else
-endverbatim
-
-  # Opaque background
   Normal             base1             back
+  CursorLine         none              base02
   FoldColumn         base0             base02
   Folded             base0             base02            bold s=base03
-  LineNr            base01            base02
   Terminal           fg                back
-
+  ToolbarButton      base1             base02            bold
-verbatim
+  ToolbarLine        none              base02
-hi CursorLineNr ctermbg=@base02 guibg=@base02
+#endif
-endif
+# }}}
-endverbatim
+# Visibility (dark) {{{
-
+#if get(g:, '@optionprefix_visibility', '') ==# 'high'
-# Visibility ================================================================
+  CursorLineNr       orange            base02            bold
-verbatim
+  LineNr             base0             base02
-if get(g:, "@optionprefix_visibility", "") == "high"
-hi CursorLineNr ctermfg=@orange guifg=@orange cterm=bold gui=bold
-endverbatim
   NonText            orange            none              bold
   SpecialKey         orange            none              reverse
   SpellBad           violet            base3             t=underline,reverse g=undercurl,reverse s=red
@@ -90,10 +109,9 @@ SpellCap             violet            base3             t=underline,reverse g=u
   SpellLocal         yellow            base3             t=underline,reverse g=undercurl,reverse s=red
   SpellRare          cyan              base3             t=underline,reverse g=undercurl,reverse s=red
   Title              yellow            none              bold
-verbatim
+#elseif get(g:, '@optionprefix_visibility', '') ==# 'low'
-elseif get(g:, "@optionprefix_visibility", "") == "low"
+  CursorLineNr       base01            base02            bold
-hi CursorLineNr ctermfg=@base01 guifg=@base01 cterm=bold gui=bold
+  LineNr             base01            base02
-endverbatim
   NonText            base02            none              bold
   SpecialKey         base02            none              reverse
   SpellBad           violet            none              t=underline g=undercurl s=violet
@@ -101,10 +119,9 @@ SpellCap             violet            none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              base01            none              bold
-verbatim
+#else " normal visibility
-else
+  CursorLineNr       base0             base02            bold
-hi CursorLineNr ctermfg=@base0 guifg=@base0 cterm=bold gui=bold
+  LineNr             base00            base02
-endverbatim
   NonText            base00            none              bold
   SpecialKey         base00            base02            bold
   SpellBad           violet            none              t=underline g=undercurl s=violet
@@ -112,56 +129,78 @@ SpellCap             violet            none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              yellow            none              bold
+#endif
+# }}}
+# [Cursor]LineNr transparency (dark) {{{
+Variant: gui
 verbatim
+if s:termtrans
+  hi CursorLineNr guibg=NONE
+  hi LineNr guibg=NONE
 endif
 endverbatim
-# ---------------------------------------------------------------------------
+Variant: 256 16
-
-ColorColumn          none              base02
-Conceal              blue              none
-
-# Cursor style ==============================================================
 verbatim
-if get(g:, '@optionprefix_old_cursor_style', 0)
+if s:termtrans
+  hi CursorLineNr ctermbg=NONE
+  hi LineNr ctermbg=NONE
+endif
 endverbatim
+Variant: gui 256 16
+# }}}
+# Cursor style (dark) {{{
+#if get(g:, '@optionprefix_old_cursor_style', 0)
   Cursor             base03            base0
-verbatim
+#else
-else
-endverbatim
   Cursor             base3             blue
-verbatim
+#endif
-endif
+# }}}
-endverbatim
+# Diff mode (dark) {{{
-# ---------------------------------------------------------------------------
+#if get(g:, '@optionprefix_diffmode', '') ==# 'high'
-
-CursorColumn         none              base02
-CursorLine           none              base02            s=base1
-
-# Diff mode =================================================================
-verbatim
-if get(g:, "@optionprefix_diffmode", "") == "high"
-endverbatim
   DiffAdd            green             none              reverse
   DiffChange         yellow            none              reverse
   DiffDelete         red               none              reverse
   DiffText           blue              none              reverse
-verbatim
+#elseif get(g:, '@optionprefix_diffmode', '') ==# 'low'
-elseif get(g:, "@optionprefix_diffmode", "") == "low"
-endverbatim
   DiffAdd            green             none              s=green
   DiffChange         yellow            none              s=yellow
   DiffDelete         red               none              bold
   DiffText           blue              none              s=blue
-verbatim
+#else " normal diffmode
-else
-endverbatim
   DiffAdd            green             base02            s=green
   DiffChange         yellow            base02            s=yellow
   DiffDelete         red               base02            bold
   DiffText           blue              base02            s=blue
-verbatim
+#endif
-endif
+# }}}
-endverbatim
+# Structural elements (dark) {{{
+#if get(g:, '@optionprefix_statusline', '') ==# 'low'
+  StatusLine         base01            base2             reverse
+  StatusLineNC       base01            base02            reverse
+  TabLine            base01            base02            reverse
+  TabLineFill        base01            base02            reverse
+  TabLineSel         base0             base3             reverse
+  VertSplit          base02            base01
+#elseif get(g:, '@optionprefix_statusline', '') ==# 'flat'
+  StatusLine         base02            base2             reverse
+  StatusLineNC       base02            base1             reverse
+  TabLineSel         base2             base02
+  TabLine            base01            base02
+  TabLineFill        base01            base02
+  VertSplit          base01            base02
+#else
+  StatusLine         base0             base02            reverse
+  StatusLineNC       base01            base02            reverse
+  TabLine            base01            base02            reverse
+  TabLineFill        base01            base02            reverse
+  TabLineSel         base0             base02            reverse
+  VertSplit          base02            base01
+#endif
+# }}}
+# Base groups (dark) {{{
+ColorColumn          none              base02
+Conceal              blue              none
+CursorColumn         none              base02
 Directory            blue              none
 EndOfBuffer          none              none
 ErrorMsg             red               base3             reverse
@@ -174,175 +213,97 @@ PmenuSbar            none              base01
 PmenuSel             base2             base00
 PmenuThumb           none              base0
 Question             cyan              none              bold
-QuickFixLine     ->  Search
 Search               yellow            none              reverse
 SignColumn           base0             none
-verbatim
-if get(g:, "@optionprefix_statusline", "") == "low"
-endverbatim
-StatusLine           base01            base2             reverse
-StatusLineNC         base01            base02            reverse
-TabLine              base01            base02            reverse
-TabLineFill          base01            base02            reverse
-TabLineSel           base0             base3             reverse
-VertSplit            base02            base01
-verbatim
-elseif get(g:, "@optionprefix_statusline", "") == "flat"
-endverbatim
-StatusLine           base02            base2             reverse
-StatusLineNC         base02            base1             reverse
-TabLineSel           base2             base02
-TabLine              base01            base02
-TabLineFill          base01            base02
-VertSplit            base01            base02
-verbatim
-else
-endverbatim
-StatusLine           base0             base02            reverse
-StatusLineNC         base01            base02            reverse
-TabLine              base01            base02            reverse
-TabLineFill          base01            base02            reverse
-TabLineSel           base0             base02            reverse
-VertSplit            base02            base01
-verbatim
-endif
-endverbatim
-StatusLineTerm    -> StatusLine
-StatusLineTermNC  -> StatusLineNC
 Visual               base01            base03            reverse
 VisualNOS            none              base02            reverse
 WarningMsg           orange            none              bold
 WildMenu             base2             base02            reverse
-# Other conventional group names (see `:help group-name`)
+# }}}
-Boolean           -> Constant
+# Other conventional groups (dark) {{{
-Character         -> Constant
+Comment              base01            none              italic
-Comment              base01            none              g=italic
-Conditional       -> Statement
 Constant             cyan              none
-Define            -> PreProc
+CursorIM             none              fg
-Debug             -> Special
-Delimiter         -> Special
 Error                red               base3             bold,reverse
-Exception         -> Statement
-Float             -> Constant
-Function          -> Identifier
 Identifier           blue              none
 Ignore               none              none
-Include           -> PreProc
-Keyword           -> Statement
-Label             -> Statement
-Macro             -> PreProc
-Number            -> Constant
-Operator          -> Statement
-PreCondit         -> PreProc
 PreProc              orange            none
-Repeat            -> Statement
 Special              orange            none
-SpecialChar       -> Special
-SpecialComment    -> Special
 Statement            green             none
-StorageClass      -> Type
-String            -> Constant
-Structure         -> Type
-Tag               -> Special
 Todo                 magenta           none              bold
 Type                 yellow            none
-Typedef           -> Type
 Underlined           violet            none
-# See `:help lCursor`
-lCursor           -> Cursor
-# See `:help CursorIM`
-CursorIM             none              fg
-# See `:help window-toolbar`
-ToolbarLine          none              base02
-ToolbarButton        base1             base02            bold
 # }}}
-
+# }}}
-# Additional highlight groups {{{
+# Additional highlight groups (dark) {{{
 NormalMode           base0             base3             reverse
 InsertMode           cyan              base3             reverse
 ReplaceMode          orange            base3             reverse
 VisualMode           magenta           base3             reverse
 CommandMode          magenta           base3             reverse
 # }}}
-
+# Neovim (dark) {{{
-# Extra stuff {{{
+TermCursor        -> Cursor
+TermCursorNC         base03            base01
+# }}}
+# Extra stuff (dark) {{{
 Include: _extra.colortemplate
 # }}}
+#unlet s:termtrans
 
 Background: light
-
+# Light color palette {{{
-# Color palette {{{
+# Color name                GUI                  Base256    Base16
-# Color name                GUI                  Base256    Base16 (optional)
+Color: base2                #073642              236        0
-Color: base3                #002b36                ~        8
+Color: red                  #dc322f              160        1
-Color: base2                #073642                ~        0
+Color: green                #859900              106        2
-Color: base1                #586e75                ~        10
-Color: base0                #657b83                ~        11
-Color: base00               #839496                ~        12
-Color: base01               #93a1a1                ~        14
-Color: base02               #eee8d5                ~        7
-Color: base03               #fdf6e3                ~        15
-Color: yellow               #b58900                ~        3
-Color: orange               #cb4b16                ~        9
-Color: red                  #dc322f                ~        1
-Color: magenta              #d33682                ~        5
-Color: violet               #6c71c4                ~        13
-Color: blue                 #268bd2                ~        4
-Color: cyan                 #2aa198                ~        6
-Color: green                #859900                ~        2
 #Color:green                #719e07              ~          2
-Color: back                 #fdf6e3                ~        15
+Color: yellow               #b58900              136        3
+Color: blue                 #268bd2              32         4
+Color: magenta              #d33682              162        5
+Color: cyan                 #2aa198              37         6
+Color: base02               #eee8d5              254        7
+Color: base3                #002b36              235        8
+Color: orange               #cb4b16              166        9
+Color: base1                #586e75              242       10
+Color: base0                #657b83              66        11
+Color: base00               #839496              246       12
+Color: violet               #6c71c4              61        13
+Color: base01               #93a1a1              247       14
+Color: base03               #fdf6e3              230       15
+Color: back                 #fdf6e3              230       15
+
+Include: _light_terminal.colortemplate
 # }}}
-
+# Default highlight groups (dark) {{{
-# Terminal colors {{{
+# Transparency (light) {{{
-Include: _terminal_ansi_colors_light.colortemplate
+#if s:termtrans
-Include: _neovim_light.colortemplate
-# }}}
-
-# Default highlight groups {{{
-verbatim
-if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0)
-endverbatim
-
-  # Transparent background
   Normal             base1             none
+  CursorLine         none              none              underline s=base1
   FoldColumn         base0             none
   Folded             base0             none              bold s=base03
-  LineNr             base01            none
   Terminal           fg                none
-
+  ToolbarButton      base1             none              bold
-verbatim
+  ToolbarLine        none              none
-hi CursorLineNr ctermbg=NONE guifg=NONE
+#else " opaque
-else
-endverbatim
-
-  # Opaque background
   Normal             base1             back
+  CursorLine         none              base02
   FoldColumn         base0             base02
   Folded             base0             base02            bold s=base03
-  LineNr            base01            base02
   Terminal           fg                back
-
+  ToolbarButton      base1             base02            bold
-verbatim
+  ToolbarLine        none              base02
-hi CursorLineNr ctermbg=@base02 guibg=@base02
+#endif
-endif
+# }}}
-endverbatim
+# Visibility and cursor style (light) {{{
-
+#if get(g:, '@optionprefix_visibility', '') ==# 'high'
-# Visibility and cursor style ===============================================
+  #if get(g:, '@optionprefix_old_cursor_style', 0)
-# High visibiity
-verbatim
-if get(g:, "@optionprefix_visibility", "") == "high"
-hi CursorLineNr ctermfg=@red guifg=@red cterm=bold gui=bold
-if get(g:, '@optionprefix_old_cursor_style', 0)
-endverbatim
     Cursor           base03            base0
-verbatim
+  #else
-else
-endverbatim
     Cursor           base03            red
-verbatim
+  #endif
-endif
+  CursorLineNr       red               base02            bold
-endverbatim
+  LineNr             base0             base02
   MatchParen         base03            base00            bold
   NonText            red               none              bold
   SpecialKey         red               none              reverse
@@ -351,20 +312,14 @@ SpellCap             magenta           base03            t=underline,reverse g=u
   SpellLocal         yellow            base03            t=underline,reverse g=undercurl,reverse s=orange
   SpellRare          cyan              base03            t=underline,reverse g=undercurl,reverse s=orange
   Title              orange            none              bold
-# Low visibility
+#elseif get(g:, '@optionprefix_visibility', '') ==# 'low'
-verbatim
+  #if get(g:, '@optionprefix_old_cursor_style', 0)
-elseif get(g:, "@optionprefix_visibility", "") == "low"
-hi CursorLineNr ctermfg=@base01 guifg=@base01 cterm=bold gui=bold
-if get(g:, '@optionprefix_old_cursor_style', 0)
-endverbatim
     Cursor           base03            base0
-verbatim
+  #else
-else
-endverbatim
     Cursor           base03            orange
-verbatim
+  #endif
-endif
+  CursorLineNr       base01            base02            bold
-endverbatim
+  LineNr             base01            base02
   MatchParen         red               base02            bold,underline
   NonText            base02            none              bold
   SpecialKey         base02            none              bold
@@ -373,20 +328,14 @@ SpellCap             magenta           none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              base01            none              bold
-# Normal visibility
+#else " Normal visibility
-verbatim
+  #if get(g:, 'solarized_old_cursor_style', 0)
-else
-hi CursorLineNr ctermfg=@base0 guifg=@base0 cterm=bold gui=bold
-if get(g:, 'solarized_old_cursor_style', 0)
-endverbatim
     Cursor           base03            base0
-verbatim
+  #else
-else
-endverbatim
     Cursor           base03            orange
-verbatim
+  #endif
-endif
+  CursorLineNr       base0             base02            bold
-endverbatim
+  LineNr             base00            base02
   MatchParen         red               base02            bold,underline
   NonText            base00            none              bold
   SpecialKey         base00            base02            bold
@@ -395,41 +344,74 @@ SpellCap             magenta           none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              orange            none              bold
+#endif
+# }}}
+# [Cursor]LineNr transparency (light) {{{
+Variant: gui
 verbatim
+if s:termtrans
+  hi CursorLineNr guibg=NONE
+  hi LineNr guibg=NONE
 endif
 endverbatim
-# ---------------------------------------------------------------------------
+Variant: 256 16
-
-ColorColumn          none              base02
-Conceal              blue              none
-CursorColumn         none              base02
-CursorLine           none              base02            s=base1
-
-# Diff mode =================================================================
 verbatim
-if get(g:, "@optionprefix_diffmode", "") == "high"
+if s:termtrans
+  hi CursorLineNr ctermbg=NONE
+  hi LineNr ctermbg=NONE
+endif
 endverbatim
+Variant: gui 256 16
+# }}}
+# Diff mode (light) {{{
+#if get(g:, '@optionprefix_diffmode', '') ==# 'high'
   DiffAdd            green             none              reverse
   DiffChange         yellow            none              reverse
   DiffDelete         red               none              reverse
   DiffText           blue              none              reverse
-verbatim
+#elseif get(g:, '@optionprefix_diffmode', '') ==# 'low'
-elseif get(g:, "@optionprefix_diffmode", "") == "low"
-endverbatim
   DiffAdd            green             none              s=green
   DiffChange         yellow            none              s=yellow
   DiffDelete         red               none              bold
   DiffText           blue              none              s=blue
-verbatim
+#else
-else
-endverbatim
   DiffAdd            green             base02            s=green
   DiffChange         yellow            base02            s=yellow
   DiffDelete         red               base02            bold
   DiffText           blue              base02            s=blue
-verbatim
+#endif
-endif
+# }}}
-endverbatim
+# Structural elements (light) {{{
+#if get(g:, '@optionprefix_statusline', '') ==# 'low'
+  StatusLine         base01            base03            reverse
+  StatusLineNC       base01            base1             reverse
+  TabLine            base01            base1             reverse
+  TabLineFill        base01            base1             reverse
+  TabLineSel         base1             base03            reverse
+  VertSplit          base1             base01
+  WildMenu           base1             base03            reverse
+#elseif get(g:, '@optionprefix_statusline', '') ==# 'flat'
+  StatusLine         base02            base2             reverse
+  StatusLineNC       base02            base1             reverse
+  TabLineSel         base2             base02
+  TabLine            base01            base02
+  TabLineFill        base01            base02
+  VertSplit          base01            base02
+  WildMenu           base00            base03            reverse
+#else
+  StatusLine         base1             base02            reverse
+  StatusLineNC       base00            base02            reverse
+  TabLine            base00            base02            reverse
+  TabLineFill        base00            base02            reverse
+  TabLineSel         base1             base02            reverse
+  VertSplit          base1             base01
+  WildMenu           base2             base02            reverse
+#endif
+# }}}
+# Base groups (light) {{{
+ColorColumn          none              base02
+Conceal              blue              none
+CursorColumn         none              base02
 Directory            blue              none
 EndOfBuffer          none              none
 ErrorMsg             red               base03            reverse
@@ -441,101 +423,46 @@ PmenuSbar            none              base01
 PmenuSel             base02            base00
 PmenuThumb           none              base0
 Question             cyan              none              bold
-QuickFixLine     ->  Search
 Search               yellow            none              reverse
 SignColumn           base0             none
-verbatim
-if get(g:, "@optionprefix_statusline", "") == "low"
-endverbatim
-StatusLine           base01            base03            reverse
-StatusLineNC         base01            base1             reverse
-TabLine              base01            base1             reverse
-TabLineFill          base01            base1             reverse
-TabLineSel           base1             base03            reverse
-VertSplit            base1             base01
-WildMenu             base1             base03            reverse
-verbatim
-elseif get(g:, "@optionprefix_statusline", "") == "flat"
-endverbatim
-StatusLine           base02            base2             reverse
-StatusLineNC         base02            base1             reverse
-TabLineSel           base2             base02
-TabLine              base01            base02
-TabLineFill          base01            base02
-VertSplit            base01            base02
-WildMenu             base00            base03            reverse
-verbatim
-else
-endverbatim
-StatusLine           base1             base02            reverse
-StatusLineNC         base00            base02            reverse
-TabLine              base00            base02            reverse
-TabLineFill          base00            base02            reverse
-TabLineSel           base1             base02            reverse
-VertSplit            base1             base01
-WildMenu             base2             base02            reverse
-verbatim
-endif
-endverbatim
-StatusLineTerm    -> StatusLine
-StatusLineTermNC  -> StatusLineNC
 Visual               base01            base03            reverse
 VisualNOS            none              base02            reverse
 WarningMsg           orange            none              bold
-# Other conventional group names (see `:help group-name`)
+# }}}
-Boolean           -> Constant
+# Other conventional groups (light) {{{
-Character         -> Constant
+Comment              base01            none              italic
-Comment              base01            none              g=italic
-Conditional       -> Statement
 Constant             cyan              none
-Define            -> PreProc
+CursorIM             none              fg
-Debug             -> Special
-Delimiter         -> Special
 Error                red               base03            bold,reverse
-Exception         -> Statement
-Float             -> Constant
-Function          -> Identifier
 Identifier           blue              none
 Ignore               none              none
-Include           -> PreProc
-Keyword           -> Statement
-Label             -> Statement
-Macro             -> PreProc
-Number            -> Constant
-Operator          -> Statement
-PreCondit         -> PreProc
 PreProc              orange            none
-Repeat            -> Statement
 Special              orange            none
-SpecialChar       -> Special
-SpecialComment    -> Special
 Statement            green             none
-StorageClass      -> Type
-String            -> Constant
-Structure         -> Type
-Tag               -> Special
 Todo                 magenta           none              bold
 Type                 yellow            none
-Typedef           -> Type
 Underlined           violet            none
-# See `:help lCursor`
-lCursor           -> Cursor
-# See `:help CursorIM`
-CursorIM             none              fg
-# See `:help window-toolbar`
-ToolbarLine          none              base02
-ToolbarButton        base1             base02            bold
 # }}}
-
+# }}}
-# Additional highlight groups {{{
+# Additional highlight groups (light) {{{
 NormalMode           base1             base03            reverse
 InsertMode           cyan              base03            reverse
 ReplaceMode          orange            base03            reverse
 VisualMode           magenta           base03            reverse
 CommandMode          magenta           base03            reverse
 # }}}
-
+# Neovim (light) {{{
-# Extra stuff {{{
+TermCursor        -> Cursor
+TermCursorNC         base03            base01
+# }}}
+# Extra stuff (light) {{{
 Include: _extra.colortemplate
 # }}}
+#unlet s:termtrans
+
+Background: any
+# B&W variant {{{
+Include: _bw.colortemplate
+# }}}
+#unlet s:termtrans
 

templates/solarized8_flat.colortemplate

@@ -7,89 +7,89 @@ Author:          Ethan Schoonover
 Maintainer:      Lifepillar <lifepillar@lifepillar.me>
 Website:         https://github.com/lifepillar/vim-solarized8
 Description:     Precision colors for machines and people
-Terminal Colors: 256, 16
 Option Prefix:   solarized
 License:         OSI approved MIT license
+Neovim:          yes
 # }}}
 
-# Documentation {{{
+#let s:italics = s:italics && get(g:, '@optionprefix_italics', 1)
-Include: _help.colortemplate
+#let s:termtrans = get(g:, '@optionprefix_termtrans', 0) && !has('gui_running')
+
+# Common linked groups {{{
+QuickFixLine      -> Search
+StatusLineTerm    -> StatusLine
+StatusLineTermNC  -> StatusLineNC
+Boolean           -> Constant
+Character         -> Constant
+Conditional       -> Statement
+Define            -> PreProc
+Debug             -> Special
+Delimiter         -> Special
+Exception         -> Statement
+Float             -> Constant
+Function          -> Identifier
+Include           -> PreProc
+Keyword           -> Statement
+Label             -> Statement
+Macro             -> PreProc
+Number            -> Constant
+Operator          -> Statement
+PreCondit         -> PreProc
+Repeat            -> Statement
+SpecialChar       -> Special
+SpecialComment    -> Special
+StorageClass      -> Type
+String            -> Constant
+Structure         -> Type
+Tag               -> Special
+Typedef           -> Type
+lCursor           -> Cursor
 # }}}
 
+Variant: gui 256 16
+
 Background: dark
-
+# Dark color palette {{{
-# Color palette {{{
+# Color name                GUI                  Base256    Base16
-# Color name                GUI                  Base256    Base16 (optional)
+Color: base02               #073642                236       0
-Color: base03               #002b36                ~        8
+Color: red                  #dc322f                160       1
-Color: base02               #073642                ~        0
+Color: green                #859900                106       2
-Color: base01               #586e75                ~        10
-Color: base00               #657b83                ~        11
-Color: base0                #839496                ~        12
-Color: base1                #93a1a1                ~        14
-Color: base2                #eee8d5                ~        7
-Color: base3                #fdf6e3                ~        15
-Color: yellow               #b58900                ~        3
-Color: orange               #cb4b16                ~        9
-Color: red                  #dc322f                ~        1
-Color: magenta              #d33682                ~        5
-Color: violet               #6c71c4                ~        13
-Color: blue                 #268bd2                ~        4
-Color: cyan                 #2aa198                ~        6
-Color: green                #859900                ~        2
 #Color:green                #719e07                ~         2
-Color: back                 #002b36                ~        8
+Color: yellow               #b58900                136       3
+Color: blue                 #268bd2                32        4
+Color: magenta              #d33682                162       5
+Color: cyan                 #2aa198                37        6
+Color: base2                #eee8d5                254       7
+Color: base03               #002b36                235       8
+Color: back                 #002b36                235       8
+Color: orange               #cb4b16                166       9
+Color: base01               #586e75                242      10
+Color: base00               #657b83                66       11
+Color: base0                #839496                246      12
+Color: violet               #6c71c4                61       13
+Color: base1                #93a1a1                247      14
+Color: base3                #fdf6e3                230      15
+
+Include: _dark_terminal.colortemplate
 # }}}
-
+# Default highlight groups (dark) {{{
-# Terminal colors {{{
+# Transparency (dark) {{{
-Include: _terminal_ansi_colors_dark.colortemplate
+#if s:termtrans
-Include: _neovim_dark.colortemplate
-# }}}
-
-# Default highlight groups {{{
-verbatim
-if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0)
-endverbatim
-
-  # Transparent background
   Normal             base0             none
+  CursorLine         none              none              underline s=base01
   Terminal           fg                none
-
+  ToolbarButton      base1             none              bold
-verbatim
+  ToolbarLine        none              none
-else
+#else " opaque
-endverbatim
-
-  # Opaque background
   Normal             base0             back
+  CursorLine         none              base03
   Terminal           fg                back
-
+  ToolbarButton      base1             base02            bold
-verbatim
+  ToolbarLine        none              base02
-endif
+#endif
-endverbatim
+# }}}
-
+# Visibility (dark) {{{
-ColorColumn          none              base02
+#if get(g:, '@optionprefix_visibility', '') ==# 'high'
-Conceal              blue              none
-
-# Cursor style ==============================================================
-verbatim
-if get(g:, '@optionprefix_old_cursor_style', 0)
-endverbatim
-Cursor               base03            base0
-verbatim
-else
-endverbatim
-Cursor               base3             blue
-verbatim
-endif
-endverbatim
-# ---------------------------------------------------------------------------
-
-CursorColumn         none              base02
-CursorLine           none              base03            underline s=base01
-
-# Visibility ================================================================
-verbatim
-if get(g:, "@optionprefix_visibility", "") == "high"
-endverbatim
   CursorLineNr       orange            none              bold
   NonText            orange            none              bold
   SpecialKey         orange            none              reverse
@@ -98,9 +98,7 @@ SpellCap             violet            base2             t=underline,reverse g=u
   SpellLocal         yellow            base2             t=underline,reverse g=undercurl,reverse s=red
   SpellRare          cyan              base2             t=underline,reverse g=undercurl,reverse s=red
   Title              yellow            none              bold
-verbatim
+#elseif get(g:, '@optionprefix_visibility', '') ==# 'low'
-elseif get(g:, "@optionprefix_visibility", "") == "low"
-endverbatim
   CursorLineNr       base01            none              bold
   NonText            base02            none              bold
   SpecialKey         base02            none              reverse
@@ -109,9 +107,7 @@ SpellCap             violet            none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              base01            none              bold
-verbatim
+#else " normal visibility
-else
-endverbatim
   CursorLineNr       base0             none              bold
   NonText            base00            none              bold
   SpecialKey         base00            base02            bold
@@ -120,36 +116,50 @@ SpellCap             violet            none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              yellow            none              bold
-verbatim
+#endif
-endif
+# }}}
-endverbatim
+# Cursor style (dark) {{{
-# ---------------------------------------------------------------------------
+#if get(g:, '@optionprefix_old_cursor_style', 0)
-
+  Cursor             base03            base0
-# Diff mode =================================================================
+#else
-verbatim
+  Cursor             base3             blue
-if get(g:, "@optionprefix_diffmode", "") == "high"
+#endif
-endverbatim
+# }}}
+# Diff mode (dark) {{{
+#if get(g:, '@optionprefix_diffmode', '') ==# 'high'
   DiffAdd            green             none              reverse
   DiffChange         yellow            none              reverse
   DiffDelete         red               none              reverse
   DiffText           blue              none              reverse
-verbatim
+#elseif get(g:, '@optionprefix_diffmode', '') ==# 'low'
-elseif get(g:, "@optionprefix_diffmode", "") == "low"
-endverbatim
   DiffAdd            green             none              s=green
   DiffChange         yellow            none              s=yellow
   DiffDelete         red               none              bold
   DiffText           blue              none              s=blue
-verbatim
+#else " normal diff
-else
-endverbatim
   DiffAdd            green             base02            s=green
   DiffChange         yellow            base02            s=yellow
   DiffDelete         red               base02            bold
   DiffText           blue              base02            s=blue
-verbatim
+#endif
-endif
+# }}}
-endverbatim
+# Structural elements (dark) {{{
+#if get(g:, '@optionprefix_statusline', '') ==# 'low'
+  StatusLine         base02            base1             bold,reverse
+  StatusLineNC       base02            base01            reverse
+  TabLineSel         base1             base02
+  NormalMode         base02            base1             bold,reverse
+#else
+  StatusLine         base02            base2             reverse
+  StatusLineNC       base02            base1             reverse
+  TabLineSel         base2             base02
+  NormalMode         base02            base2             reverse
+#endif
+# }}}
+# Base groups (dark) {{{
+ColorColumn          none              base02
+Conceal              blue              none
+CursorColumn         none              base02
 Directory            blue              none
 EndOfBuffer          none              none
 ErrorMsg             red               base3             reverse
@@ -165,151 +175,94 @@ PmenuSbar            none              base02
 PmenuSel             base2             base01
 PmenuThumb           none              base01
 Question             cyan              none              bold
-QuickFixLine     ->  Search
 Search               yellow            none              reverse
 SignColumn           base0             none
-verbatim
-if get(g:, "@optionprefix_statusline", "") == "low"
-endverbatim
-StatusLine           base02            base1             bold,reverse
-StatusLineNC         base02            base01            reverse
-TabLineSel           base1             base02
-NormalMode           base02            base1             bold,reverse
-verbatim
-else
-endverbatim
-StatusLine           base02            base2             reverse
-StatusLineNC         base02            base1             reverse
-TabLineSel           base2             base02
-NormalMode           base02            base2             reverse
-verbatim
-endif
-endverbatim
 TabLine              base01            base02
 TabLineFill          base01            base02
-InsertMode           base02            cyan              bold,reverse
-ReplaceMode          base02            orange            bold,reverse
-VisualMode           base02            magenta           bold,reverse
-CommandMode          base02            magenta           bold,reverse
-StatusLineTerm    -> StatusLine
-StatusLineTermNC  -> StatusLineNC
 VertSplit            base01            base02
 Visual               base01            base03            reverse
 VisualNOS            none              base02            reverse
 WarningMsg           orange            none              bold
 WildMenu             base00            base2             reverse
-# Other conventional group names (see `:help group-name`)
+# }}}
-Boolean           -> Constant
+# Other conventional groups {{{
-Character         -> Constant
+Comment              base01            none              italic
-Comment              base01            none              g=italic
-Conditional       -> Statement
 Constant             cyan              none
-Define            -> PreProc
+CursorIM             none              fg
-Debug             -> Special
-Delimiter         -> Special
 Error                red               base3             bold,reverse
-Exception         -> Statement
-Float             -> Constant
-Function          -> Identifier
 Identifier           blue              none
 Ignore               none              none
-Include           -> PreProc
-Keyword           -> Statement
-Label             -> Statement
-Macro             -> PreProc
-Number            -> Constant
-Operator          -> Statement
-PreCondit         -> PreProc
 PreProc              orange            none
-Repeat            -> Statement
 Special              orange            none
-SpecialChar       -> Special
-SpecialComment    -> Special
 Statement            green             none
-StorageClass      -> Type
-String            -> Constant
-Structure         -> Type
-Tag               -> Special
 Todo                 magenta           none              bold
 Type                 yellow            none
-Typedef           -> Type
 Underlined           violet            none
-# See `:help lCursor`
-lCursor           -> Cursor
-# See `:help CursorIM`
-CursorIM             none              fg
-# See `:help window-toolbar`
-ToolbarLine          none              base02
-ToolbarButton        base1             base02            bold
 # }}}
-
+# }}}
-# Extra stuff {{{
+# Additional highlight groups (dark) {{{
+# Normal is defined in the "Structural elements" section
+InsertMode           base02            cyan              bold,reverse
+ReplaceMode          base02            orange            bold,reverse
+VisualMode           base02            magenta           bold,reverse
+CommandMode          base02            magenta           bold,reverse
+# }}}
+# Neovim (dark) {{{
+TermCursor        -> Cursor
+TermCursorNC         base03            base01
+# }}}
+# Extra stuff (light) {{{
 Include: _extra.colortemplate
 # }}}
+#unlet s:termtrans
 
 Background: light
-
+# Light color palette {{{
-# Color palette {{{
+# Color name                GUI                  Base256    Base16
-# Color name                GUI                  Base256    Base16 (optional)
+Color: base2                #073642                236       0
-Color: base3                #002b36                ~        8
+Color: red                  #dc322f                160       1
-Color: base2                #073642                ~        0
+Color: green                #859900                106       2
-Color: base1                #586e75                ~        10
-Color: base0                #657b83                ~        11
-Color: base00               #839496                ~        12
-Color: base01               #93a1a1                ~        14
-Color: base02               #eee8d5                ~        7
-Color: base03               #fdf6e3                ~        15
-Color: yellow               #b58900                ~        3
-Color: orange               #cb4b16                ~        9
-Color: red                  #dc322f                ~        1
-Color: magenta              #d33682                ~        5
-Color: violet               #6c71c4                ~        13
-Color: blue                 #268bd2                ~        4
-Color: cyan                 #2aa198                ~        6
-Color: green                #859900                ~        2
 #Color:green                #719e07                ~         2
-Color: back                 #fdf6e3                ~        15
+Color: yellow               #b58900                136       3
+Color: blue                 #268bd2                32        4
+Color: magenta              #d33682                162       5
+Color: cyan                 #2aa198                37        6
+Color: base02               #eee8d5                254       7
+Color: base3                #002b36                235       8
+Color: orange               #cb4b16                166       9
+Color: base1                #586e75                242      10
+Color: base0                #657b83                66       11
+Color: base00               #839496                246      12
+Color: violet               #6c71c4                61       13
+Color: base01               #93a1a1                247      14
+Color: base03               #fdf6e3                230      15
+Color: back                 #fdf6e3                230      15
+
+Include: _light_terminal.colortemplate
 # }}}
-
+# Default highlight groups (light) {{{
-# Terminal colors {{{
+# Transparency (light) {{{
-Include: _terminal_ansi_colors_light.colortemplate
+#if s:termtrans
-Include: _neovim_light.colortemplate
-# }}}
-
-# Default highlight groups {{{
-verbatim
-if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0)
-endverbatim
-
-  # Transparent background
   Normal             base0             none
+  CursorLine         none              none              underline s=base01
   Terminal           fg                none
-
+  ToolbarButton      base1             none              bold
-verbatim
+  ToolbarLine        none              none
-else
+#else " opaque
-endverbatim
-
-  # Opaque background
   Normal             base0             back
+  CursorLine         none              base03
   Terminal           fg                back
-
+  ToolbarButton      base1             base02            bold
-verbatim
+  ToolbarLine        none              base02
-endif
+#endif
-endverbatim
+# }}}
-
+# Visibility and cursor style (light) {{{
-# Visibility ================================================================
+#if get(g:, '@optionprefix_visibility', '') ==# 'high'
-verbatim
+  #if get(g:, '@optionprefix_old_cursor_style', 0)
-if get(g:, "@optionprefix_visibility", "") == "high"
-if get(g:, '@optionprefix_old_cursor_style', 0)
-endverbatim
     Cursor           base03            base0
-verbatim
+  #else
-else
-endverbatim
     Cursor           base03            red
-verbatim
+  #endif
-endif
-endverbatim
   CursorLineNr       red               none              bold
   MatchParen         orange            base02            bold,underline
   NonText            red               none              bold
@@ -319,18 +272,12 @@ SpellCap             violet            base02            t=underline,reverse g=u
   SpellLocal         yellow            base02            t=underline,reverse g=undercurl,reverse s=orange
   SpellRare          cyan              base02            t=underline,reverse g=undercurl,reverse s=orange
   Title              orange            none              bold
-verbatim
+#elseif get(g:, '@optionprefix_visibility', '') ==# 'low'
-elseif get(g:, "@optionprefix_visibility", "") == "low"
+  #if get(g:, '@optionprefix_old_cursor_style', 0)
-if get(g:, '@optionprefix_old_cursor_style', 0)
-endverbatim
     Cursor           base03            base0
-verbatim
+  #else
-else
-endverbatim
     Cursor           base03            orange
-verbatim
+  #endif
-endif
-endverbatim
   CursorLineNr       base01            none              bold
   MatchParen         orange            base02            bold
   NonText            base02            none              bold
@@ -340,19 +287,12 @@ SpellCap             violet            none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              base01            none              bold
-# Normal visibility
+#else " normal visibility
-verbatim
+  #if get(g:, 'solarized_old_cursor_style', 0)
-else
-if get(g:, 'solarized_old_cursor_style', 0)
-endverbatim
     Cursor           base03            base0
-verbatim
+  #else
-else
-endverbatim
     Cursor           base03            orange
-verbatim
+  #endif
-endif
-endverbatim
   CursorLineNr       base0             none              bold
   MatchParen         base3             base02            bold
   NonText            base00            none              bold
@@ -362,41 +302,43 @@ SpellCap             violet            none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              orange            none              bold
-verbatim
+#endif
-endif
+# }}}
-endverbatim
+# Diff mode (light) {{{
-# ---------------------------------------------------------------------------
+#if get(g:, '@optionprefix_diffmode', '') ==# 'high'
-
-ColorColumn          none              base02
-Conceal              blue              none
-CursorColumn         none              base02
-CursorLine           none              base03            underline s=base01
-
-# Diff mode =================================================================
-verbatim
-if get(g:, "@optionprefix_diffmode", "") == "high"
-endverbatim
   DiffAdd            green             none              reverse
   DiffChange         yellow            none              reverse
   DiffDelete         red               none              reverse
   DiffText           blue              none              reverse
-verbatim
+#elseif get(g:, '@optionprefix_diffmode', '') ==# 'low'
-elseif get(g:, "@optionprefix_diffmode", "") == "low"
-endverbatim
   DiffAdd            green             none              s=green
   DiffChange         yellow            none              s=yellow
   DiffDelete         red               none              bold
   DiffText           blue              none              s=blue
-verbatim
+#else
-else
-endverbatim
   DiffAdd            green             base02            s=green
   DiffChange         yellow            base02            s=yellow
   DiffDelete         red               base02            bold
   DiffText           blue              base02            s=blue
-verbatim
+#endif
-endif
+# }}}
-endverbatim
+# Structural elements (light) {{{
+#if get(g:, '@optionprefix_statusline', '') ==# 'low'
+  StatusLine         base02            base1             bold,reverse
+  StatusLineNC       base02            base01            reverse
+  TabLineSel         base1             base02
+  NormalMode         base02            base1             bold,reverse
+#else
+  StatusLine         base02            base2             reverse
+  StatusLineNC       base02            base1             reverse
+  TabLineSel         base2             base02
+  NormalMode         base02            base2             reverse
+#endif
+# }}}
+# Base groups (light) {{{
+ColorColumn          none              base02
+Conceal              blue              none
+CursorColumn         none              base02
 Directory            blue              none
 EndOfBuffer          none              none
 ErrorMsg             red               base03            reverse
@@ -411,86 +353,50 @@ PmenuSbar            none              base02
 PmenuSel             base03            base01
 PmenuThumb           none              base01
 Question             cyan              none              bold
-QuickFixLine     ->  Search
 Search               yellow            none              reverse
 SignColumn           base0             none
-verbatim
-if get(g:, "@optionprefix_statusline", "") == "low"
-endverbatim
-StatusLine           base02            base1             bold,reverse
-StatusLineNC         base02            base01            reverse
-TabLineSel           base1             base02
-NormalMode           base02            base1             bold,reverse
-verbatim
-else
-endverbatim
-StatusLine           base02            base2             reverse
-StatusLineNC         base02            base1             reverse
-TabLineSel           base2             base02
-NormalMode           base02            base2             reverse
-verbatim
-endif
-endverbatim
 TabLine              base01            base02
 TabLineFill          base01            base02
-InsertMode           base02            cyan              bold,reverse
-ReplaceMode          base02            orange            bold,reverse
-VisualMode           base02            magenta           bold,reverse
-CommandMode          base02            magenta           bold,reverse
-
-StatusLineTerm    -> StatusLine
-StatusLineTermNC  -> StatusLineNC
 VertSplit            base01            base02
 Visual               base01            base03            reverse
 VisualNOS            none              base02            reverse
 WarningMsg           orange            none              bold
 WildMenu             base01            base03            reverse
-# Other conventional group names (see `:help group-name`)
+# }}}
-Boolean           -> Constant
+# Other conventional groups {{{
-Character         -> Constant
+Comment              base01            none              italic
-Comment              base01            none              g=italic
-Conditional       -> Statement
 Constant             cyan              none
-Define            -> PreProc
+CursorIM             none              fg
-Debug             -> Special
-Delimiter         -> Special
 Error                red               base03            bold,reverse
-Exception         -> Statement
-Float             -> Constant
-Function          -> Identifier
 Identifier           blue              none
 Ignore               none              none
-Include           -> PreProc
-Keyword           -> Statement
-Label             -> Statement
-Macro             -> PreProc
-Number            -> Constant
-Operator          -> Statement
-PreCondit         -> PreProc
 PreProc              orange            none
-Repeat            -> Statement
 Special              orange            none
-SpecialChar       -> Special
-SpecialComment    -> Special
 Statement            green             none
-StorageClass      -> Type
-String            -> Constant
-Structure         -> Type
-Tag               -> Special
 Todo                 magenta           none              bold
 Type                 yellow            none
-Typedef           -> Type
 Underlined           violet            none
-# See `:help lCursor`
-lCursor           -> Cursor
-# See `:help CursorIM`
-CursorIM             none              fg
-# See `:help window-toolbar`
-ToolbarLine          none              base02
-ToolbarButton        base1             base02            bold
 # }}}
-
+# }}}
-# Extra stuff {{{
+# Additional highlight groups (light) {{{
+# Normal is defined in the "Structural elements" section
+InsertMode           base02            cyan              bold,reverse
+ReplaceMode          base02            orange            bold,reverse
+VisualMode           base02            magenta           bold,reverse
+CommandMode          base02            magenta           bold,reverse
+# }}}
+# Neovim (light) {{{
+TermCursor        -> Cursor
+TermCursorNC         base03            base01
+# }}}
+# Extra stuff (light) {{{
 Include: _extra.colortemplate
 # }}}
+#unlet s:termtrans
+
+Background: any
+# B&W variant {{{
+Include: _bw.colortemplate
+# }}}
+#unlet s:termtrans
 

templates/solarized8_high.colortemplate

@@ -7,78 +7,89 @@ Author:          Ethan Schoonover
 Maintainer:      Lifepillar <lifepillar@lifepillar.me>
 Website:         https://github.com/lifepillar/vim-solarized8
 Description:     Precision colors for machines and people
-Terminal Colors: 256, 16
 Option Prefix:   solarized
 License:         OSI approved MIT license
 # }}}
 
-# Documentation {{{
+#let s:italics = s:italics && get(g:, '@optionprefix_italics', 1)
-Include: _help.colortemplate
+#let s:termtrans = get(g:, '@optionprefix_termtrans', 0) && !has('gui_running')
+
+# Common linked groups {{{
+QuickFixLine      -> Search
+StatusLineTerm    -> StatusLine
+StatusLineTermNC  -> StatusLineNC
+Boolean           -> Constant
+Character         -> Constant
+Conditional       -> Statement
+Define            -> PreProc
+Debug             -> Special
+Delimiter         -> Special
+Exception         -> Statement
+Float             -> Constant
+Function          -> Identifier
+Include           -> PreProc
+Keyword           -> Statement
+Label             -> Statement
+Macro             -> PreProc
+Number            -> Constant
+Operator          -> Statement
+PreCondit         -> PreProc
+Repeat            -> Statement
+SpecialChar       -> Special
+SpecialComment    -> Special
+StorageClass      -> Type
+String            -> Constant
+Structure         -> Type
+Tag               -> Special
+Typedef           -> Type
+lCursor           -> Cursor
 # }}}
 
+Variant: gui 256 16
+
 Background: dark
-
+# Dark color palette {{{
-# Color palette {{{
+# Color name                GUI                  Base256    Base16
-# Color name                GUI                  Base256    Base16 (optional)
+Color: base02               #073642                236       0
-Color: base03               #002b36                ~        8
+Color: red                  #dc322f                160       1
-Color: base02               #073642                ~        0
+Color: green                #859900                106       2
-Color: base01               #657b83                243      11
-Color: base00               #839496                ~        12
-Color: base0                #93a1a1                ~        14
-Color: base1                #eee8d5                ~        7
-Color: base2                #fdf6e3                ~        15
-Color: base3                #fdf6e3                ~        15
-Color: yellow               #b58900                ~        3
-Color: orange               #cb4b16                ~        9
-Color: red                  #dc322f                ~        1
-Color: magenta              #d33682                ~        5
-Color: violet               #6c71c4                ~        13
-Color: blue                 #268bd2                ~        4
-Color: cyan                 #2aa198                ~        6
-Color: green                #859900                ~        2
 #Color:green                #719e07                ~         2
-Color: back                 #002b36                ~        8
+Color: yellow               #b58900                136       3
+Color: blue                 #268bd2                32        4
+Color: magenta              #d33682                162       5
+Color: cyan                 #2aa198                37        6
+Color: base1                #eee8d5                254       7
+Color: base03               #002b36                235       8
+Color: back                 #002b36                235       8
+Color: orange               #cb4b16                166       9
+Color: base01               #657b83                243      11
+Color: base00               #839496                246      12
+Color: violet               #6c71c4                61       13
+Color: base0                #93a1a1                247      14
+Color: base2                #fdf6e3                230      15
+Color: base3                #fdf6e3                230      15
+
+Include: _dark_terminal.colortemplate
 # }}}
-
+# Default highlight groups (dark) {{{
-# Terminal colors {{{
+# Transparency (dark) {{{
-Include: _terminal_ansi_colors_dark.colortemplate
+#if s:termtrans
-Include: _neovim_dark.colortemplate
-# }}}
-
-# Default highlight groups {{{
-verbatim
-if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0)
-endverbatim
-
-  # Transparent background
   Normal             base1             none
   FoldColumn         fg                none
   Folded             fg                none             bold s=base03
   LineNr             base01            none
   Terminal           fg                none
-
+#else
-verbatim
-hi CursorLineNr ctermbg=NONE guifg=NONE
-else
-endverbatim
-
-  # Opaque background
   Normal             base1             back
   FoldColumn         base0             base02
   Folded             base0             base02           bold s=base03
   LineNr             base01            base02
   Terminal           fg                back
-
+#endif
-verbatim
+# }}}
-hi CursorLineNr ctermbg=@base02 guibg=@base02
+# Visibility (dark) {{{
-endif
+#if get(g:, '@optionprefix_visibility', '') ==# 'high'
-endverbatim
+  CursorLineNr       orange            base02            bold
-
-# Visibility ================================================================
-verbatim
-if get(g:, "@optionprefix_visibility", "") == "high"
-hi CursorLineNr ctermfg=@orange guifg=@orange cterm=bold gui=bold
-endverbatim
   NonText            orange            none              bold
   SpecialKey         orange            none              reverse
   SpellBad           violet            base3             t=underline,reverse g=undercurl,reverse s=red
@@ -86,10 +97,8 @@ SpellCap             violet            base3             t=underline,reverse g=u
   SpellLocal         yellow            base3             t=underline,reverse g=undercurl,reverse s=red
   SpellRare          cyan              base3             t=underline,reverse g=undercurl,reverse s=red
   Title              yellow            none              bold
-verbatim
+#elseif get(g:, '@optionprefix_visibility', '') ==# 'low'
-elseif get(g:, "@optionprefix_visibility", "") == "low"
+  CursorLineNr       base01            base02            bold
-hi CursorLineNr ctermfg=@base01 guifg=@base01 cterm=bold gui=bold
-endverbatim
   NonText            base02            none              bold
   SpecialKey         base02            none              reverse
   SpellBad           violet            none              t=underline g=undercurl s=orange
@@ -97,10 +106,8 @@ SpellCap             violet            none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              base01            none              bold
-verbatim
+#else " normal visibility
-else
+  CursorLineNr       base0             base02            bold
-hi CursorLineNr ctermfg=@base0 guifg=@base0 cterm=bold gui=bold
-endverbatim
   NonText            base00            none              bold
   SpecialKey         base00            base02            bold
   SpellBad           violet            none              t=underline g=undercurl s=orange
@@ -108,56 +115,77 @@ SpellCap             violet            none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              yellow            none              bold
+#endif
+# }}}
+# CursorLineNr transparency (dark) {{{
+Variant: gui
 verbatim
+if s:termtrans
+  hi CursorLineNr guibg=NONE
 endif
 endverbatim
-# ---------------------------------------------------------------------------
+Variant: 256 16
-
-ColorColumn          none              base02
-Conceal              blue              none
-
-# Cursor style ==============================================================
 verbatim
-if get(g:, '@optionprefix_old_cursor_style', 0)
+if s:termtrans
+  hi CursorLineNr ctermbg=NONE
+endif
 endverbatim
+Variant: gui 256 16
+# }}}
+# Cursor style (dark) {{{
+#if get(g:, '@optionprefix_old_cursor_style', 0)
   Cursor             base03            base0
-verbatim
+#else
-else
-endverbatim
   Cursor             base3             blue
-verbatim
+#endif
-endif
+# }}}
-endverbatim
+# Diff mode (dark) {{{
-# ---------------------------------------------------------------------------
+#if get(g:, '@optionprefix_diffmode', '') ==# 'high'
-
-CursorColumn         none              base02
-CursorLine           none              base02            s=base1
-
-# Diff mode =================================================================
-verbatim
-if get(g:, "@optionprefix_diffmode", "") == "high"
-endverbatim
   DiffAdd            green             none              reverse
   DiffChange         yellow            none              reverse
   DiffDelete         red               none              reverse
   DiffText           blue              none              reverse
-verbatim
+#elseif get(g:, '@optionprefix_diffmode', '') ==# 'low'
-elseif get(g:, "@optionprefix_diffmode", "") == "low"
-endverbatim
   DiffAdd            green             none              s=green
   DiffChange         yellow            none              s=yellow
   DiffDelete         red               none              bold
   DiffText           blue              none              s=blue
-verbatim
+#else
-else
-endverbatim
   DiffAdd            green             base02            s=green
   DiffChange         yellow            base02            s=yellow
   DiffDelete         red               base02            bold
   DiffText           blue              base02            s=blue
-verbatim
+#endif
-endif
+# }}}
-endverbatim
+# Structural elements (dark) {{{
+#if get(g:, '@optionprefix_statusline', '') ==# 'low'
+  StatusLine         base01            base2             reverse
+  StatusLineNC       base01            base02            reverse
+  TabLine            base01            base02            reverse
+  TabLineFill        base01            base02            reverse
+  TabLineSel         base0             base3             reverse
+  VertSplit          base02            base01
+#elseif get(g:, '@optionprefix_statusline', '') ==# 'flat'
+  StatusLine         base02            base2             reverse
+  StatusLineNC       base02            base1             reverse
+  TabLineSel         base2             base02
+  TabLine            base01            base02
+  TabLineFill        base01            base02
+  VertSplit          base01            base02
+#else
+  StatusLine         base0             base02            reverse
+  StatusLineNC       base01            base02            reverse
+  TabLine            base01            base02            reverse
+  TabLineFill        base01            base02            reverse
+  TabLineSel         base0             base02            reverse
+  VertSplit          base02            base01
+#endif
+# }}}
+# Base groups (dark) {{{
+ColorColumn          none              base02
+Conceal              blue              none
+CursorColumn         none              base02
+CursorLine           none              base02            s=base1
 Directory            blue              none
 EndOfBuffer          none              none
 ErrorMsg             red               base3             reverse
@@ -170,175 +198,97 @@ PmenuSbar            none              base0
 PmenuSel             base2             base01
 PmenuThumb           none              base01
 Question             cyan              none              bold
-QuickFixLine     ->  Search
 Search               yellow            none              reverse
 SignColumn           base0             none
-verbatim
-if get(g:, "@optionprefix_statusline", "") == "low"
-endverbatim
-StatusLine           base01            base2             reverse
-StatusLineNC         base01            base02            reverse
-TabLine              base01            base02            reverse
-TabLineFill          base01            base02            reverse
-TabLineSel           base0             base3             reverse
-VertSplit            base02            base01
-verbatim
-elseif get(g:, "@optionprefix_statusline", "") == "flat"
-endverbatim
-StatusLine           base02            base2             reverse
-StatusLineNC         base02            base1             reverse
-TabLineSel           base2             base02
-TabLine              base01            base02
-TabLineFill          base01            base02
-VertSplit            base01            base02
-verbatim
-else
-endverbatim
-StatusLine           base0             base02            reverse
-StatusLineNC         base01            base02            reverse
-TabLine              base01            base02            reverse
-TabLineFill          base01            base02            reverse
-TabLineSel           base0             base02            reverse
-VertSplit            base02            base01
-verbatim
-endif
-endverbatim
-StatusLineTerm    -> StatusLine
-StatusLineTermNC  -> StatusLineNC
 Visual               base01            base03            reverse
 VisualNOS            none              base02            reverse
 WarningMsg           orange            none              bold
 WildMenu             base2             base02            reverse
-# Other conventional group names (see `:help group-name`)
+# }}}
-Boolean           -> Constant
+# Other conventional groups (dark) {{{
-Character         -> Constant
+Comment              base00            none              italic
-Comment              base00            none              g=italic
-Conditional       -> Statement
 Constant             cyan              none
-Define            -> PreProc
-Debug             -> Special
-Delimiter         -> Special
 Error                red               base3             bold,reverse
-Exception         -> Statement
-Float             -> Constant
-Function          -> Identifier
 Identifier           blue              none
 Ignore               none              none
-Include           -> PreProc
-Keyword           -> Statement
-Label             -> Statement
-Macro             -> PreProc
-Number            -> Constant
-Operator          -> Statement
-PreCondit         -> PreProc
 PreProc              orange            none
-Repeat            -> Statement
 Special              orange            none
-SpecialChar       -> Special
-SpecialComment    -> Special
 Statement            green             none
-StorageClass      -> Type
-String            -> Constant
-Structure         -> Type
-Tag               -> Special
 Todo                 magenta           none              bold
 Type                 yellow            none
-Typedef           -> Type
 Underlined           violet            none
 # See `:help lCursor`
-lCursor           -> Cursor
 # See `:help CursorIM`
 CursorIM             none              fg
 # See `:help window-toolbar`
 ToolbarLine          none              base02
 ToolbarButton        base1             base02            bold
 # }}}
-
+# }}}
-# Additional highlight groups {{{
+# Additional highlight groups (dark) {{{
 NormalMode           base0             base3             reverse
 InsertMode           cyan              base3             reverse
 ReplaceMode          orange            base3             reverse
 VisualMode           magenta           base3             reverse
 CommandMode          magenta           base3             reverse
 # }}}
-
+# Neovim (dark) {{{
-# Extra stuff {{{
+TermCursor        -> Cursor
+TermCursorNC         base03            base01
+# }}}
+# Extra stuff (dark) {{{
 Include: _extra.colortemplate
 # }}}
+#unlet s:termtrans
 
 Background: light
-
+# Light color palette {{{
-# Color palette {{{
 # Color name                GUI                  Base256    Base16 (optional)
-Color: base3                #002b36                ~        8
-Color: base2                #002b36                ~        8
 Color: base1                #073642                ~        0
-Color: base0                #586e75                ~        10
-Color: base00               #657b83                ~        11
-Color: base01               #93a1a1                ~        14
-Color: base02               #eee8d5                ~        7
-Color: base03               #fdf6e3                ~        15
-Color: yellow               #b58900                ~        3
-Color: orange               #cb4b16                ~        9
 Color: red                  #dc322f                ~        1
-Color: magenta              #d33682                ~        5
-Color: violet               #6c71c4                ~        13
-Color: blue                 #268bd2                ~        4
-Color: cyan                 #2aa198                ~        6
 Color: green                #859900                ~        2
 #Color:green                #719e07                ~        2
+Color: yellow               #b58900                ~        3
+Color: blue                 #268bd2                ~        4
+Color: magenta              #d33682                ~        5
+Color: cyan                 #2aa198                ~        6
+Color: base02               #eee8d5                ~        7
+Color: base3                #002b36                ~        8
+Color: base2                #002b36                ~        8
+Color: orange               #cb4b16                ~        9
+Color: base0                #586e75                ~        10
+Color: base00               #657b83                ~        11
+Color: violet               #6c71c4                ~        13
+Color: base01               #93a1a1                ~        14
+Color: base03               #fdf6e3                ~        15
 Color: back                 #fdf6e3                ~        15
+
+Include: _light_terminal.colortemplate
 # }}}
-
+# Default highlight groups (light) {{{
-# Terminal colors {{{
+# Transparency (light) {{{
-Include: _terminal_ansi_colors_light.colortemplate
+#if s:termtrans
-Include: _neovim_light.colortemplate
-# }}}
-
-# Default highlight groups {{{
-verbatim
-if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0)
-endverbatim
-
-  # Transparent background
   Normal             base1             none
   FoldColumn         base0             none
   Folded             base0             none              bold s=base03
   LineNr             base01            none
   Terminal           fg                none
-
+#else
-verbatim
-hi CursorLineNr ctermbg=NONE guifg=NONE
-else
-endverbatim
-
-  # Opaque background
   Normal            base1             back
   FoldColumn        base0             base02
   Folded            base0             base02            bold s=base03
   LineNr            base01            base02
   Terminal          fg                back
-
+#endif
-verbatim
+# }}}
-hi CursorLineNr ctermbg=@base02 guibg=@base02
+# Visibility and cursor style (light) {{{
-endif
+#if get(g:, '@optionprefix_visibility', '') ==# 'high'
-endverbatim
+  CursorLineNr       red               base02           bold
-
+  #if get(g:, '@optionprefix_old_cursor_style', 0)
-# Visibility and cursor style ===============================================
-# High visibiity
-verbatim
-if get(g:, "@optionprefix_visibility", "") == "high"
-hi CursorLineNr ctermfg=@red guifg=@red cterm=bold gui=bold
-if get(g:, '@optionprefix_old_cursor_style', 0)
-endverbatim
     Cursor           base03            base0
-verbatim
+  #else
-else
-endverbatim
     Cursor           base03            red
-verbatim
+  #endif
-endif
-endverbatim
   MatchParen         base03            base00            bold
   NonText            red               none              bold
   SpecialKey         red               none              reverse
@@ -347,20 +297,13 @@ SpellCap             magenta           base03            t=underline,reverse g=u
   SpellLocal         yellow            base03            t=underline,reverse g=undercurl,reverse s=orange
   SpellRare          cyan              base03            t=underline,reverse g=undercurl,reverse s=orange
   Title              orange            none              bold
-# Low visibility
+#elseif get(g:, '@optionprefix_visibility', '') ==# 'low'
-verbatim
+  CursorLineNr       base01            base02            bold
-elseif get(g:, "@optionprefix_visibility", "") == "low"
+  #if get(g:, '@optionprefix_old_cursor_style', 0)
-hi CursorLineNr ctermfg=@base01 guifg=@base01 cterm=bold gui=bold
-if get(g:, '@optionprefix_old_cursor_style', 0)
-endverbatim
     Cursor           base03            base0
-verbatim
+  #else
-else
-endverbatim
     Cursor           base03            orange
-verbatim
+  #endif
-endif
-endverbatim
   MatchParen         red               base02            bold,underline
   NonText            base02            none              bold
   SpecialKey         base02            none              bold
@@ -369,20 +312,13 @@ SpellCap             magenta           none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              base01            none              bold
-# Normal visibility
+#else
-verbatim
+  CursorLineNr       base0             base02            bold
-else
+  #if get(g:, 'solarized_old_cursor_style', 0)
-hi CursorLineNr ctermfg=@base0 guifg=@base0 cterm=bold gui=bold
-if get(g:, 'solarized_old_cursor_style', 0)
-endverbatim
     Cursor           base03            base0
-verbatim
+  #else
-else
-endverbatim
     Cursor           base03            orange
-verbatim
+  #endif
-endif
-endverbatim
   MatchParen         red               base02            bold,underline
   NonText            base00            none              bold
   SpecialKey         base00            base02            bold
@@ -391,41 +327,73 @@ SpellCap             magenta           none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              orange            none              bold
+#endif
+# }}}
+# CursorLineNr transparency (light) {{{
+Variant: gui
 verbatim
+if s:termtrans
+  hi CursorLineNr guibg=NONE
 endif
 endverbatim
-# ---------------------------------------------------------------------------
+Variant: 256 16
-
-ColorColumn          none              base02
-Conceal              blue              none
-CursorColumn         none              base02
-CursorLine           none              base02            s=base1
-
-# Diff mode =================================================================
 verbatim
-if get(g:, "@optionprefix_diffmode", "") == "high"
+if s:termtrans
+  hi CursorLineNr ctermbg=NONE
+endif
 endverbatim
+Variant: gui 256 16
+# }}}
+# Diff mode (light) {{{
+#if get(g:, '@optionprefix_diffmode', '') ==# 'high'
   DiffAdd            green             none              reverse
   DiffChange         yellow            none              reverse
   DiffDelete         red               none              reverse
   DiffText           blue              none              reverse
-verbatim
+#elseif get(g:, '@optionprefix_diffmode', '') ==# 'low'
-elseif get(g:, "@optionprefix_diffmode", "") == "low"
-endverbatim
   DiffAdd            green             none              s=green
   DiffChange         yellow            none              s=yellow
   DiffDelete         red               none              bold
   DiffText           blue              none              s=blue
-verbatim
+#else
-else
-endverbatim
   DiffAdd            green             base02            s=green
   DiffChange         yellow            base02            s=yellow
   DiffDelete         red               base02            bold
   DiffText           blue              base02            s=blue
-verbatim
+#endif
-endif
+# }}}
-endverbatim
+# Structural elements (light) {{{
+#if get(g:, '@optionprefix_statusline', '') ==# 'low'
+  StatusLine         base01            base03            reverse
+  StatusLineNC       base01            base1             reverse
+  TabLine            base01            base1             reverse
+  TabLineFill        base01            base1             reverse
+  TabLineSel         base1             base03            reverse
+  VertSplit          base1             base01
+  WildMenu           base1             base03            reverse
+#elseif get(g:, '@optionprefix_statusline', '') ==# 'flat'
+  StatusLine         base02            base2             reverse
+  StatusLineNC       base02            base1             reverse
+  TabLineSel         base2             base02
+  TabLine            base01            base02
+  TabLineFill        base01            base02
+  VertSplit          base01            base02
+  WildMenu           base0             base03            reverse
+#else
+  StatusLine         base1             base02            reverse
+  StatusLineNC       base00            base02            reverse
+  TabLine            base00            base02            reverse
+  TabLineFill        base00            base02            reverse
+  TabLineSel         base1             base02            reverse
+  VertSplit          base1             base01
+  WildMenu           base00            base03            reverse
+#endif
+# }}}
+# Base groups (light) {{{
+ColorColumn          none              base02
+Conceal              blue              none
+CursorColumn         none              base02
+CursorLine           none              base02            s=base1
 Directory            blue              none
 EndOfBuffer          none              none
 ErrorMsg             red               base03            reverse
@@ -437,101 +405,48 @@ PmenuSbar            none              base1
 PmenuSel             base2             base01
 PmenuThumb           none              base00
 Question             cyan              none              bold
-QuickFixLine     ->  Search
 Search               yellow            none              reverse
 SignColumn           base0             none
-verbatim
-if get(g:, "@optionprefix_statusline", "") == "low"
-endverbatim
-StatusLine           base01            base03            reverse
-StatusLineNC         base01            base1             reverse
-TabLine              base01            base1             reverse
-TabLineFill          base01            base1             reverse
-TabLineSel           base1             base03            reverse
-VertSplit            base1             base01
-WildMenu             base1             base03            reverse
-verbatim
-elseif get(g:, "@optionprefix_statusline", "") == "flat"
-endverbatim
-StatusLine           base02            base2             reverse
-StatusLineNC         base02            base1             reverse
-TabLineSel           base2             base02
-TabLine              base01            base02
-TabLineFill          base01            base02
-VertSplit            base01            base02
-WildMenu             base0             base03            reverse
-verbatim
-else
-endverbatim
-StatusLine           base1             base02            reverse
-StatusLineNC         base00            base02            reverse
-TabLine              base00            base02            reverse
-TabLineFill          base00            base02            reverse
-TabLineSel           base1             base02            reverse
-VertSplit            base1             base01
-WildMenu             base00            base03            reverse
-verbatim
-endif
-endverbatim
-StatusLineTerm    -> StatusLine
-StatusLineTermNC  -> StatusLineNC
 Visual               base01            base03            reverse
 VisualNOS            none              base02            reverse
 WarningMsg           orange            none              bold
-# Other conventional group names (see `:help group-name`)
+# }}}
-Boolean           -> Constant
+# Other conventional groups (light) {{{
-Character         -> Constant
+Comment              base00            none              italic
-Comment              base00            none              g=italic
-Conditional       -> Statement
 Constant             cyan              none
-Define            -> PreProc
+CursorIM             none              fg
-Debug             -> Special
-Delimiter         -> Special
 Error                red               base03            bold,reverse
-Exception         -> Statement
-Float             -> Constant
-Function          -> Identifier
 Identifier           blue              none
 Ignore               none              none
-Include           -> PreProc
-Keyword           -> Statement
-Label             -> Statement
-Macro             -> PreProc
-Number            -> Constant
-Operator          -> Statement
-PreCondit         -> PreProc
 PreProc              orange            none
-Repeat            -> Statement
 Special              orange            none
-SpecialChar       -> Special
-SpecialComment    -> Special
 Statement            green             none
-StorageClass      -> Type
-String            -> Constant
-Structure         -> Type
-Tag               -> Special
 Todo                 magenta           none              bold
-Type                 yellow            none
-Typedef           -> Type
-Underlined           violet            none
-# See `:help lCursor`
-lCursor           -> Cursor
-# See `:help CursorIM`
-CursorIM             none              fg
-# See `:help window-toolbar`
-ToolbarLine          none              base02
 ToolbarButton        base1             base02            bold
+ToolbarLine          none              base02
+Type                 yellow            none
+Underlined           violet            none
 # }}}
-
+# }}}
-# Additional highlight groups {{{
+# Additional highlight groups (light) {{{
 NormalMode           base1             base03            reverse
 InsertMode           cyan              base03            reverse
 ReplaceMode          orange            base03            reverse
 VisualMode           magenta           base03            reverse
 CommandMode          magenta           base03            reverse
 # }}}
-
+# Neovim (light) {{{
-# Extra stuff {{{
+TermCursor        -> Cursor
+TermCursorNC         base03            base01
+# }}}
+# Extra stuff (light) {{{
 Include: _extra.colortemplate
 # }}}
+#unlet s:termtrans
+
+Background: any
+# B&W variant {{{
+Include: _bw.colortemplate
+# }}}
+#unlet s:termtrans
 

templates/solarized8_low.colortemplate

@@ -7,81 +7,95 @@ Author:          Ethan Schoonover
 Maintainer:      Lifepillar <lifepillar@lifepillar.me>
 Website:         https://github.com/lifepillar/vim-solarized8
 Description:     Precision colors for machines and people
-Terminal Colors: 256, 16
 Option Prefix:   solarized
 License:         OSI approved MIT license
 # }}}
 
-# Documentation {{{
+#let s:italics = s:italics && get(g:, '@optionprefix_italics', 1)
-Include: _help.colortemplate
+#let s:termtrans = get(g:, '@optionprefix_termtrans', 0) && !has('gui_running')
+
+# Common linked groups {{{
+Boolean           -> Constant
+Character         -> Constant
+Conditional       -> Statement
+Debug             -> Special
+Define            -> PreProc
+Delimiter         -> Special
+Exception         -> Statement
+Float             -> Constant
+Function          -> Identifier
+Include           -> PreProc
+Keyword           -> Statement
+Label             -> Statement
+Macro             -> PreProc
+Number            -> Constant
+Operator          -> Statement
+PreCondit         -> PreProc
+QuickFixLine      -> Search
+Repeat            -> Statement
+SpecialChar       -> Special
+SpecialComment    -> Special
+StatusLineTerm    -> StatusLine
+StatusLineTermNC  -> StatusLineNC
+StorageClass      -> Type
+String            -> Constant
+Structure         -> Type
+Tag               -> Special
+Typedef           -> Type
+lCursor           -> Cursor
 # }}}
 
+Variant: 256 gui 16
+
 Background: dark
-
+# Dark color palette {{{
-# Color palette {{{
+# Color name                GUI                  Base256    Base16
-# Color name                GUI                  Base256    Base16 (optional)
-Color: base03               #002b36                ~        8
 Color: base02               #073642                239        0
-Color: base01               #586e75                ~        10
+Color: back                 #073642                236        0
-Color: base00               #657b83                ~        11
+Color: red                  #dc322f                160        1
-Color: base0                #839496                ~        12
+Color: green                #859900                106        2
-Color: base1                #93a1a1                ~        14
-Color: base2                #eee8d5                ~        7
-Color: base3                #fdf6e3                ~        15
-Color: yellow               #b58900                ~        3
-Color: orange               #cb4b16                ~        9
-Color: red                  #dc322f                ~        1
-Color: magenta              #d33682                ~        5
-Color: violet               #6c71c4                ~        13
-Color: blue                 #268bd2                ~        4
-Color: cyan                 #2aa198                ~        6
-Color: green                #859900                ~        2
 #Color:green                #719e07                ~          2
-Color: back                 #073642                ~        0
+Color: yellow               #b58900                136        3
+Color: blue                 #268bd2                32         4
+Color: magenta              #d33682                162        5
+Color: cyan                 #2aa198                37         6
+Color: base2                #eee8d5                254        7
+Color: base03               #002b36                235        8
+Color: orange               #cb4b16                166        9
+Color: base01               #586e75                242       10
+Color: base00               #657b83                66        11
+Color: base0                #839496                246       12
+Color: violet               #6c71c4                61        13
+Color: base1                #93a1a1                247       14
+Color: base3                #fdf6e3                230       15
+
+Include: _dark_terminal.colortemplate
 # }}}
-
+# Default highlight groups (dark) {{{
-# Terminal colors {{{
+# Transparency (dark) {{{
-Include: _terminal_ansi_colors_dark.colortemplate
+#if s:termtrans
-Include: _neovim_dark.colortemplate
-# }}}
-
-# Default highlight groups {{{
-verbatim
-if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0)
-endverbatim
-
-  # Transparent background
   Normal             base0             none
+  CursorLine         none              none             underline s=base1
   FoldColumn         fg                none
   Folded             fg                none             bold s=base03
   LineNr             base01            none
   Terminal           fg                none
-
+  ToolbarButton      base1             none              bold
-verbatim
+  ToolbarLine        none              none
-hi CursorLineNr ctermbg=NONE guifg=NONE
+#else
-else
-endverbatim
-
-  # Opaque background
   Normal             base0             back
+  CursorLine         none              base02
   FoldColumn         base0             base02
   Folded             base0             base02            bold s=base03
   LineNr             base01            base02
   Terminal           fg                back
-
+  ToolbarButton      base1             base02            bold
-verbatim
+  ToolbarLine        none              base02
-hi CursorLineNr ctermbg=@base02 guibg=@base02
+#endif
-endif
+# }}}
-endverbatim
+# Visibility (dark) {{{
-
+#if get(g:, '@optionprefix_visibility', '') ==# 'high'
-ColorColumn          none              base02
+  CursorLineNr       orange            base02            bold
-Conceal              blue              none
-
-# Visibility ================================================================
-verbatim
-if get(g:, "@optionprefix_visibility", "") == "high"
-hi CursorLineNr ctermfg=@orange guifg=@orange cterm=bold gui=bold
-endverbatim
   NonText            orange            none              bold
   SpecialKey         orange            none              reverse
   SpellBad           violet            base2             t=underline,reverse g=undercurl,reverse s=red
@@ -89,10 +103,8 @@ SpellCap             violet            base2             t=underline,reverse g=u
   SpellLocal         yellow            base2             t=underline,reverse g=undercurl,reverse s=red
   SpellRare          cyan              base2             t=underline,reverse g=undercurl,reverse s=red
   Title              yellow            none              bold
-verbatim
+#elseif get(g:, '@optionprefix_visibility', '') ==# 'low'
-elseif get(g:, "@optionprefix_visibility", "") == "low"
+  CursorLineNr       base01            base02            bold
-hi CursorLineNr ctermfg=@base01 guifg=@base01 cterm=bold gui=bold
-endverbatim
   NonText            base02            none              bold
   SpecialKey         base02            none              reverse
   SpellBad           violet            none              t=underline g=undercurl s=violet
@@ -100,10 +112,8 @@ SpellCap             violet            none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              base01            none              bold
-verbatim
+#else
-else
+  CursorLineNr       base0             base02            bold
-hi CursorLineNr ctermfg=@base0 guifg=@base0 cterm=bold gui=bold
-endverbatim
   NonText            base00            none              bold
   SpecialKey         base00            base02            bold
   SpellBad           violet            none              t=underline g=undercurl s=violet
@@ -111,53 +121,76 @@ SpellCap             violet            none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              yellow            none              bold
+#endif
+# }}}
+# CursorLineNr transparency (dark) {{{
+Variant: gui
 verbatim
+if s:termtrans
+  hi CursorLineNr guibg=NONE
 endif
 endverbatim
-# ---------------------------------------------------------------------------
+Variant: 256 16
-
-# Cursor style ==============================================================
 verbatim
-if get(g:, '@optionprefix_old_cursor_style', 0)
+if s:termtrans
+  hi CursorLineNr ctermbg=NONE
+endif
 endverbatim
+Variant: gui 256 16
+# }}}
+# Cursor style (dark) {{{
+#if get(g:, '@optionprefix_old_cursor_style', 0)
   Cursor             base03            base0
-verbatim
+#else
-else
-endverbatim
   Cursor             base3             blue
-verbatim
+#endif
-endif
+# }}}
-endverbatim
+# Diff mode (dark) {{{
-# ---------------------------------------------------------------------------
+#if get(g:, '@optionprefix_diffmode', '') ==# 'high'
-
-CursorColumn         none              base02
-CursorLine           none              base02            underline s=base1
-
-# Diff mode =================================================================
-verbatim
-if get(g:, "@optionprefix_diffmode", "") == "high"
-endverbatim
   DiffAdd            green             none              reverse
   DiffChange         yellow            none              reverse
   DiffDelete         red               none              reverse
   DiffText           blue              none              reverse
-verbatim
+#elseif get(g:, '@optionprefix_diffmode', '') ==# 'low'
-elseif get(g:, "@optionprefix_diffmode", "") == "low"
-endverbatim
   DiffAdd            green             none              s=green
   DiffChange         yellow            none              s=yellow
   DiffDelete         red               none              bold
   DiffText           blue              none              s=blue
-verbatim
+#else
-else
-endverbatim
   DiffAdd            green             base02            s=green
   DiffChange         yellow            base02            s=yellow
   DiffDelete         red               base02            bold
   DiffText           blue              base02            s=blue
-verbatim
+#endif
-endif
+# }}}
-endverbatim
+# Structural elements (dark) {{{
+#if get(g:, '@optionprefix_statusline', '') ==# 'low'
+  StatusLine         base01            base2             reverse
+  StatusLineNC       base01            base1             reverse
+  TabLine            base01            base1             reverse
+  TabLineFill        base01            base1             reverse
+  TabLineSel         base01            base2             reverse
+  VertSplit          base1             base01
+#elseif get(g:, '@optionprefix_statusline', '') ==# 'flat'
+  StatusLine         base03            base2             reverse
+  StatusLineNC       base03            base1             reverse
+  TabLineSel         base2             base03
+  TabLine            base01            base03
+  TabLineFill        base01            base03
+  VertSplit          base01            base03
+#else
+  StatusLine         base0             base02            reverse
+  StatusLineNC       base01            base02            reverse
+  TabLine            base01            base02            reverse
+  TabLineFill        base01            base02            reverse
+  TabLineSel         base0             base02            reverse
+  VertSplit          base1             base01
+#endif
+# }}}
+# Base groups (dark) {{{
+ColorColumn          none              base02
+Conceal              blue              none
+CursorColumn         none              base02
 Directory            blue              none
 EndOfBuffer          none              none
 ErrorMsg             red               base3             reverse
@@ -170,174 +203,92 @@ PmenuSbar            none              base03
 PmenuSel             base00            base02
 PmenuThumb           none              base03
 Question             cyan              none              bold
-QuickFixLine     ->  Search
 Search               yellow            none              reverse
 SignColumn           base0             none
-verbatim
-if get(g:, "@optionprefix_statusline", "") == "low"
-endverbatim
-StatusLine           base01            base2             reverse
-StatusLineNC         base01            base1             reverse
-TabLine              base01            base1             reverse
-TabLineFill          base01            base1             reverse
-TabLineSel           base01            base2             reverse
-VertSplit            base1             base01
-verbatim
-elseif get(g:, "@optionprefix_statusline", "") == "flat"
-endverbatim
-StatusLine           base03            base2             reverse
-StatusLineNC         base03            base1             reverse
-TabLineSel           base2             base03
-TabLine              base01            base03
-TabLineFill          base01            base03
-VertSplit            base01            base03
-verbatim
-else
-endverbatim
-StatusLine           base0             base02            reverse
-StatusLineNC         base01            base02            reverse
-TabLine              base01            base02            reverse
-TabLineFill          base01            base02            reverse
-TabLineSel           base0             base02            reverse
-VertSplit            base1             base01
-verbatim
-endif
-endverbatim
-StatusLineTerm    -> StatusLine
-StatusLineTermNC  -> StatusLineNC
 Visual               base01            base03            reverse
 VisualNOS            none              base02            reverse
 WarningMsg           orange            none              bold
 WildMenu             base2             base02            reverse
-# Other conventional group names (see `:help group-name`)
+# }}}
-Boolean           -> Constant
+# Other conventional groups (dark) {{{
-Character         -> Constant
+Comment              base01            none              italic
-Comment              base01            none              g=italic
-Conditional       -> Statement
 Constant             cyan              none
-Define            -> PreProc
+CursorIM             none              fg
-Debug             -> Special
-Delimiter         -> Special
 Error                red               base3             bold,reverse
-Exception         -> Statement
-Float             -> Constant
-Function          -> Identifier
 Identifier           blue              none
 Ignore               none              none
-Include           -> PreProc
-Keyword           -> Statement
-Label             -> Statement
-Macro             -> PreProc
-Number            -> Constant
-Operator          -> Statement
-PreCondit         -> PreProc
 PreProc              orange            none
-Repeat            -> Statement
 Special              orange            none
-SpecialChar       -> Special
-SpecialComment    -> Special
 Statement            green             none
-StorageClass      -> Type
-String            -> Constant
-Structure         -> Type
-Tag               -> Special
 Todo                 magenta           none              bold
 Type                 yellow            none
-Typedef           -> Type
 Underlined           violet            none
-# See `:help lCursor`
-lCursor           -> Cursor
-# See `:help CursorIM`
-CursorIM             none              fg
-# See `:help window-toolbar`
-ToolbarLine          none              base02
-ToolbarButton        base1             base02            bold
 # }}}
-
+# }}}
-# Additional highlight groups {{{
+# Additional highlight groups (dark) {{{
 NormalMode           base0             base3             reverse
 InsertMode           cyan              base3             reverse
 ReplaceMode          orange            base3             reverse
 VisualMode           magenta           base3             reverse
 CommandMode          magenta           base3             reverse
 # }}}
-
+# Extra stuff (dark) {{{
-# Extra stuff {{{
 Include: _extra.colortemplate
 # }}}
+#unlet s:termtrans
 
 Background: light
-
+# Light color palette {{{
-# Color palette {{{
+# Color name                GUI                  Base256    Base16
-# Color name                GUI                  Base256    Base16 (optional)
+Color: base2                #073642                236        0
-Color: base3                #002b36                ~        8
+Color: red                  #dc322f                160        1
-Color: base2                #073642                ~        0
+Color: green                #859900                106        2
-Color: base1                #586e75                ~        10
-Color: base0                #657b83                ~        11
-Color: base00               #839496                ~        12
-Color: base01               #93a1a1                ~        14
-Color: base02               #eee8d5                ~        7
-Color: base03               #fdf6e3                ~        15
-Color: yellow               #b58900                ~        3
-Color: orange               #cb4b16                ~        9
-Color: red                  #dc322f                ~        1
-Color: magenta              #d33682                ~        5
-Color: violet               #6c71c4                ~        13
-Color: blue                 #268bd2                ~        4
-Color: cyan                 #2aa198                ~        6
-Color: green                #859900                ~        2
 #Color:green                #719e07                ~          2
-Color: back                 #eee8d5                ~        7
+Color: yellow               #b58900                136        3
+Color: blue                 #268bd2                32         4
+Color: magenta              #d33682                162        5
+Color: cyan                 #2aa198                37         6
+Color: base02               #eee8d5                254        7
+Color: back                 #eee8d5                254        7
+Color: base3                #002b36                235        8
+Color: orange               #cb4b16                166        9
+Color: base1                #586e75                242       10
+Color: base0                #657b83                66        11
+Color: base00               #839496                246       12
+Color: violet               #6c71c4                61        13
+Color: base01               #93a1a1                247       14
+Color: base03               #fdf6e3                230       15
+
+Include: _light_terminal.colortemplate
 # }}}
-
+# Default highlight groups (light) {{{
-# Terminal colors {{{
+# Transparency (light) {{{
-Include: _terminal_ansi_colors_light.colortemplate
+#if s:termtrans
-Include: _neovim_light.colortemplate
-# }}}
-
-# Default highlight groups {{{
-verbatim
-if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0)
-endverbatim
-
-  # Transparent background
   Normal             base0             none
   FoldColumn         base0             none
   Folded             base0             none              bold s=base03
   LineNr             base01            none
   Terminal           fg                none
-
+  ToolbarButton      base1             none              bold
-verbatim
+  ToolbarLine        none              none
-hi CursorLineNr ctermbg=NONE guifg=NONE
+#else
-else
-endverbatim
-
-  # Opaque background
   Normal             base0             back
   FoldColumn         base0             base02
   Folded             base0             base02            bold s=base03
   LineNr             base01            base02
   Terminal           fg                back
-verbatim
+  ToolbarButton      base1             base02            bold
-hi CursorLineNr ctermbg=@base02 guibg=@base02
+  ToolbarLine        none              base02
-endif
+#endif
-endverbatim
+# }}}
-
+# Visibility and cursor style (light) {{{
-# Visibility and cursor style ===============================================
+#if get(g:, '@optionprefix_visibility', '') ==# 'high'
-# High visibiity
+  CursorLineNr       red               base02            bold
-verbatim
+  #if get(g:, '@optionprefix_old_cursor_style', 0)
-if get(g:, "@optionprefix_visibility", "") == "high"
-hi CursorLineNr ctermfg=@red guifg=@red cterm=bold gui=bold
-if get(g:, '@optionprefix_old_cursor_style', 0)
-endverbatim
     Cursor           base03            base0
-verbatim
+  #else
-else
-endverbatim
     Cursor           base03            red
-verbatim
+  #endif
-endif
-endverbatim
   MatchParen         base3             none              bold,underline
   NonText            red               none              bold
   SpecialKey         red               none              reverse
@@ -346,20 +297,13 @@ SpellCap             magenta           base02            t=underline,reverse g=u
   SpellLocal         yellow            base02            t=underline,reverse g=undercurl,reverse s=orange
   SpellRare          cyan              base02            t=underline,reverse g=undercurl,reverse s=orange
   Title              orange            none              bold
-# Low visibility
+#elseif get(g:, '@optionprefix_visibility', '') ==# 'low'
-verbatim
+  CursorLineNr       base01            base02            bold
-elseif get(g:, "@optionprefix_visibility", "") == "low"
+  #if get(g:, '@optionprefix_old_cursor_style', 0)
-hi CursorLineNr ctermfg=@base01 guifg=@base01 cterm=bold gui=bold
-if get(g:, '@optionprefix_old_cursor_style', 0)
-endverbatim
     Cursor           base03            base0
-verbatim
+  #else
-else
-endverbatim
     Cursor           base03            orange
-verbatim
+  #endif
-endif
-endverbatim
   MatchParen         base3             base02            bold
   NonText            base02            none              bold
   SpecialKey         base02            none              bold
@@ -368,20 +312,13 @@ SpellCap             magenta           none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              base01            none              bold
-# Normal visibility
+#else
-verbatim
+  CursorLineNr       base0             base02            bold
-else
+  #if get(g:, 'solarized_old_cursor_style', 0)
-hi CursorLineNr ctermfg=@base0 guifg=@base0 cterm=bold gui=bold
-if get(g:, 'solarized_old_cursor_style', 0)
-endverbatim
     Cursor           base03            base0
-verbatim
+  #else
-else
-endverbatim
     Cursor           base03            orange
-verbatim
+  #endif
-endif
-endverbatim
   MatchParen         base3             base02            bold
   NonText            base00            none              bold
   SpecialKey         base00            base02            bold
@@ -390,41 +327,73 @@ SpellCap             magenta           none              t=underline g=undercurl
   SpellLocal         yellow            none              t=underline g=undercurl s=yellow
   SpellRare          cyan              none              t=underline g=undercurl s=cyan
   Title              orange            none              bold
+#endif
+# }}}
+# CursorLineNr transparency (light) {{{
+Variant: gui
 verbatim
+if s:termtrans
+  hi CursorLineNr guibg=NONE
 endif
 endverbatim
-# ---------------------------------------------------------------------------
+Variant: 256 16
-
-ColorColumn          none              base02
-Conceal              blue              none
-CursorColumn         none              base02
-CursorLine           none              base02            underline s=base1
-
-# Diff mode =================================================================
 verbatim
-if get(g:, "@optionprefix_diffmode", "") == "high"
+if s:termtrans
+  hi CursorLineNr ctermbg=NONE
+endif
 endverbatim
+Variant: gui 256 16
+# }}}
+# Diff mode (light) {{{
+#if get(g:, '@optionprefix_diffmode', '') ==# 'high'
   DiffAdd            green             none              reverse
   DiffChange         yellow            none              reverse
   DiffDelete         red               none              reverse
   DiffText           blue              none              reverse
-verbatim
+#elseif get(g:, '@optionprefix_diffmode', '') ==# 'low'
-elseif get(g:, "@optionprefix_diffmode", "") == "low"
-endverbatim
   DiffAdd            green             none              s=green
   DiffChange         yellow            none              s=yellow
   DiffDelete         red               none              bold
   DiffText           blue              none              s=blue
-verbatim
+#else
-else
-endverbatim
   DiffAdd            green             base02            s=green
   DiffChange         yellow            base02            s=yellow
   DiffDelete         red               base02            bold
   DiffText           blue              base02            s=blue
-verbatim
+#endif
-endif
+# }}}
-endverbatim
+# Structural elements (light) {{{
+#if get(g:, '@optionprefix_statusline', '') ==# 'low'
+  StatusLine         base01            base02            reverse
+  StatusLineNC       base01            base1             reverse
+  TabLine            base01            base1             reverse
+  TabLineFill        base01            base1             reverse
+  TabLineSel         base01            base02            reverse
+  VertSplit          base1             base01
+  WildMenu           base0             base02            reverse
+#elseif get(g:, '@optionprefix_statusline', '') ==# 'flat'
+  StatusLine         base03            base2             reverse
+  StatusLineNC       base03            base1             reverse
+  TabLineSel         base2             base03
+  TabLine            base01            base03
+  TabLineFill        base01            base03
+  VertSplit          base01            base03
+  WildMenu           base01            base03            reverse
+#else
+  StatusLine         base1             base02            reverse
+  StatusLineNC       base00            base02            reverse
+  TabLine            base00            base02            reverse
+  TabLineFill        base00            base02            reverse
+  TabLineSel         base1             base02            reverse
+  VertSplit          base1             base01
+  WildMenu           base00            base02            reverse
+#endif
+# }}}
+# Base groups (light) {{{
+ColorColumn          none              base02
+Conceal              blue              none
+CursorColumn         none              base02
+CursorLine           none              base02            underline s=base1
 Directory            blue              none
 EndOfBuffer          none              none
 ErrorMsg             red               base03            reverse
@@ -436,101 +405,46 @@ PmenuSbar            none              base0
 PmenuSel             base03            base00
 PmenuThumb           none              base00
 Question             cyan              none              bold
-QuickFixLine     ->  Search
 Search               yellow            none              reverse
 SignColumn           base0             none
-verbatim
-if get(g:, "@optionprefix_statusline", "") == "low"
-endverbatim
-StatusLine           base01            base02            reverse
-StatusLineNC         base01            base1             reverse
-TabLine              base01            base1             reverse
-TabLineFill          base01            base1             reverse
-TabLineSel           base01            base02            reverse
-VertSplit            base1             base01
-WildMenu             base0             base02            reverse
-verbatim
-elseif get(g:, "@optionprefix_statusline", "") == "flat"
-endverbatim
-StatusLine           base03            base2             reverse
-StatusLineNC         base03            base1             reverse
-TabLineSel           base2             base03
-TabLine              base01            base03
-TabLineFill          base01            base03
-VertSplit            base01            base03
-WildMenu             base01            base03            reverse
-verbatim
-else
-endverbatim
-StatusLine           base1             base02            reverse
-StatusLineNC         base00            base02            reverse
-TabLine              base00            base02            reverse
-TabLineFill          base00            base02            reverse
-TabLineSel           base1             base02            reverse
-VertSplit            base1             base01
-WildMenu             base00            base02            reverse
-verbatim
-endif
-endverbatim
-StatusLineTerm    -> StatusLine
-StatusLineTermNC  -> StatusLineNC
 Visual               base01            base03            reverse
 VisualNOS            none              base02            reverse
 WarningMsg           orange            none              bold
-# Other conventional group names (see `:help group-name`)
+# }}}
-Boolean           -> Constant
+# Other conventional groups (light) {{{
-Character         -> Constant
+Comment              base01            none              italic
-Comment              base01            none              g=italic
-Conditional       -> Statement
 Constant             cyan              none
-Define            -> PreProc
+CursorIM             none              fg
-Debug             -> Special
-Delimiter         -> Special
 Error                red               base03            bold,reverse
-Exception         -> Statement
-Float             -> Constant
-Function          -> Identifier
 Identifier           blue              none
 Ignore               none              none
-Include           -> PreProc
-Keyword           -> Statement
-Label             -> Statement
-Macro             -> PreProc
-Number            -> Constant
-Operator          -> Statement
-PreCondit         -> PreProc
 PreProc              orange            none
-Repeat            -> Statement
 Special              orange            none
-SpecialChar       -> Special
-SpecialComment    -> Special
 Statement            green             none
-StorageClass      -> Type
-String            -> Constant
-Structure         -> Type
-Tag               -> Special
 Todo                 magenta           none              bold
 Type                 yellow            none
-Typedef           -> Type
 Underlined           violet            none
-# See `:help lCursor`
-lCursor           -> Cursor
-# See `:help CursorIM`
-CursorIM             none              fg
-# See `:help window-toolbar`
-ToolbarLine          none              base02
-ToolbarButton        base1             base02            bold
 # }}}
-
+# }}}
-# Additional highlight groups {{{
+# Additional highlight groups (light) {{{
 NormalMode           base1             base03            reverse
 InsertMode           cyan              base03            reverse
 ReplaceMode          orange            base03            reverse
 VisualMode           magenta           base03            reverse
 CommandMode          magenta           base03            reverse
 # }}}
-
+# Neovim (light) {{{
-# Extra stuff {{{
+TermCursor        -> Cursor
+TermCursorNC         base03            base01
+# }}}
+# Extra stuff (light) {{{
 Include: _extra.colortemplate
 # }}}
+#unlet s:termtrans
+
+Background: any
+# B&W variant {{{
+Include: _bw.colortemplate
+# }}}
+#unlet s:termtrans