X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/c2536df99682289346620e78dd00dbcb8413bcfb..b89be1ca02bfbe2ff25495bfeb8e741c3487e5a5:/templates/_common.colortemplate

diff --git a/templates/_common.colortemplate b/templates/_common.colortemplate
index ec1c25b..e85a2e1 100644
--- a/templates/_common.colortemplate
+++ b/templates/_common.colortemplate
@@ -4,21 +4,21 @@
 verbatim
 if !has('gui_running') && get(g:, '@optionprefix_transp_bg', 0)
 endverbatim
-    # Transparent background
-    Normal       fg1           none
-    CursorLineNr yellow        none
-    FoldColumn   brightblack   none
-    SignColumn   fg2           none
-    VertSplit    bg3           none
+  # Transparent background
+  Normal       fg1           none
+  CursorLineNr yellow        none
+  FoldColumn   darkgray      none
+  SignColumn   fg2           none
+  VertSplit    bg3           none
 verbatim
 else
 endverbatim
-    # Opaque background
-    Normal       fg1           bg0
-    CursorLineNr yellow        bg1
-    FoldColumn   brightblack   bg1
-    SignColumn   fg2           bg1
-    VertSplit    bg3           bg0
+  # Opaque background
+  Normal       fg1           bg0
+  CursorLineNr yellow        bg1
+  FoldColumn   darkgray      bg1
+  SignColumn   fg2           bg1
+  VertSplit    bg3           bg0
 verbatim
 endif
 endverbatim
@@ -27,18 +27,20 @@ endverbatim
 ColorColumn                      none         bg1
 Conceal                          blue         none
 Cursor                           none         none    reverse
-CursorColumn                  -> CursorLine
-CursorLine                       none         bg1     bold,italic
-DiffAdd                          fg4          brightgreen
-DiffChange                       fg4          brightblue
-DiffDelete                       fg4          brightred
-DiffText                         fg4          brightyellow
+CursorColumn                  -> ColorColumn
+CursorLine                    -> ColorColumn
+DiffAdd                          brightgreen  black   reverse
+DiffAdded                        brightgreen  black   reverse
+DiffChange                       brightblue   black   reverse
+DiffDelete                       brightred    black   reverse
+DiffRemoved                      brightred    black   reverse
+DiffText                         brightgreen  black   reverse
 Directory                        blue         none    bold
 EndOfBuffer                      bg0          none
-Error                            bg0          red
+Error                            red          none    t=reverse,bold g=standout,bold
 ErrorMsg                      -> Error
-Folded                           brightblack  bg1     g=italic
-IncSearch                        brightyellow black   reverse
+Folded                           bg3          bg1     g=italic
+IncSearch                     -> Search
 LineNr                           bg3          bg1
 MatchParen                       none         bg2     bold
 ModeMsg                          blue         none
@@ -46,7 +48,7 @@ MoreMsg                          green        none
 NonText                          bg4          none
 Pmenu                            fg1          bg2
 PmenuSbar                        none         bg2
-PmenuSel                         bg1          blue    bold
+PmenuSel                         bg1          fg2    bold
 PmenuThumb                       none         bg4
 Question                         darkyellow   none
 QuickFixLine                  -> Search
@@ -69,40 +71,40 @@ VisualNOS                     -> Visual
 WarningMsg                       red          none
 WildMenu                         blue         bg2     bold
 # Other conventional group names (see `:help group-name`)
-Boolean                          magenta      none
-Character                        magenta      none
-Comment                          brightblack  none    g=italic
-Conditional                      red          none
-Constant                         magenta      none
-Define                           cyan         none
-Debug                            red          none
-Delimiter                     -> Statement
-Exception                        red          none
-Float                            magenta      none
-Function                         blue         none    bold
-Identifier                       cyan         none
+Boolean                       -> Constant
+Character                     -> Constant
+Comment                          fg3          none
+Conditional                   -> Statement
+Constant                         green        none
+Define                        -> PreProc
+Debug                         -> Special
+Delimiter                     -> Special
+Exception                     -> Statement
+Float                         -> Constant
+Function                         cyan         none
+Identifier                       blue         none
 Ignore                           fg           none
-Include                          cyan         none
-Keyword                          red          none
+Include                       -> PreProc
+Keyword                       -> Statement
 Label                         -> Statement
-Macro                            cyan         none
-Number                           magenta      none
-Operator                      -> Normal
-PreCondit                        cyan         none
+Macro                         -> PreProc
+Number                        -> Constant
+Operator                      -> Statement
+PreCondit                     -> PreProc
 PreProc                          cyan         none
-Repeat                           red          none
-SpecialChar                      red          none
-SpecialComment                   red          none
+Repeat                        -> Statement
+SpecialChar                   -> Special
+SpecialComment                -> Special
 Statement                        red          none
-StorageClass                     green        none
+StorageClass                  -> Type
 Special                          yellow       none
-String                           green        none
-Structure                        cyan         none
+String                        -> Constant
+Structure                     -> Type
 Tag                           -> Special
-Todo                             fg           bg0     t=bold g=bold,italic
-Type                             cyan         none
-Typedef                          cyan         none
-Underlined                       blue         none    underline
+Todo                             cyan         none    reverse
+Type                             darkcyan     none
+Typedef                       -> Type
+Underlined                       none         none    underline
 # Language mapping cursor
 lCursor                       -> Cursor
 # See `:help CursorIM`