- migrate to new Colortemplate v2.1 syntax

- indentation
- make light & dark colours variations more similar with one specific colour as origin
- add SignColumn
- add bold to CursorLine only

diff --git a/colors/artesanal.vim b/colors/artesanal.vim
index 59547b95d452d60c1379b4c120ca19d5a01b398f..72a33e542812a3dcf74f98218f82e7078772f2e8 100644 (file)
--- a/colors/artesanal.vim
+++ b/colors/artesanal.vim
@@ -4,15 +4,11 @@
 " Maintainer:   Stefan Wimmer <wimstefan@gmail.com>
 " Website:      https://github.com/wimstefan/vim-artesanal
 " License:      Vim License (see `:help license`)
 " Maintainer:   Stefan Wimmer <wimstefan@gmail.com>
 " Website:      https://github.com/wimstefan/vim-artesanal
 " License:      Vim License (see `:help license`)

-" Last Updated: Fri 05 Jun 2020 12:44:11 PM CEST
+" Last Updated: Thu 25 Feb 2021 05:07:02 PM CET

 
 

-" Generated by Colortemplate v2.0.0
+" Generated by Colortemplate v2.1.0

 
 hi clear
 
 hi clear

-if exists('syntax_on')
-  syntax reset
-endif
-

 let g:colors_name = 'artesanal'
 
 let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 2
 let g:colors_name = 'artesanal'
 
 let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 2


@@ -20,136 +16,137 @@ let s:italics = (&t_ZH != '' && &t_ZH != '\e[7m') || has('gui_running') || has('n
 
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   if &background ==# 'dark'
 
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   if &background ==# 'dark'

-    let g:terminal_ansi_colors = ['#575c66', '#e84256', '#00bf8a', '#fff176',
-          \ '#6699cc', '#fa75e2', '#00bbcc', '#ffffff', '#121419', '#dc1b33',
-          \ '#008c65', '#e5d85c', '#517aa3', '#f844d8', '#0095a3', '#eff1f4']
+    let g:terminal_ansi_colors = ['#575c66', '#ff616f', '#69f0b9', '#ffff8d',
+          \ '#90caf9', '#b39ddb', '#80deea', '#ffffff', '#1c313a', '#ef5350',
+          \ '#15cf83', '#ffeb3b', '#5d99c6', '#9575cd', '#4dd0e1', '#eff1f4']

     if has('nvim')
       let g:terminal_color_0 = '#575c66'
     if has('nvim')
       let g:terminal_color_0 = '#575c66'

-      let g:terminal_color_1 = '#e84256'
-      let g:terminal_color_2 = '#00bf8a'
-      let g:terminal_color_3 = '#fff176'
-      let g:terminal_color_4 = '#6699cc'
-      let g:terminal_color_5 = '#fa75e2'
-      let g:terminal_color_6 = '#00bbcc'
+      let g:terminal_color_1 = '#ff616f'
+      let g:terminal_color_2 = '#69f0b9'
+      let g:terminal_color_3 = '#ffff8d'
+      let g:terminal_color_4 = '#90caf9'
+      let g:terminal_color_5 = '#b39ddb'
+      let g:terminal_color_6 = '#80deea'

       let g:terminal_color_7 = '#ffffff'
       let g:terminal_color_7 = '#ffffff'

-      let g:terminal_color_8 = '#121419'
-      let g:terminal_color_9 = '#dc1b33'
-      let g:terminal_color_10 = '#008c65'
-      let g:terminal_color_11 = '#e5d85c'
-      let g:terminal_color_12 = '#517aa3'
-      let g:terminal_color_13 = '#f844d8'
-      let g:terminal_color_14 = '#0095a3'
+      let g:terminal_color_8 = '#1c313a'
+      let g:terminal_color_9 = '#ef5350'
+      let g:terminal_color_10 = '#15cf83'
+      let g:terminal_color_11 = '#ffeb3b'
+      let g:terminal_color_12 = '#5d99c6'
+      let g:terminal_color_13 = '#9575cd'
+      let g:terminal_color_14 = '#4dd0e1'

       let g:terminal_color_15 = '#eff1f4'
     endif
     if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
       if !has('gui_running') && &background ==# 'light'
         if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
       let g:terminal_color_15 = '#eff1f4'
     endif
     if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
       if !has('gui_running') && &background ==# 'light'
         if !has('gui_running') && get(g:, 'artesanal_transparent', 0)

-          hi Normal guifg=#000000 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+          hi Normal guifg=#000000 guibg=NONE gui=NONE cterm=NONE

         else
         else

-          hi Normal guifg=#000000 guibg=#2e3440 guisp=NONE gui=NONE cterm=NONE
+          hi Normal guifg=#000000 guibg=#2e3440 gui=NONE cterm=NONE

         endif
       elseif !has('gui_running') && &background ==# 'dark'
         if get(g:, 'artesanal_transparent', 0)
         endif
       elseif !has('gui_running') && &background ==# 'dark'
         if get(g:, 'artesanal_transparent', 0)

-          hi Normal guifg=#ffffff guibg=NONE guisp=NONE gui=NONE cterm=NONE
+          hi Normal guifg=#ffffff guibg=NONE gui=NONE cterm=NONE

         else
         else

-          hi Normal guifg=#ffffff guibg=#2e3440 guisp=NONE gui=NONE cterm=NONE
+          hi Normal guifg=#ffffff guibg=#2e3440 gui=NONE cterm=NONE

         endif
       endif
         endif
       endif

-      hi Conceal guifg=#517aa3 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi Constant guifg=#008c65 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi Directory guifg=#517aa3 guibg=NONE guisp=NONE gui=bold cterm=bold
-      hi Error guifg=#dc1b33 guibg=NONE guisp=NONE gui=bold,standout cterm=bold,standout
-      hi Function guifg=#0095a3 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi Identifier guifg=#517aa3 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi ModeMsg guifg=#517aa3 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi MoreMsg guifg=#008c65 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi PreProc guifg=#0095a3 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi Statement guifg=#dc1b33 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi Special guifg=#e5d85c guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi Todo guifg=#0095a3 guibg=NONE guisp=NONE gui=reverse cterm=reverse
-      hi WarningMsg guifg=#dc1b33 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi WildMenu guifg=#517aa3 guibg=#455a64 guisp=NONE gui=bold cterm=bold
+      hi Conceal guifg=#5d99c6 guibg=NONE gui=NONE cterm=NONE
+      hi Constant guifg=#15cf83 guibg=NONE gui=NONE cterm=NONE
+      hi Directory guifg=#5d99c6 guibg=NONE gui=bold cterm=bold
+      hi Error guifg=#ef5350 guibg=NONE gui=bold,standout cterm=bold,reverse
+      hi Function guifg=#4dd0e1 guibg=NONE gui=NONE cterm=NONE
+      hi Identifier guifg=#5d99c6 guibg=NONE gui=NONE cterm=NONE
+      hi ModeMsg guifg=#5d99c6 guibg=NONE gui=NONE cterm=NONE
+      hi MoreMsg guifg=#15cf83 guibg=NONE gui=NONE cterm=NONE
+      hi PreProc guifg=#4dd0e1 guibg=NONE gui=NONE cterm=NONE
+      hi Statement guifg=#ef5350 guibg=NONE gui=NONE cterm=NONE
+      hi Special guifg=#ffeb3b guibg=NONE gui=NONE cterm=NONE
+      hi Todo guifg=#4dd0e1 guibg=NONE gui=reverse cterm=reverse
+      hi WarningMsg guifg=#ef5350 guibg=NONE gui=NONE cterm=NONE
+      hi WildMenu guifg=#5d99c6 guibg=#455a64 gui=bold cterm=bold

     else
       if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
     else
       if !has('gui_running') && get(g:, 'artesanal_transparent', 0)

-        hi Normal guifg=#e4e6eb guibg=NONE guisp=NONE gui=NONE cterm=NONE
+        hi Normal guifg=#e4e6eb guibg=NONE gui=NONE cterm=NONE

       else
       else

-        hi Normal guifg=#e4e6eb guibg=#2e3440 guisp=NONE gui=NONE cterm=NONE
+        hi Normal guifg=#e4e6eb guibg=#2e3440 gui=NONE cterm=NONE

       endif
       endif

-      hi Conceal guifg=#6699cc guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi Constant guifg=#00bf8a guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi Directory guifg=#6699cc guibg=NONE guisp=NONE gui=bold cterm=bold
-      hi Error guifg=#e84256 guibg=NONE guisp=NONE gui=bold,standout cterm=bold,standout
-      hi Function guifg=#00bbcc guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi Identifier guifg=#6699cc guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi ModeMsg guifg=#6699cc guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi MoreMsg guifg=#00bf8a guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi PreProc guifg=#00bbcc guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi Statement guifg=#e84256 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi Special guifg=#fff176 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi Todo guifg=#00bbcc guibg=NONE guisp=NONE gui=reverse cterm=reverse
-      hi WarningMsg guifg=#e84256 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi WildMenu guifg=#6699cc guibg=#455a64 guisp=NONE gui=bold cterm=bold
+      hi Conceal guifg=#90caf9 guibg=NONE gui=NONE cterm=NONE
+      hi Constant guifg=#69f0b9 guibg=NONE gui=NONE cterm=NONE
+      hi Directory guifg=#90caf9 guibg=NONE gui=bold cterm=bold
+      hi Error guifg=#ff616f guibg=NONE gui=bold,standout cterm=bold,reverse
+      hi Function guifg=#80deea guibg=NONE gui=NONE cterm=NONE
+      hi Identifier guifg=#90caf9 guibg=NONE gui=NONE cterm=NONE
+      hi ModeMsg guifg=#90caf9 guibg=NONE gui=NONE cterm=NONE
+      hi MoreMsg guifg=#69f0b9 guibg=NONE gui=NONE cterm=NONE
+      hi PreProc guifg=#80deea guibg=NONE gui=NONE cterm=NONE
+      hi Statement guifg=#ff616f guibg=NONE gui=NONE cterm=NONE
+      hi Special guifg=#ffff8d guibg=NONE gui=NONE cterm=NONE
+      hi Todo guifg=#80deea guibg=NONE gui=reverse cterm=reverse
+      hi WarningMsg guifg=#ff616f guibg=NONE gui=NONE cterm=NONE
+      hi WildMenu guifg=#90caf9 guibg=#455a64 gui=bold cterm=bold

     endif
     if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
     endif
     if !has('gui_running') && get(g:, 'artesanal_transparent', 0)

-      hi CursorLineNr guifg=#fff176 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi FoldColumn guifg=#575c66 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi SignColumn guifg=#cdd2db guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      hi VertSplit guifg=#546e7a guibg=NONE guisp=NONE gui=NONE cterm=NONE
+      hi CursorLineNr guifg=#ffff8d guibg=NONE gui=NONE cterm=NONE
+      hi FoldColumn guifg=#575c66 guibg=NONE gui=NONE cterm=NONE
+      hi SignColumn guifg=#cdd2db guibg=NONE gui=NONE cterm=NONE
+      hi VertSplit guifg=#546e7a guibg=NONE gui=NONE cterm=NONE

     else
     else

-      hi CursorLineNr guifg=#fff176 guibg=#37474f guisp=NONE gui=NONE cterm=NONE
-      hi FoldColumn guifg=#575c66 guibg=#37474f guisp=NONE gui=NONE cterm=NONE
-      hi SignColumn guifg=#cdd2db guibg=#37474f guisp=NONE gui=NONE cterm=NONE
-      hi VertSplit guifg=#546e7a guibg=#2e3440 guisp=NONE gui=NONE cterm=NONE
+      hi CursorLineNr guifg=#ffff8d guibg=#37474f gui=NONE cterm=NONE
+      hi FoldColumn guifg=#575c66 guibg=#37474f gui=NONE cterm=NONE
+      hi SignColumn guifg=#cdd2db guibg=#37474f gui=NONE cterm=NONE
+      hi VertSplit guifg=#546e7a guibg=#2e3440 gui=NONE cterm=NONE

     endif
     endif

-    hi ColorColumn guifg=NONE guibg=#37474f guisp=NONE gui=bold cterm=bold
-    hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=bold,reverse ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi! link CursorColumn CursorLine
-    hi CursorLine guifg=NONE guibg=#37474f guisp=NONE gui=NONE cterm=NONE
-    hi DiffAdd guifg=NONE guibg=#259a7a guisp=NONE gui=NONE cterm=NONE
-    hi DiffAdded guifg=NONE guibg=#259a7a guisp=NONE gui=NONE cterm=NONE
-    hi DiffChange guifg=NONE guibg=#7e99b4 guisp=NONE gui=NONE cterm=NONE
-    hi DiffDelete guifg=NONE guibg=#d05a69 guisp=NONE gui=NONE cterm=NONE
-    hi DiffRemoved guifg=NONE guibg=#d05a69 guisp=NONE gui=NONE cterm=NONE
-    hi DiffText guifg=NONE guibg=#259a7a guisp=NONE gui=NONE cterm=NONE
-    hi EndOfBuffer guifg=#2e3440 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi ColorColumn guifg=NONE guibg=#37474f gui=bold cterm=bold
+    hi Cursor guifg=NONE guibg=NONE gui=bold,reverse ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi CursorColumn guifg=NONE guibg=#37474f gui=NONE cterm=NONE
+    hi CursorLine guifg=NONE guibg=#37474f gui=bold cterm=bold
+    hi DiffAdd guifg=NONE guibg=#3f7070 gui=NONE cterm=NONE
+    hi DiffAdded guifg=NONE guibg=#3f7070 gui=NONE cterm=NONE
+    hi DiffChange guifg=NONE guibg=#3f5a70 gui=NONE cterm=NONE
+    hi DiffDelete guifg=NONE guibg=#663d43 gui=NONE cterm=NONE
+    hi DiffRemoved guifg=NONE guibg=#663d43 gui=NONE cterm=NONE
+    hi DiffText guifg=NONE guibg=#3f7070 gui=NONE cterm=NONE
+    hi EndOfBuffer guifg=#2e3440 guibg=NONE gui=NONE cterm=NONE

     hi! link ErrorMsg Error
     hi! link ErrorMsg Error

-    hi Folded guifg=#546e7a guibg=#37474f guisp=NONE gui=italic cterm=italic
-    hi IncSearch guifg=#fff176 guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-    hi LineNr guifg=#546e7a guibg=#37474f guisp=NONE gui=NONE cterm=NONE
-    hi MatchParen guifg=NONE guibg=#455a64 guisp=NONE gui=bold cterm=bold
-    hi NonText guifg=#90a4ae guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Pmenu guifg=#e4e6eb guibg=#455a64 guisp=NONE gui=NONE cterm=NONE
-    hi PmenuSbar guifg=NONE guibg=#455a64 guisp=NONE gui=NONE cterm=NONE
-    hi PmenuSel guifg=#37474f guibg=#cdd2db guisp=NONE gui=bold cterm=bold
-    hi PmenuThumb guifg=NONE guibg=#90a4ae guisp=NONE gui=NONE cterm=NONE
-    hi Question guifg=#e5d85c guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Folded guifg=#546e7a guibg=#37474f gui=italic cterm=NONE
+    hi IncSearch guifg=#ffff8d guibg=#1c313a gui=reverse cterm=reverse
+    hi LineNr guifg=#546e7a guibg=#37474f gui=NONE cterm=NONE
+    hi SignColumn guifg=NONE guibg=#37474f gui=NONE cterm=NONE
+    hi MatchParen guifg=NONE guibg=#455a64 gui=bold cterm=bold
+    hi NonText guifg=#90a4ae guibg=NONE gui=NONE cterm=NONE
+    hi Pmenu guifg=#e4e6eb guibg=#455a64 gui=NONE cterm=NONE
+    hi PmenuSbar guifg=NONE guibg=#455a64 gui=NONE cterm=NONE
+    hi PmenuSel guifg=#37474f guibg=#cdd2db gui=bold cterm=bold
+    hi PmenuThumb guifg=NONE guibg=#90a4ae gui=NONE cterm=NONE
+    hi Question guifg=#ffeb3b guibg=NONE gui=NONE cterm=NONE

     hi! link QuickFixLine Search
     hi! link QuickFixLine Search

-    hi Search guifg=#ffffa8 guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-    hi SpecialKey guifg=#90a4ae guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi SpellBad guifg=#e84256 guibg=NONE guisp=#e84256 gui=italic,undercurl cterm=italic,undercurl
-    hi SpellCap guifg=#6699cc guibg=NONE guisp=#6699cc gui=italic,undercurl cterm=italic,undercurl
-    hi SpellLocal guifg=#00bbcc guibg=NONE guisp=#00bbcc gui=italic,undercurl cterm=italic,undercurl
-    hi SpellRare guifg=#fa75e2 guibg=NONE guisp=#fa75e2 gui=italic,undercurl cterm=italic,undercurl
-    hi StatusLine guifg=#455a64 guibg=#e4e6eb guisp=NONE gui=reverse cterm=reverse
-    hi StatusLineNC guifg=#37474f guibg=#cdd2db guisp=NONE gui=reverse cterm=reverse
+    hi Search guifg=#fff9c4 guibg=#1c313a gui=reverse cterm=reverse
+    hi SpecialKey guifg=#90a4ae guibg=NONE gui=NONE cterm=NONE
+    hi SpellBad guifg=#ff616f guibg=NONE gui=italic,undercurl cterm=underline
+    hi SpellCap guifg=#90caf9 guibg=NONE gui=italic,undercurl cterm=underline
+    hi SpellLocal guifg=#80deea guibg=NONE gui=italic,undercurl cterm=underline
+    hi SpellRare guifg=#b39ddb guibg=NONE gui=italic,undercurl cterm=underline
+    hi StatusLine guifg=#e4e6eb guibg=#455a64 gui=NONE cterm=NONE
+    hi StatusLineNC guifg=#cdd2db guibg=#37474f gui=NONE cterm=NONE

     hi! link StatusLineTerm StatusLine
     hi! link StatusLineTermNC StatusLineNC
     hi! link TabLine TabLineFill
     hi! link StatusLineTerm StatusLine
     hi! link StatusLineTermNC StatusLineNC
     hi! link TabLine TabLineFill

-    hi TabLineFill guifg=#cdd2db guibg=#546e7a guisp=NONE gui=NONE cterm=NONE
-    hi TabLineSel guifg=#e4e6eb guibg=#37474f guisp=NONE gui=NONE cterm=NONE
-    hi Title guifg=#e84256 guibg=NONE guisp=NONE gui=bold cterm=bold
-    hi Visual guifg=NONE guibg=#37474f guisp=NONE gui=NONE cterm=NONE
+    hi TabLineFill guifg=#cdd2db guibg=#546e7a gui=NONE cterm=NONE
+    hi TabLineSel guifg=#e4e6eb guibg=#37474f gui=NONE cterm=NONE
+    hi Title guifg=#ff616f guibg=NONE gui=bold cterm=bold
+    hi Visual guifg=NONE guibg=#37474f gui=NONE cterm=NONE

     hi! link VisualNOS Visual
     hi! link Boolean Constant
     hi! link Character Constant
     hi! link VisualNOS Visual
     hi! link Boolean Constant
     hi! link Character Constant

-    hi Comment guifg=#b6bdcb guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Comment guifg=#b6bdcb guibg=NONE gui=NONE cterm=NONE

     hi! link Conditional Statement
     hi! link Define PreProc
     hi! link Debug Special
     hi! link Delimiter Special
     hi! link Exception Statement
     hi! link Float Constant
     hi! link Conditional Statement
     hi! link Define PreProc
     hi! link Debug Special
     hi! link Delimiter Special
     hi! link Exception Statement
     hi! link Float Constant

-    hi Ignore guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Ignore guifg=fg guibg=NONE gui=NONE cterm=NONE

     hi! link Include PreProc
     hi! link Keyword Statement
     hi! link Label Statement
     hi! link Include PreProc
     hi! link Keyword Statement
     hi! link Label Statement


@@ -164,166 +161,167 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi! link String Constant
     hi! link Structure Type
     hi! link Tag Special
     hi! link String Constant
     hi! link Structure Type
     hi! link Tag Special

-    hi Type guifg=#0095a3 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Type guifg=#4dd0e1 guibg=NONE gui=NONE cterm=NONE

     hi! link Typedef Type
     hi! link Typedef Type

-    hi Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline

     hi! link lCursor Cursor
     hi! link lCursor Cursor

-    hi CursorIM guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi ToolbarLine guifg=NONE guibg=#546e7a guisp=NONE gui=NONE cterm=NONE
-    hi ToolbarButton guifg=#eff1f4 guibg=#546e7a guisp=NONE gui=bold cterm=bold
+    hi CursorIM guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi ToolbarLine guifg=NONE guibg=#546e7a gui=NONE cterm=NONE
+    hi ToolbarButton guifg=#eff1f4 guibg=#546e7a gui=bold cterm=bold

     hi! link iCursor Cursor
     hi! link vCursor Cursor
     hi! link iCursor Cursor
     hi! link vCursor Cursor

-    hi NormalMode guifg=#cdd2db guibg=#2e3440 guisp=NONE gui=reverse cterm=reverse
-    hi InsertMode guifg=#6699cc guibg=#2e3440 guisp=NONE gui=reverse cterm=reverse
-    hi ReplaceMode guifg=#00bbcc guibg=#2e3440 guisp=NONE gui=reverse cterm=reverse
-    hi VisualMode guifg=#fff176 guibg=#2e3440 guisp=NONE gui=reverse cterm=reverse
-    hi CommandMode guifg=#fa75e2 guibg=#2e3440 guisp=NONE gui=reverse cterm=reverse
-    hi Warnings guifg=#fff176 guibg=#2e3440 guisp=NONE gui=reverse cterm=reverse
+    hi NormalMode guifg=#cdd2db guibg=#2e3440 gui=reverse cterm=reverse
+    hi InsertMode guifg=#90caf9 guibg=#2e3440 gui=reverse cterm=reverse
+    hi ReplaceMode guifg=#80deea guibg=#2e3440 gui=reverse cterm=reverse
+    hi VisualMode guifg=#ffff8d guibg=#2e3440 gui=reverse cterm=reverse
+    hi CommandMode guifg=#b39ddb guibg=#2e3440 gui=reverse cterm=reverse
+    hi Warnings guifg=#ffff8d guibg=#2e3440 gui=reverse cterm=reverse

     if !s:italics
       hi Folded gui=NONE cterm=NONE
     if !s:italics
       hi Folded gui=NONE cterm=NONE

-      hi SpellBad gui=undercurl cterm=undercurl
-      hi SpellCap gui=undercurl cterm=undercurl
-      hi SpellLocal gui=undercurl cterm=undercurl
-      hi SpellRare gui=undercurl cterm=undercurl
+      hi SpellBad gui=undercurl cterm=underline
+      hi SpellCap gui=undercurl cterm=underline
+      hi SpellLocal gui=undercurl cterm=underline
+      hi SpellRare gui=undercurl cterm=underline

     endif
     if has('nvim')
       hi! link TermCursor Cursor
     endif
     if has('nvim')
       hi! link TermCursor Cursor

-      hi TermCursorNC guifg=#37474f guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
+      hi TermCursorNC guifg=#37474f guibg=#e4e6eb gui=NONE cterm=NONE

     endif
     unlet s:t_Co s:italics
     finish
   endif
   " Light background
     endif
     unlet s:t_Co s:italics
     finish
   endif
   " Light background

-  let g:terminal_ansi_colors = ['#121419', '#971223', '#00814b', '#cc7000',
-        \ '#00409b', '#9a008d', '#007681', '#eff1f4', '#575c66', '#ae1528',
-        \ '#009a5a', '#ff8c00', '#004bb4', '#b300a4', '#008d9a', '#ffffff']
+  let g:terminal_ansi_colors = ['#1c313a', '#99000d', '#0c7047', '#cc6c0b',
+        \ '#064578', '#5f468a', '#198b9a', '#eff1f4', '#575c66', '#b2000f',
+        \ '#0e8756', '#ff870e', '#0961a8', '#7a5ab2', '#1d9fb0', '#ffffff']

   if has('nvim')
   if has('nvim')

-    let g:terminal_color_0 = '#121419'
-    let g:terminal_color_1 = '#971223'
-    let g:terminal_color_2 = '#00814b'
-    let g:terminal_color_3 = '#cc7000'
-    let g:terminal_color_4 = '#00409b'
-    let g:terminal_color_5 = '#9a008d'
-    let g:terminal_color_6 = '#007681'
+    let g:terminal_color_0 = '#1c313a'
+    let g:terminal_color_1 = '#99000d'
+    let g:terminal_color_2 = '#0c7047'
+    let g:terminal_color_3 = '#cc6c0b'
+    let g:terminal_color_4 = '#064578'
+    let g:terminal_color_5 = '#5f468a'
+    let g:terminal_color_6 = '#198b9a'

     let g:terminal_color_7 = '#eff1f4'
     let g:terminal_color_8 = '#575c66'
     let g:terminal_color_7 = '#eff1f4'
     let g:terminal_color_8 = '#575c66'

-    let g:terminal_color_9 = '#ae1528'
-    let g:terminal_color_10 = '#009a5a'
-    let g:terminal_color_11 = '#ff8c00'
-    let g:terminal_color_12 = '#004bb4'
-    let g:terminal_color_13 = '#b300a4'
-    let g:terminal_color_14 = '#008d9a'
+    let g:terminal_color_9 = '#b2000f'
+    let g:terminal_color_10 = '#0e8756'
+    let g:terminal_color_11 = '#ff870e'
+    let g:terminal_color_12 = '#0961a8'
+    let g:terminal_color_13 = '#7a5ab2'
+    let g:terminal_color_14 = '#1d9fb0'

     let g:terminal_color_15 = '#ffffff'
   endif
   if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
     if !has('gui_running') && &background ==# 'light'
       if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
     let g:terminal_color_15 = '#ffffff'
   endif
   if !has('gui_running') && get(g:, 'artesanal_dimmed', 0)
     if !has('gui_running') && &background ==# 'light'
       if !has('gui_running') && get(g:, 'artesanal_transparent', 0)

-        hi Normal guifg=#000000 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+        hi Normal guifg=#000000 guibg=NONE gui=NONE cterm=NONE

       else
       else

-        hi Normal guifg=#000000 guibg=#eff1f4 guisp=NONE gui=NONE cterm=NONE
+        hi Normal guifg=#000000 guibg=#eff1f4 gui=NONE cterm=NONE

       endif
     elseif !has('gui_running') && &background ==# 'dark'
       if get(g:, 'artesanal_transparent', 0)
       endif
     elseif !has('gui_running') && &background ==# 'dark'
       if get(g:, 'artesanal_transparent', 0)

-        hi Normal guifg=#ffffff guibg=NONE guisp=NONE gui=NONE cterm=NONE
+        hi Normal guifg=#ffffff guibg=NONE gui=NONE cterm=NONE

       else
       else

-        hi Normal guifg=#ffffff guibg=#eff1f4 guisp=NONE gui=NONE cterm=NONE
+        hi Normal guifg=#ffffff guibg=#eff1f4 gui=NONE cterm=NONE

       endif
     endif
       endif
     endif

-    hi Conceal guifg=#00409b guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Constant guifg=#00814b guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Directory guifg=#00409b guibg=NONE guisp=NONE gui=bold cterm=bold
-    hi Error guifg=#971223 guibg=NONE guisp=NONE gui=bold,standout cterm=bold,standout
-    hi Function guifg=#007681 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Identifier guifg=#00409b guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi ModeMsg guifg=#00409b guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi MoreMsg guifg=#00814b guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi PreProc guifg=#007681 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Statement guifg=#971223 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Special guifg=#cc7000 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Todo guifg=#007681 guibg=NONE guisp=NONE gui=reverse cterm=reverse
-    hi WarningMsg guifg=#971223 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi WildMenu guifg=#00409b guibg=#cdd2db guisp=NONE gui=bold cterm=bold
+    hi Conceal guifg=#064578 guibg=NONE gui=NONE cterm=NONE
+    hi Constant guifg=#0c7047 guibg=NONE gui=NONE cterm=NONE
+    hi Directory guifg=#064578 guibg=NONE gui=bold cterm=bold
+    hi Error guifg=#99000d guibg=NONE gui=bold,standout cterm=bold,reverse
+    hi Function guifg=#198b9a guibg=NONE gui=NONE cterm=NONE
+    hi Identifier guifg=#064578 guibg=NONE gui=NONE cterm=NONE
+    hi ModeMsg guifg=#064578 guibg=NONE gui=NONE cterm=NONE
+    hi MoreMsg guifg=#0c7047 guibg=NONE gui=NONE cterm=NONE
+    hi PreProc guifg=#198b9a guibg=NONE gui=NONE cterm=NONE
+    hi Statement guifg=#99000d guibg=NONE gui=NONE cterm=NONE
+    hi Special guifg=#cc6c0b guibg=NONE gui=NONE cterm=NONE
+    hi Todo guifg=#198b9a guibg=NONE gui=reverse cterm=reverse
+    hi WarningMsg guifg=#99000d guibg=NONE gui=NONE cterm=NONE
+    hi WildMenu guifg=#064578 guibg=#cdd2db gui=bold cterm=bold

   else
     if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
   else
     if !has('gui_running') && get(g:, 'artesanal_transparent', 0)

-      hi Normal guifg=#37474f guibg=NONE guisp=NONE gui=NONE cterm=NONE
+      hi Normal guifg=#37474f guibg=NONE gui=NONE cterm=NONE

     else
     else

-      hi Normal guifg=#37474f guibg=#eff1f4 guisp=NONE gui=NONE cterm=NONE
+      hi Normal guifg=#37474f guibg=#eff1f4 gui=NONE cterm=NONE

     endif
     endif

-    hi Conceal guifg=#004bb4 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Constant guifg=#009a5a guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Directory guifg=#004bb4 guibg=NONE guisp=NONE gui=bold cterm=bold
-    hi Error guifg=#ae1528 guibg=NONE guisp=NONE gui=bold,standout cterm=bold,standout
-    hi Function guifg=#008d9a guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Identifier guifg=#004bb4 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi ModeMsg guifg=#004bb4 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi MoreMsg guifg=#009a5a guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi PreProc guifg=#008d9a guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Statement guifg=#ae1528 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Special guifg=#ff8c00 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Todo guifg=#008d9a guibg=NONE guisp=NONE gui=reverse cterm=reverse
-    hi WarningMsg guifg=#ae1528 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi WildMenu guifg=#004bb4 guibg=#cdd2db guisp=NONE gui=bold cterm=bold
+    hi Conceal guifg=#0961a8 guibg=NONE gui=NONE cterm=NONE
+    hi Constant guifg=#0e8756 guibg=NONE gui=NONE cterm=NONE
+    hi Directory guifg=#0961a8 guibg=NONE gui=bold cterm=bold
+    hi Error guifg=#b2000f guibg=NONE gui=bold,standout cterm=bold,reverse
+    hi Function guifg=#1d9fb0 guibg=NONE gui=NONE cterm=NONE
+    hi Identifier guifg=#0961a8 guibg=NONE gui=NONE cterm=NONE
+    hi ModeMsg guifg=#0961a8 guibg=NONE gui=NONE cterm=NONE
+    hi MoreMsg guifg=#0e8756 guibg=NONE gui=NONE cterm=NONE
+    hi PreProc guifg=#1d9fb0 guibg=NONE gui=NONE cterm=NONE
+    hi Statement guifg=#b2000f guibg=NONE gui=NONE cterm=NONE
+    hi Special guifg=#ff870e guibg=NONE gui=NONE cterm=NONE
+    hi Todo guifg=#1d9fb0 guibg=NONE gui=reverse cterm=reverse
+    hi WarningMsg guifg=#b2000f guibg=NONE gui=NONE cterm=NONE
+    hi WildMenu guifg=#0961a8 guibg=#cdd2db gui=bold cterm=bold

   endif
   if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
   endif
   if !has('gui_running') && get(g:, 'artesanal_transparent', 0)

-    hi CursorLineNr guifg=#ff8c00 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi FoldColumn guifg=#575c66 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi SignColumn guifg=#455a64 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi VertSplit guifg=#b6bdcb guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi CursorLineNr guifg=#ff870e guibg=NONE gui=NONE cterm=NONE
+    hi FoldColumn guifg=#575c66 guibg=NONE gui=NONE cterm=NONE
+    hi SignColumn guifg=#455a64 guibg=NONE gui=NONE cterm=NONE
+    hi VertSplit guifg=#b6bdcb guibg=NONE gui=NONE cterm=NONE

   else
   else

-    hi CursorLineNr guifg=#ff8c00 guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
-    hi FoldColumn guifg=#575c66 guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
-    hi SignColumn guifg=#455a64 guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
-    hi VertSplit guifg=#b6bdcb guibg=#eff1f4 guisp=NONE gui=NONE cterm=NONE
+    hi CursorLineNr guifg=#ff870e guibg=#e4e6eb gui=NONE cterm=NONE
+    hi FoldColumn guifg=#575c66 guibg=#e4e6eb gui=NONE cterm=NONE
+    hi SignColumn guifg=#455a64 guibg=#e4e6eb gui=NONE cterm=NONE
+    hi VertSplit guifg=#b6bdcb guibg=#eff1f4 gui=NONE cterm=NONE

   endif
   endif

-  hi ColorColumn guifg=NONE guibg=#e4e6eb guisp=NONE gui=bold cterm=bold
-  hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=bold,reverse ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-  hi! link CursorColumn CursorLine
-  hi CursorLine guifg=NONE guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
-  hi DiffAdd guifg=NONE guibg=#abddcc guisp=NONE gui=NONE cterm=NONE
-  hi DiffAdded guifg=NONE guibg=#abddcc guisp=NONE gui=NONE cterm=NONE
-  hi DiffChange guifg=NONE guibg=#aec0e0 guisp=NONE gui=NONE cterm=NONE
-  hi DiffDelete guifg=NONE guibg=#ddabbc guisp=NONE gui=NONE cterm=NONE
-  hi DiffRemoved guifg=NONE guibg=#ddabbc guisp=NONE gui=NONE cterm=NONE
-  hi DiffText guifg=NONE guibg=#abddcc guisp=NONE gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#eff1f4 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#e4e6eb gui=bold cterm=bold
+  hi Cursor guifg=NONE guibg=NONE gui=bold,reverse ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi CursorColumn guifg=NONE guibg=#e4e6eb gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#e4e6eb gui=bold cterm=bold
+  hi DiffAdd guifg=NONE guibg=#c3e6d7 gui=NONE cterm=NONE
+  hi DiffAdded guifg=NONE guibg=#c3e6d7 gui=NONE cterm=NONE
+  hi DiffChange guifg=NONE guibg=#c3d1e6 gui=NONE cterm=NONE
+  hi DiffDelete guifg=NONE guibg=#f0cccf gui=NONE cterm=NONE
+  hi DiffRemoved guifg=NONE guibg=#f0cccf gui=NONE cterm=NONE
+  hi DiffText guifg=NONE guibg=#c3e6d7 gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#eff1f4 guibg=NONE gui=NONE cterm=NONE

   hi! link ErrorMsg Error
   hi! link ErrorMsg Error

-  hi Folded guifg=#b6bdcb guibg=#e4e6eb guisp=NONE gui=italic cterm=italic
-  hi IncSearch guifg=#ff8c00 guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-  hi LineNr guifg=#b6bdcb guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
-  hi MatchParen guifg=NONE guibg=#cdd2db guisp=NONE gui=bold cterm=bold
-  hi NonText guifg=#9fa8ba guibg=NONE guisp=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=#37474f guibg=#cdd2db guisp=NONE gui=NONE cterm=NONE
-  hi PmenuSbar guifg=NONE guibg=#cdd2db guisp=NONE gui=NONE cterm=NONE
-  hi PmenuSel guifg=#e4e6eb guibg=#455a64 guisp=NONE gui=bold cterm=bold
-  hi PmenuThumb guifg=NONE guibg=#9fa8ba guisp=NONE gui=NONE cterm=NONE
-  hi Question guifg=#cc7000 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi Folded guifg=#b6bdcb guibg=#e4e6eb gui=italic cterm=NONE
+  hi IncSearch guifg=#ff870e guibg=#1c313a gui=reverse cterm=reverse
+  hi LineNr guifg=#b6bdcb guibg=#e4e6eb gui=NONE cterm=NONE
+  hi SignColumn guifg=NONE guibg=#e4e6eb gui=NONE cterm=NONE
+  hi MatchParen guifg=NONE guibg=#cdd2db gui=bold cterm=bold
+  hi NonText guifg=#9fa8ba guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#37474f guibg=#cdd2db gui=NONE cterm=NONE
+  hi PmenuSbar guifg=NONE guibg=#cdd2db gui=NONE cterm=NONE
+  hi PmenuSel guifg=#e4e6eb guibg=#455a64 gui=bold cterm=bold
+  hi PmenuThumb guifg=NONE guibg=#9fa8ba gui=NONE cterm=NONE
+  hi Question guifg=#cc6c0b guibg=NONE gui=NONE cterm=NONE

   hi! link QuickFixLine Search
   hi! link QuickFixLine Search

-  hi Search guifg=#ffc57f guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-  hi SpecialKey guifg=#9fa8ba guibg=NONE guisp=NONE gui=NONE cterm=NONE
-  hi SpellBad guifg=#ae1528 guibg=NONE guisp=#ae1528 gui=italic,undercurl cterm=italic,undercurl
-  hi SpellCap guifg=#004bb4 guibg=NONE guisp=#004bb4 gui=italic,undercurl cterm=italic,undercurl
-  hi SpellLocal guifg=#008d9a guibg=NONE guisp=#008d9a gui=italic,undercurl cterm=italic,undercurl
-  hi SpellRare guifg=#b300a4 guibg=NONE guisp=#b300a4 gui=italic,undercurl cterm=italic,undercurl
-  hi StatusLine guifg=#cdd2db guibg=#37474f guisp=NONE gui=reverse cterm=reverse
-  hi StatusLineNC guifg=#e4e6eb guibg=#455a64 guisp=NONE gui=reverse cterm=reverse
+  hi Search guifg=#ffb76e guibg=#1c313a gui=reverse cterm=reverse
+  hi SpecialKey guifg=#9fa8ba guibg=NONE gui=NONE cterm=NONE
+  hi SpellBad guifg=#b2000f guibg=NONE gui=italic,undercurl cterm=underline
+  hi SpellCap guifg=#0961a8 guibg=NONE gui=italic,undercurl cterm=underline
+  hi SpellLocal guifg=#1d9fb0 guibg=NONE gui=italic,undercurl cterm=underline
+  hi SpellRare guifg=#7a5ab2 guibg=NONE gui=italic,undercurl cterm=underline
+  hi StatusLine guifg=#37474f guibg=#cdd2db gui=NONE cterm=NONE
+  hi StatusLineNC guifg=#455a64 guibg=#e4e6eb gui=NONE cterm=NONE

   hi! link StatusLineTerm StatusLine
   hi! link StatusLineTermNC StatusLineNC
   hi! link TabLine TabLineFill
   hi! link StatusLineTerm StatusLine
   hi! link StatusLineTermNC StatusLineNC
   hi! link TabLine TabLineFill

-  hi TabLineFill guifg=#455a64 guibg=#b6bdcb guisp=NONE gui=NONE cterm=NONE
-  hi TabLineSel guifg=#37474f guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
-  hi Title guifg=#ae1528 guibg=NONE guisp=NONE gui=bold cterm=bold
-  hi Visual guifg=NONE guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
+  hi TabLineFill guifg=#455a64 guibg=#b6bdcb gui=NONE cterm=NONE
+  hi TabLineSel guifg=#37474f guibg=#e4e6eb gui=NONE cterm=NONE
+  hi Title guifg=#b2000f guibg=NONE gui=bold cterm=bold
+  hi Visual guifg=NONE guibg=#e4e6eb gui=NONE cterm=NONE

   hi! link VisualNOS Visual
   hi! link Boolean Constant
   hi! link Character Constant
   hi! link VisualNOS Visual
   hi! link Boolean Constant
   hi! link Character Constant

-  hi Comment guifg=#546e7a guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi Comment guifg=#546e7a guibg=NONE gui=NONE cterm=NONE

   hi! link Conditional Statement
   hi! link Define PreProc
   hi! link Debug Special
   hi! link Delimiter Special
   hi! link Exception Statement
   hi! link Float Constant
   hi! link Conditional Statement
   hi! link Define PreProc
   hi! link Debug Special
   hi! link Delimiter Special
   hi! link Exception Statement
   hi! link Float Constant

-  hi Ignore guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi Ignore guifg=fg guibg=NONE gui=NONE cterm=NONE

   hi! link Include PreProc
   hi! link Keyword Statement
   hi! link Label Statement
   hi! link Include PreProc
   hi! link Keyword Statement
   hi! link Label Statement


@@ -338,31 +336,31 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   hi! link String Constant
   hi! link Structure Type
   hi! link Tag Special
   hi! link String Constant
   hi! link Structure Type
   hi! link Tag Special

-  hi Type guifg=#007681 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi Type guifg=#198b9a guibg=NONE gui=NONE cterm=NONE

   hi! link Typedef Type
   hi! link Typedef Type

-  hi Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline

   hi! link lCursor Cursor
   hi! link lCursor Cursor

-  hi CursorIM guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi ToolbarLine guifg=NONE guibg=#b6bdcb guisp=NONE gui=NONE cterm=NONE
-  hi ToolbarButton guifg=#2e3440 guibg=#b6bdcb guisp=NONE gui=bold cterm=bold
+  hi CursorIM guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ToolbarLine guifg=NONE guibg=#b6bdcb gui=NONE cterm=NONE
+  hi ToolbarButton guifg=#2e3440 guibg=#b6bdcb gui=bold cterm=bold

   hi! link iCursor Cursor
   hi! link vCursor Cursor
   hi! link iCursor Cursor
   hi! link vCursor Cursor

-  hi NormalMode guifg=#455a64 guibg=#eff1f4 guisp=NONE gui=reverse cterm=reverse
-  hi InsertMode guifg=#004bb4 guibg=#eff1f4 guisp=NONE gui=reverse cterm=reverse
-  hi ReplaceMode guifg=#008d9a guibg=#eff1f4 guisp=NONE gui=reverse cterm=reverse
-  hi VisualMode guifg=#ff8c00 guibg=#eff1f4 guisp=NONE gui=reverse cterm=reverse
-  hi CommandMode guifg=#b300a4 guibg=#eff1f4 guisp=NONE gui=reverse cterm=reverse
-  hi Warnings guifg=#ff8c00 guibg=#eff1f4 guisp=NONE gui=reverse cterm=reverse
+  hi NormalMode guifg=#455a64 guibg=#eff1f4 gui=reverse cterm=reverse
+  hi InsertMode guifg=#0961a8 guibg=#eff1f4 gui=reverse cterm=reverse
+  hi ReplaceMode guifg=#1d9fb0 guibg=#eff1f4 gui=reverse cterm=reverse
+  hi VisualMode guifg=#ff870e guibg=#eff1f4 gui=reverse cterm=reverse
+  hi CommandMode guifg=#7a5ab2 guibg=#eff1f4 gui=reverse cterm=reverse
+  hi Warnings guifg=#ff870e guibg=#eff1f4 gui=reverse cterm=reverse

   if !s:italics
     hi Folded gui=NONE cterm=NONE
   if !s:italics
     hi Folded gui=NONE cterm=NONE

-    hi SpellBad gui=undercurl cterm=undercurl
-    hi SpellCap gui=undercurl cterm=undercurl
-    hi SpellLocal gui=undercurl cterm=undercurl
-    hi SpellRare gui=undercurl cterm=undercurl
+    hi SpellBad gui=undercurl cterm=underline
+    hi SpellCap gui=undercurl cterm=underline
+    hi SpellLocal gui=undercurl cterm=underline
+    hi SpellRare gui=undercurl cterm=underline

   endif
   if has('nvim')
     hi! link TermCursor Cursor
   endif
   if has('nvim')
     hi! link TermCursor Cursor

-    hi TermCursorNC guifg=#e4e6eb guibg=#37474f guisp=NONE gui=NONE cterm=NONE
+    hi TermCursorNC guifg=#e4e6eb guibg=#37474f gui=NONE cterm=NONE

   endif
   unlet s:t_Co s:italics
   finish
   endif
   unlet s:t_Co s:italics
   finish


@@ -391,18 +389,18 @@ if s:t_Co >= 256
         endif
       endif
       hi Conceal ctermfg=67 ctermbg=NONE cterm=NONE
         endif
       endif
       hi Conceal ctermfg=67 ctermbg=NONE cterm=NONE

-      hi Constant ctermfg=29 ctermbg=NONE cterm=NONE
+      hi Constant ctermfg=42 ctermbg=NONE cterm=NONE

       hi Directory ctermfg=67 ctermbg=NONE cterm=bold
       hi Directory ctermfg=67 ctermbg=NONE cterm=bold

-      hi Error ctermfg=160 ctermbg=NONE cterm=bold,reverse
-      hi Function ctermfg=30 ctermbg=NONE cterm=NONE
+      hi Error ctermfg=203 ctermbg=NONE cterm=bold,reverse
+      hi Function ctermfg=80 ctermbg=NONE cterm=NONE

       hi Identifier ctermfg=67 ctermbg=NONE cterm=NONE
       hi ModeMsg ctermfg=67 ctermbg=NONE cterm=NONE
       hi Identifier ctermfg=67 ctermbg=NONE cterm=NONE
       hi ModeMsg ctermfg=67 ctermbg=NONE cterm=NONE

-      hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
-      hi PreProc ctermfg=30 ctermbg=NONE cterm=NONE
-      hi Statement ctermfg=160 ctermbg=NONE cterm=NONE
-      hi Special ctermfg=185 ctermbg=NONE cterm=NONE
-      hi Todo ctermfg=30 ctermbg=NONE cterm=reverse
-      hi WarningMsg ctermfg=160 ctermbg=NONE cterm=NONE
+      hi MoreMsg ctermfg=42 ctermbg=NONE cterm=NONE
+      hi PreProc ctermfg=80 ctermbg=NONE cterm=NONE
+      hi Statement ctermfg=203 ctermbg=NONE cterm=NONE
+      hi Special ctermfg=226 ctermbg=NONE cterm=NONE
+      hi Todo ctermfg=80 ctermbg=NONE cterm=reverse
+      hi WarningMsg ctermfg=203 ctermbg=NONE cterm=NONE

       hi WildMenu ctermfg=67 ctermbg=240 cterm=bold
     else
       if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
       hi WildMenu ctermfg=67 ctermbg=240 cterm=bold
     else
       if !has('gui_running') && get(g:, 'artesanal_transparent', 0)


@@ -413,20 +411,20 @@ if s:t_Co >= 256
           set background=dark
         endif
       endif
           set background=dark
         endif
       endif

-      hi Conceal ctermfg=67 ctermbg=NONE cterm=NONE
-      hi Constant ctermfg=36 ctermbg=NONE cterm=NONE
-      hi Directory ctermfg=67 ctermbg=NONE cterm=bold
-      hi Error ctermfg=167 ctermbg=NONE cterm=bold,reverse
-      hi Function ctermfg=37 ctermbg=NONE cterm=NONE
-      hi Identifier ctermfg=67 ctermbg=NONE cterm=NONE
-      hi ModeMsg ctermfg=67 ctermbg=NONE cterm=NONE
-      hi MoreMsg ctermfg=36 ctermbg=NONE cterm=NONE
-      hi PreProc ctermfg=37 ctermbg=NONE cterm=NONE
-      hi Statement ctermfg=167 ctermbg=NONE cterm=NONE
+      hi Conceal ctermfg=153 ctermbg=NONE cterm=NONE
+      hi Constant ctermfg=85 ctermbg=NONE cterm=NONE
+      hi Directory ctermfg=153 ctermbg=NONE cterm=bold
+      hi Error ctermfg=203 ctermbg=NONE cterm=bold,reverse
+      hi Function ctermfg=116 ctermbg=NONE cterm=NONE
+      hi Identifier ctermfg=153 ctermbg=NONE cterm=NONE
+      hi ModeMsg ctermfg=153 ctermbg=NONE cterm=NONE
+      hi MoreMsg ctermfg=85 ctermbg=NONE cterm=NONE
+      hi PreProc ctermfg=116 ctermbg=NONE cterm=NONE
+      hi Statement ctermfg=203 ctermbg=NONE cterm=NONE

       hi Special ctermfg=228 ctermbg=NONE cterm=NONE
       hi Special ctermfg=228 ctermbg=NONE cterm=NONE

-      hi Todo ctermfg=37 ctermbg=NONE cterm=reverse
-      hi WarningMsg ctermfg=167 ctermbg=NONE cterm=NONE
-      hi WildMenu ctermfg=67 ctermbg=240 cterm=bold
+      hi Todo ctermfg=116 ctermbg=NONE cterm=reverse
+      hi WarningMsg ctermfg=203 ctermbg=NONE cterm=NONE
+      hi WildMenu ctermfg=153 ctermbg=240 cterm=bold

     endif
     if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
       hi CursorLineNr ctermfg=228 ctermbg=NONE cterm=NONE
     endif
     if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
       hi CursorLineNr ctermfg=228 ctermbg=NONE cterm=NONE


@@ -441,41 +439,42 @@ if s:t_Co >= 256
     endif
     hi ColorColumn ctermfg=NONE ctermbg=238 cterm=bold
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     endif
     hi ColorColumn ctermfg=NONE ctermbg=238 cterm=bold
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse

-    hi! link CursorColumn CursorLine
-    hi CursorLine ctermfg=NONE ctermbg=238 cterm=NONE
-    hi DiffAdd ctermfg=NONE ctermbg=36 cterm=NONE
-    hi DiffAdded ctermfg=NONE ctermbg=36 cterm=NONE
-    hi DiffChange ctermfg=NONE ctermbg=110 cterm=NONE
-    hi DiffDelete ctermfg=NONE ctermbg=167 cterm=NONE
-    hi DiffRemoved ctermfg=NONE ctermbg=167 cterm=NONE
-    hi DiffText ctermfg=NONE ctermbg=36 cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=238 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=238 cterm=bold
+    hi DiffAdd ctermfg=NONE ctermbg=23 cterm=NONE
+    hi DiffAdded ctermfg=NONE ctermbg=23 cterm=NONE
+    hi DiffChange ctermfg=NONE ctermbg=24 cterm=NONE
+    hi DiffDelete ctermfg=NONE ctermbg=95 cterm=NONE
+    hi DiffRemoved ctermfg=NONE ctermbg=95 cterm=NONE
+    hi DiffText ctermfg=NONE ctermbg=23 cterm=NONE

     hi EndOfBuffer ctermfg=236 ctermbg=NONE cterm=NONE
     hi! link ErrorMsg Error
     hi Folded ctermfg=242 ctermbg=238 cterm=NONE
     hi EndOfBuffer ctermfg=236 ctermbg=NONE cterm=NONE
     hi! link ErrorMsg Error
     hi Folded ctermfg=242 ctermbg=238 cterm=NONE

-    hi IncSearch ctermfg=228 ctermbg=233 cterm=reverse
+    hi IncSearch ctermfg=228 ctermbg=236 cterm=reverse

     hi LineNr ctermfg=242 ctermbg=238 cterm=NONE
     hi LineNr ctermfg=242 ctermbg=238 cterm=NONE

+    hi SignColumn ctermfg=NONE ctermbg=238 cterm=NONE

     hi MatchParen ctermfg=NONE ctermbg=240 cterm=bold
     hi NonText ctermfg=247 ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=254 ctermbg=240 cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=240 cterm=NONE
     hi PmenuSel ctermfg=238 ctermbg=252 cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=247 cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=240 cterm=bold
     hi NonText ctermfg=247 ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=254 ctermbg=240 cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=240 cterm=NONE
     hi PmenuSel ctermfg=238 ctermbg=252 cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=247 cterm=NONE

-    hi Question ctermfg=185 ctermbg=NONE cterm=NONE
+    hi Question ctermfg=226 ctermbg=NONE cterm=NONE

     hi! link QuickFixLine Search
     hi! link QuickFixLine Search

-    hi Search ctermfg=229 ctermbg=233 cterm=reverse
+    hi Search ctermfg=230 ctermbg=236 cterm=reverse

     hi SpecialKey ctermfg=247 ctermbg=NONE cterm=NONE
     hi SpecialKey ctermfg=247 ctermbg=NONE cterm=NONE

-    hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline
-    hi SpellCap ctermfg=67 ctermbg=NONE cterm=underline
-    hi SpellLocal ctermfg=37 ctermbg=NONE cterm=underline
-    hi SpellRare ctermfg=206 ctermbg=NONE cterm=underline
-    hi StatusLine ctermfg=240 ctermbg=254 cterm=reverse
-    hi StatusLineNC ctermfg=238 ctermbg=252 cterm=reverse
+    hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=153 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=116 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=140 ctermbg=NONE cterm=underline
+    hi StatusLine ctermfg=254 ctermbg=240 cterm=NONE
+    hi StatusLineNC ctermfg=252 ctermbg=238 cterm=NONE

     hi! link StatusLineTerm StatusLine
     hi! link StatusLineTermNC StatusLineNC
     hi! link TabLine TabLineFill
     hi TabLineFill ctermfg=252 ctermbg=242 cterm=NONE
     hi TabLineSel ctermfg=254 ctermbg=238 cterm=NONE
     hi! link StatusLineTerm StatusLine
     hi! link StatusLineTermNC StatusLineNC
     hi! link TabLine TabLineFill
     hi TabLineFill ctermfg=252 ctermbg=242 cterm=NONE
     hi TabLineSel ctermfg=254 ctermbg=238 cterm=NONE

-    hi Title ctermfg=167 ctermbg=NONE cterm=bold
+    hi Title ctermfg=203 ctermbg=NONE cterm=bold

     hi Visual ctermfg=NONE ctermbg=238 cterm=NONE
     hi! link VisualNOS Visual
     hi! link Boolean Constant
     hi Visual ctermfg=NONE ctermbg=238 cterm=NONE
     hi! link VisualNOS Visual
     hi! link Boolean Constant


@@ -502,7 +501,7 @@ if s:t_Co >= 256
     hi! link String Constant
     hi! link Structure Type
     hi! link Tag Special
     hi! link String Constant
     hi! link Structure Type
     hi! link Tag Special

-    hi Type ctermfg=30 ctermbg=NONE cterm=NONE
+    hi Type ctermfg=80 ctermbg=NONE cterm=NONE

     hi! link Typedef Type
     hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
     hi! link lCursor Cursor
     hi! link Typedef Type
     hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
     hi! link lCursor Cursor


@@ -512,10 +511,10 @@ if s:t_Co >= 256
     hi! link iCursor Cursor
     hi! link vCursor Cursor
     hi NormalMode ctermfg=252 ctermbg=236 cterm=reverse
     hi! link iCursor Cursor
     hi! link vCursor Cursor
     hi NormalMode ctermfg=252 ctermbg=236 cterm=reverse

-    hi InsertMode ctermfg=67 ctermbg=236 cterm=reverse
-    hi ReplaceMode ctermfg=37 ctermbg=236 cterm=reverse
+    hi InsertMode ctermfg=153 ctermbg=236 cterm=reverse
+    hi ReplaceMode ctermfg=116 ctermbg=236 cterm=reverse

     hi VisualMode ctermfg=228 ctermbg=236 cterm=reverse
     hi VisualMode ctermfg=228 ctermbg=236 cterm=reverse

-    hi CommandMode ctermfg=206 ctermbg=236 cterm=reverse
+    hi CommandMode ctermfg=140 ctermbg=236 cterm=reverse

     hi Warnings ctermfg=228 ctermbg=236 cterm=reverse
     if has('nvim')
       hi! link TermCursor Cursor
     hi Warnings ctermfg=228 ctermbg=236 cterm=reverse
     if has('nvim')
       hi! link TermCursor Cursor


@@ -559,20 +558,20 @@ if s:t_Co >= 256
     else
       hi Normal ctermfg=238 ctermbg=255 cterm=NONE
     endif
     else
       hi Normal ctermfg=238 ctermbg=255 cterm=NONE
     endif

-    hi Conceal ctermfg=26 ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=35 ctermbg=NONE cterm=NONE
-    hi Directory ctermfg=26 ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=25 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=29 ctermbg=NONE cterm=NONE
+    hi Directory ctermfg=25 ctermbg=NONE cterm=bold

     hi Error ctermfg=124 ctermbg=NONE cterm=bold,reverse
     hi Error ctermfg=124 ctermbg=NONE cterm=bold,reverse

-    hi Function ctermfg=30 ctermbg=NONE cterm=NONE
-    hi Identifier ctermfg=26 ctermbg=NONE cterm=NONE
-    hi ModeMsg ctermfg=26 ctermbg=NONE cterm=NONE
-    hi MoreMsg ctermfg=35 ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=30 ctermbg=NONE cterm=NONE
+    hi Function ctermfg=37 ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=25 ctermbg=NONE cterm=NONE
+    hi ModeMsg ctermfg=25 ctermbg=NONE cterm=NONE
+    hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=37 ctermbg=NONE cterm=NONE

     hi Statement ctermfg=124 ctermbg=NONE cterm=NONE
     hi Special ctermfg=208 ctermbg=NONE cterm=NONE
     hi Statement ctermfg=124 ctermbg=NONE cterm=NONE
     hi Special ctermfg=208 ctermbg=NONE cterm=NONE

-    hi Todo ctermfg=30 ctermbg=NONE cterm=reverse
+    hi Todo ctermfg=37 ctermbg=NONE cterm=reverse

     hi WarningMsg ctermfg=124 ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=124 ctermbg=NONE cterm=NONE

-    hi WildMenu ctermfg=26 ctermbg=252 cterm=bold
+    hi WildMenu ctermfg=25 ctermbg=252 cterm=bold

   endif
   if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
     hi CursorLineNr ctermfg=208 ctermbg=NONE cterm=NONE
   endif
   if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
     hi CursorLineNr ctermfg=208 ctermbg=NONE cterm=NONE


@@ -587,19 +586,20 @@ if s:t_Co >= 256
   endif
   hi ColorColumn ctermfg=NONE ctermbg=254 cterm=bold
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   endif
   hi ColorColumn ctermfg=NONE ctermbg=254 cterm=bold
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse

-  hi! link CursorColumn CursorLine
-  hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=254 cterm=bold

   hi DiffAdd ctermfg=NONE ctermbg=152 cterm=NONE
   hi DiffAdded ctermfg=NONE ctermbg=152 cterm=NONE
   hi DiffChange ctermfg=NONE ctermbg=153 cterm=NONE
   hi DiffAdd ctermfg=NONE ctermbg=152 cterm=NONE
   hi DiffAdded ctermfg=NONE ctermbg=152 cterm=NONE
   hi DiffChange ctermfg=NONE ctermbg=153 cterm=NONE

-  hi DiffDelete ctermfg=NONE ctermbg=181 cterm=NONE
-  hi DiffRemoved ctermfg=NONE ctermbg=181 cterm=NONE
+  hi DiffDelete ctermfg=NONE ctermbg=224 cterm=NONE
+  hi DiffRemoved ctermfg=NONE ctermbg=224 cterm=NONE

   hi DiffText ctermfg=NONE ctermbg=152 cterm=NONE
   hi EndOfBuffer ctermfg=255 ctermbg=NONE cterm=NONE
   hi! link ErrorMsg Error
   hi Folded ctermfg=250 ctermbg=254 cterm=NONE
   hi DiffText ctermfg=NONE ctermbg=152 cterm=NONE
   hi EndOfBuffer ctermfg=255 ctermbg=NONE cterm=NONE
   hi! link ErrorMsg Error
   hi Folded ctermfg=250 ctermbg=254 cterm=NONE

-  hi IncSearch ctermfg=208 ctermbg=233 cterm=reverse
+  hi IncSearch ctermfg=208 ctermbg=236 cterm=reverse

   hi LineNr ctermfg=250 ctermbg=254 cterm=NONE
   hi LineNr ctermfg=250 ctermbg=254 cterm=NONE

+  hi SignColumn ctermfg=NONE ctermbg=254 cterm=NONE

   hi MatchParen ctermfg=NONE ctermbg=252 cterm=bold
   hi NonText ctermfg=248 ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=238 ctermbg=252 cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=252 cterm=bold
   hi NonText ctermfg=248 ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=238 ctermbg=252 cterm=NONE


@@ -608,14 +608,14 @@ if s:t_Co >= 256
   hi PmenuThumb ctermfg=NONE ctermbg=248 cterm=NONE
   hi Question ctermfg=166 ctermbg=NONE cterm=NONE
   hi! link QuickFixLine Search
   hi PmenuThumb ctermfg=NONE ctermbg=248 cterm=NONE
   hi Question ctermfg=166 ctermbg=NONE cterm=NONE
   hi! link QuickFixLine Search

-  hi Search ctermfg=215 ctermbg=233 cterm=reverse
+  hi Search ctermfg=215 ctermbg=236 cterm=reverse

   hi SpecialKey ctermfg=248 ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=124 ctermbg=NONE cterm=underline
   hi SpecialKey ctermfg=248 ctermbg=NONE cterm=NONE
   hi SpellBad ctermfg=124 ctermbg=NONE cterm=underline

-  hi SpellCap ctermfg=26 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=30 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=127 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=252 ctermbg=238 cterm=reverse
-  hi StatusLineNC ctermfg=254 ctermbg=240 cterm=reverse
+  hi SpellCap ctermfg=25 ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=37 ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=97 ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=238 ctermbg=252 cterm=NONE
+  hi StatusLineNC ctermfg=240 ctermbg=254 cterm=NONE

   hi! link StatusLineTerm StatusLine
   hi! link StatusLineTermNC StatusLineNC
   hi! link TabLine TabLineFill
   hi! link StatusLineTerm StatusLine
   hi! link StatusLineTermNC StatusLineNC
   hi! link TabLine TabLineFill


@@ -658,10 +658,10 @@ if s:t_Co >= 256
   hi! link iCursor Cursor
   hi! link vCursor Cursor
   hi NormalMode ctermfg=240 ctermbg=255 cterm=reverse
   hi! link iCursor Cursor
   hi! link vCursor Cursor
   hi NormalMode ctermfg=240 ctermbg=255 cterm=reverse

-  hi InsertMode ctermfg=26 ctermbg=255 cterm=reverse
-  hi ReplaceMode ctermfg=30 ctermbg=255 cterm=reverse
+  hi InsertMode ctermfg=25 ctermbg=255 cterm=reverse
+  hi ReplaceMode ctermfg=37 ctermbg=255 cterm=reverse

   hi VisualMode ctermfg=208 ctermbg=255 cterm=reverse
   hi VisualMode ctermfg=208 ctermbg=255 cterm=reverse

-  hi CommandMode ctermfg=127 ctermbg=255 cterm=reverse
+  hi CommandMode ctermfg=97 ctermbg=255 cterm=reverse

   hi Warnings ctermfg=208 ctermbg=255 cterm=reverse
   if has('nvim')
     hi! link TermCursor Cursor
   hi Warnings ctermfg=208 ctermbg=255 cterm=reverse
   if has('nvim')
     hi! link TermCursor Cursor


@@ -735,8 +735,8 @@ if s:t_Co >= 16
     endif
     hi ColorColumn ctermfg=NONE ctermbg=Black cterm=bold
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     endif
     hi ColorColumn ctermfg=NONE ctermbg=Black cterm=bold
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse

-    hi! link CursorColumn CursorLine
-    hi CursorLine ctermfg=NONE ctermbg=Black cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=Black cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=Black cterm=bold

     hi DiffAdd ctermfg=NONE ctermbg=Green cterm=NONE
     hi DiffAdded ctermfg=NONE ctermbg=Green cterm=NONE
     hi DiffChange ctermfg=NONE ctermbg=Blue cterm=NONE
     hi DiffAdd ctermfg=NONE ctermbg=Green cterm=NONE
     hi DiffAdded ctermfg=NONE ctermbg=Green cterm=NONE
     hi DiffChange ctermfg=NONE ctermbg=Blue cterm=NONE


@@ -748,6 +748,7 @@ if s:t_Co >= 16
     hi Folded ctermfg=DarkGrey ctermbg=Black cterm=NONE
     hi IncSearch ctermfg=Yellow ctermbg=Black cterm=reverse
     hi LineNr ctermfg=DarkGrey ctermbg=Black cterm=NONE
     hi Folded ctermfg=DarkGrey ctermbg=Black cterm=NONE
     hi IncSearch ctermfg=Yellow ctermbg=Black cterm=reverse
     hi LineNr ctermfg=DarkGrey ctermbg=Black cterm=NONE

+    hi SignColumn ctermfg=NONE ctermbg=Black cterm=NONE

     hi MatchParen ctermfg=NONE ctermbg=DarkGrey cterm=bold
     hi NonText ctermfg=LightGrey ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=White ctermbg=DarkGrey cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=DarkGrey cterm=bold
     hi NonText ctermfg=LightGrey ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=White ctermbg=DarkGrey cterm=NONE


@@ -762,8 +763,8 @@ if s:t_Co >= 16
     hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline

-    hi StatusLine ctermfg=DarkGrey ctermbg=White cterm=reverse
-    hi StatusLineNC ctermfg=Black ctermbg=LightGrey cterm=reverse
+    hi StatusLine ctermfg=White ctermbg=DarkGrey cterm=NONE
+    hi StatusLineNC ctermfg=LightGrey ctermbg=Black cterm=NONE

     hi! link StatusLineTerm StatusLine
     hi! link StatusLineTermNC StatusLineNC
     hi! link TabLine TabLineFill
     hi! link StatusLineTerm StatusLine
     hi! link StatusLineTermNC StatusLineNC
     hi! link TabLine TabLineFill


@@ -881,8 +882,8 @@ if s:t_Co >= 16
   endif
   hi ColorColumn ctermfg=NONE ctermbg=White cterm=bold
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   endif
   hi ColorColumn ctermfg=NONE ctermbg=White cterm=bold
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse

-  hi! link CursorColumn CursorLine
-  hi CursorLine ctermfg=NONE ctermbg=White cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=White cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=White cterm=bold

   hi DiffAdd ctermfg=NONE ctermbg=LightGreen cterm=NONE
   hi DiffAdded ctermfg=NONE ctermbg=LightGreen cterm=NONE
   hi DiffChange ctermfg=NONE ctermbg=LightBlue cterm=NONE
   hi DiffAdd ctermfg=NONE ctermbg=LightGreen cterm=NONE
   hi DiffAdded ctermfg=NONE ctermbg=LightGreen cterm=NONE
   hi DiffChange ctermfg=NONE ctermbg=LightBlue cterm=NONE


@@ -894,6 +895,7 @@ if s:t_Co >= 16
   hi Folded ctermfg=DarkGrey ctermbg=White cterm=NONE
   hi IncSearch ctermfg=Yellow ctermbg=Black cterm=reverse
   hi LineNr ctermfg=DarkGrey ctermbg=White cterm=NONE
   hi Folded ctermfg=DarkGrey ctermbg=White cterm=NONE
   hi IncSearch ctermfg=Yellow ctermbg=Black cterm=reverse
   hi LineNr ctermfg=DarkGrey ctermbg=White cterm=NONE

+  hi SignColumn ctermfg=NONE ctermbg=White cterm=NONE

   hi MatchParen ctermfg=NONE ctermbg=LightGrey cterm=bold
   hi NonText ctermfg=DarkGrey ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=Black ctermbg=LightGrey cterm=NONE
   hi MatchParen ctermfg=NONE ctermbg=LightGrey cterm=bold
   hi NonText ctermfg=DarkGrey ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=Black ctermbg=LightGrey cterm=NONE


@@ -908,8 +910,8 @@ if s:t_Co >= 16
   hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline

-  hi StatusLine ctermfg=LightGrey ctermbg=Black cterm=reverse
-  hi StatusLineNC ctermfg=White ctermbg=DarkGrey cterm=reverse
+  hi StatusLine ctermfg=Black ctermbg=LightGrey cterm=NONE
+  hi StatusLineNC ctermfg=DarkGrey ctermbg=White cterm=NONE

   hi! link StatusLineTerm StatusLine
   hi! link StatusLineTermNC StatusLineNC
   hi! link TabLine TabLineFill
   hi! link StatusLineTerm StatusLine
   hi! link StatusLineTermNC StatusLineNC
   hi! link TabLine TabLineFill


@@ -976,30 +978,30 @@ endif
 " Color: bg2 #cdd2db ~   LightGrey
 " Color: bg3 #b6bdcb ~   DarkGrey
 " Color: bg4 #9fa8ba ~   DarkGrey
 " Color: bg2 #cdd2db ~   LightGrey
 " Color: bg3 #b6bdcb ~   DarkGrey
 " Color: bg4 #9fa8ba ~   DarkGrey

-" Color: black                #121419     ~        Black
+" Color: black                #1c313a     ~        Black

 " Color: realblack            #000000     ~        Black
 " Color: darkgray             #575c66     ~        DarkGray
 " Color: realblack            #000000     ~        Black
 " Color: darkgray             #575c66     ~        DarkGray

-" Color: red                  #ae1528     ~        Red
-" Color: brightred            #ddabbc     ~        LightRed
-" Color: darkred              #971223     ~        DarkRed
-" Color: diffred              #ddabbc     ~        LightRed
-" Color: green                #009a5a     ~        Green
-" Color: brightgreen          #abddcc     ~        LightGreen
-" Color: darkgreen            #00814b     ~        DarkGreen
-" Color: diffgreen            #abddcc     ~        LightGreen
-" Color: yellow               #ff8c00     ~        Yellow
-" Color: brightyellow         #ffc57f     ~        LightYellow
-" Color: darkyellow           #cc7000     ~        DarkYellow
-" Color: blue                 #004bb4     ~        Blue
-" Color: brightblue           #aec0e0     ~        LightBlue
-" Color: darkblue             #00409b     ~        DarkBlue
-" Color: diffblue             #aec0e0     ~        LightBlue
-" Color: magenta              #b300a4     ~        Magenta
-" Color: brightmagenta        #fc86ec     ~        LightMagenta
-" Color: darkmagenta          #9a008d     ~        DarkMagenta
-" Color: cyan                 #008d9a     ~        Cyan
-" Color: brightcyan           #00d3e7     ~        LightCyan
-" Color: darkcyan             #007681     ~        DarkCyan
+" Color: red                  #b2000f     ~        Red
+" Color: brightred            #f0cccf     ~        LightRed
+" Color: darkred              #99000d     ~        DarkRed
+" Color: diffred              #f0cccf     ~        LightRed
+" Color: green                #0e8756     ~        Green
+" Color: brightgreen          #c3e6d7     ~        LightGreen
+" Color: darkgreen            #0c7047     ~        DarkGreen
+" Color: diffgreen            #c3e6d7     ~        LightGreen
+" Color: yellow               #ff870e     ~        Yellow
+" Color: brightyellow         #ffb76e     ~        LightYellow
+" Color: darkyellow           #cc6c0b     ~        DarkYellow
+" Color: blue                 #0961a8     ~        Blue
+" Color: brightblue           #c3d1e6     ~        LightBlue
+" Color: darkblue             #064578     ~        DarkBlue
+" Color: diffblue             #c3d1e6     ~        LightBlue
+" Color: magenta              #7a5ab2     ~        Magenta
+" Color: brightmagenta        #e1bee7     ~        LightMagenta
+" Color: darkmagenta          #5f468a     ~        DarkMagenta
+" Color: cyan                 #1d9fb0     ~        Cyan
+" Color: brightcyan           #62ebff     ~        LightCyan
+" Color: darkcyan             #198b9a     ~        DarkCyan

 " Color: white                #eff1f4     ~        White
 " Color: brightwhite          #ffffff     ~        White
 " Term Colors: black darkred darkgreen darkyellow darkblue darkmagenta darkcyan white
 " Color: white                #eff1f4     ~        White
 " Color: brightwhite          #ffffff     ~        White
 " Term Colors: black darkred darkgreen darkyellow darkblue darkmagenta darkcyan white


@@ -1015,30 +1017,30 @@ endif
 " Color: bg2 #455a64 ~   DarkGrey
 " Color: bg3 #546e7a ~   DarkGrey
 " Color: bg4 #90a4ae ~   LightGrey
 " Color: bg2 #455a64 ~   DarkGrey
 " Color: bg3 #546e7a ~   DarkGrey
 " Color: bg4 #90a4ae ~   LightGrey

-" Color: black                #121419     ~        Black
+" Color: black                #1c313a     ~        Black

 " Color: realblack            #000000     ~        Black
 " Color: darkgray             #575c66     ~        DarkGray
 " Color: realblack            #000000     ~        Black
 " Color: darkgray             #575c66     ~        DarkGray

-" Color: red                  #e84256     ~        Red
-" Color: brightred            #ddabbc     ~        LightRed
-" Color: darkred              #dc1b33     ~        DarkRed
-" Color: diffred              #d05a69     ~        Red
-" Color: green                #00bf8a     ~        Green
-" Color: brightgreen          #abddcc     ~        LightGreen
-" Color: darkgreen            #008c65     ~        DarkGreen
-" Color: diffgreen            #259a7a     ~        Green
-" Color: yellow               #fff176     ~        Yellow
-" Color: brightyellow         #ffffa8     ~        LightYellow
-" Color: darkyellow           #e5d85c     ~        DarkYellow
-" Color: blue                 #6699cc     ~        Blue
-" Color: brightblue           #aec0e0     ~        LightBlue
-" Color: darkblue             #517aa3     ~        DarkBlue
-" Color: diffblue             #7e99b4     ~        Blue
-" Color: magenta              #fa75e2     ~        Magenta
-" Color: brightmagenta        #fc86ec     ~        LightMagenta
-" Color: darkmagenta          #f844d8     ~        DarkMagenta
-" Color: cyan                 #00bbcc     ~        Cyan
-" Color: brightcyan           #99eaea     ~        LightCyan
-" Color: darkcyan             #0095a3     ~        DarkCyan
+" Color: red                  #ff616f     ~        Red
+" Color: brightred            #ffcdd2     ~        LightRed
+" Color: darkred              #ef5350     ~        DarkRed
+" Color: diffred              #663d43     ~        Red
+" Color: green                #69f0b9     ~        Green
+" Color: brightgreen          #9fffe0     ~        LightGreen
+" Color: darkgreen            #15cf83     ~        DarkGreen
+" Color: diffgreen            #3f7070     ~        Green
+" Color: yellow               #ffff8d     ~        Yellow
+" Color: brightyellow         #fff9c4     ~        LightYellow
+" Color: darkyellow           #ffeb3b     ~        DarkYellow
+" Color: blue                 #90caf9     ~        Blue
+" Color: brightblue           #bbdefb     ~        LightBlue
+" Color: darkblue             #5d99c6     ~        DarkBlue
+" Color: diffblue             #3f5a70     ~        Blue
+" Color: magenta              #b39ddb     ~        Magenta
+" Color: brightmagenta        #ce93d8     ~        LightMagenta
+" Color: darkmagenta          #9575cd     ~        DarkMagenta
+" Color: cyan                 #80deea     ~        Cyan
+" Color: brightcyan           #b2ebf2     ~        LightCyan
+" Color: darkcyan             #4dd0e1     ~        DarkCyan

 " Color: white                #eff1f4     ~        White
 " Color: brightwhite          #ffffff     ~        White
 " Term Colors: darkgray red green yellow blue magenta cyan brightwhite
 " Color: white                #eff1f4     ~        White
 " Color: brightwhite          #ffffff     ~        White
 " Term Colors: darkgray red green yellow blue magenta cyan brightwhite

diff --git a/doc/artesanal.txt b/doc/artesanal.txt
index e90c6842a77475db793ef4e3c60c40a1559d07c1..02dea0f18bca4aef5878ccc6eec12a5f5cb64b69 100644 (file)
--- a/doc/artesanal.txt
+++ b/doc/artesanal.txt
@@ -1,4 +1,4 @@
-*artesanal.txt*       For Vim version 8.2       Last change: 2020 Jun 05
+*artesanal.txt*       For Vim version 8.2       Last change: 2021 Feb 25

 
 
                 Artesanal color scheme    by Stefan Wimmer <wimstefan@gmail.com>
 
 
                 Artesanal color scheme    by Stefan Wimmer <wimstefan@gmail.com>

diff --git a/templates/_common.colortemplate b/templates/_common.colortemplate
index 52e5bbaa8c9db29b34d2dfe2244f24f11c3a3ca0..f67832fa9e4eb42259c9d908899c9ea48aa92624 100644 (file)
--- a/templates/_common.colortemplate
+++ b/templates/_common.colortemplate
@@ -1,8 +1,8 @@
-# vim: ft=colortemplate fdm=marker
+; vim: ft=colortemplate fdm=marker

 
 

-# Default highlight groups {{{
+; Default highlight groups {{{

 #if !has('gui_running') && get(g:, '@optionprefix_dimmed', 0)
 #if !has('gui_running') && get(g:, '@optionprefix_dimmed', 0)

-  # dimmed colours
+  ; dimmed colours

   #if !has('gui_running') && &background ==# 'light'
     #if !has('gui_running') && get(g:, '@optionprefix_transparent', 0)
       Normal                       realblack    none
   #if !has('gui_running') && &background ==# 'light'
     #if !has('gui_running') && get(g:, '@optionprefix_transparent', 0)
       Normal                       realblack    none


@@ -18,8 +18,8 @@
   #endif
   Conceal                          darkblue     none
   Constant                         darkgreen    none
   #endif
   Conceal                          darkblue     none
   Constant                         darkgreen    none

-  Directory                        darkblue     none    bold
-  Error                            darkred      none    t=reverse,bold g=standout,bold
+  Directory                        darkblue     none     bold
+  Error                            darkred      none     t=reverse,bold g=standout,bold

   Function                         darkcyan     none
   Identifier                       darkblue     none
   ModeMsg                          darkblue     none
   Function                         darkcyan     none
   Identifier                       darkblue     none
   ModeMsg                          darkblue     none


@@ -27,11 +27,11 @@
   PreProc                          darkcyan     none
   Statement                        darkred      none
   Special                          darkyellow   none
   PreProc                          darkcyan     none
   Statement                        darkred      none
   Special                          darkyellow   none

-  Todo                             darkcyan     none    reverse
+  Todo                             darkcyan     none     reverse

   WarningMsg                       darkred      none
   WarningMsg                       darkred      none

-  WildMenu                         darkblue     bg2     bold
+  WildMenu                         darkblue     bg2      bold

 #else
 #else

-  # default colours
+  ; default colours

   #if !has('gui_running') && get(g:, '@optionprefix_transparent', 0)
     Normal                         fg1          none
   #else
   #if !has('gui_running') && get(g:, '@optionprefix_transparent', 0)
     Normal                         fg1          none
   #else


@@ -39,8 +39,8 @@
   #endif
   Conceal                          blue         none
   Constant                         green        none
   #endif
   Conceal                          blue         none
   Constant                         green        none

-  Directory                        blue         none    bold
-  Error                            red          none    t=reverse,bold g=standout,bold
+  Directory                        blue         none     bold
+  Error                            red          none     t=reverse,bold g=standout,bold

   Function                         cyan         none
   Identifier                       blue         none
   ModeMsg                          blue         none
   Function                         cyan         none
   Identifier                       blue         none
   ModeMsg                          blue         none


@@ -48,29 +48,29 @@
   PreProc                          cyan         none
   Statement                        red          none
   Special                          yellow       none
   PreProc                          cyan         none
   Statement                        red          none
   Special                          yellow       none

-  Todo                             cyan         none    reverse
+  Todo                             cyan         none     reverse

   WarningMsg                       red          none
   WarningMsg                       red          none

-  WildMenu                         blue         bg2     bold
+  WildMenu                         blue         bg2      bold

 #endif
 #if !has('gui_running') && get(g:, '@optionprefix_transparent', 0)
 #endif
 #if !has('gui_running') && get(g:, '@optionprefix_transparent', 0)

-  # transparent background
+  ; transparent background

   CursorLineNr                     yellow       none
   FoldColumn                       darkgray     none
   SignColumn                       fg2          none
   VertSplit                        bg3          none
 #else
   CursorLineNr                     yellow       none
   FoldColumn                       darkgray     none
   SignColumn                       fg2          none
   VertSplit                        bg3          none
 #else

-  # opaque background
+  ; opaque background

   CursorLineNr                     yellow       bg1
   FoldColumn                       darkgray     bg1
   SignColumn                       fg2          bg1
   VertSplit                        bg3          bg0
 #endif
 
   CursorLineNr                     yellow       bg1
   FoldColumn                       darkgray     bg1
   SignColumn                       fg2          bg1
   VertSplit                        bg3          bg0
 #endif
 

-# Group                          Fg           Bg      Attributes
-ColorColumn                      none         bg1     bold
-Cursor                           none         none    reverse,bold
-CursorColumn                  -> CursorLine
-CursorLine                       none         bg1
+; Group                          Fg           Bg         Attributes
+ColorColumn                      none         bg1        bold
+Cursor                           none         none       reverse,bold
+CursorColumn                     none         bg1
+CursorLine                       none         bg1       bold

 DiffAdd                          none         diffgreen
 DiffAdded                        none         diffgreen
 DiffChange                       none         diffblue
 DiffAdd                          none         diffgreen
 DiffAdded                        none         diffgreen
 DiffChange                       none         diffblue


@@ -79,34 +79,35 @@ DiffRemoved                      none         diffred
 DiffText                         none         diffgreen
 EndOfBuffer                      bg0          none
 ErrorMsg                      -> Error
 DiffText                         none         diffgreen
 EndOfBuffer                      bg0          none
 ErrorMsg                      -> Error

-Folded                           bg3          bg1     g=italic
-IncSearch                        yellow       black   reverse
+Folded                           bg3          bg1        g=italic
+IncSearch                        yellow       black      reverse

 LineNr                           bg3          bg1
 LineNr                           bg3          bg1

-MatchParen                       none         bg2     bold
+SignColumn                       none         bg1
+MatchParen                       none         bg2        bold

 NonText                          bg4          none
 Pmenu                            fg1          bg2
 PmenuSbar                        none         bg2
 NonText                          bg4          none
 Pmenu                            fg1          bg2
 PmenuSbar                        none         bg2

-PmenuSel                         bg1          fg2    bold
+PmenuSel                         bg1          fg2        bold

 PmenuThumb                       none         bg4
 Question                         darkyellow   none
 QuickFixLine                  -> Search
 PmenuThumb                       none         bg4
 Question                         darkyellow   none
 QuickFixLine                  -> Search

-Search                           brightyellow black   reverse
+Search                           brightyellow black      reverse

 SpecialKey                       bg4          none
 SpecialKey                       bg4          none

-SpellBad                         red          none    t=underline g=italic,undercurl s=red
-SpellCap                         blue         none    t=underline g=italic,undercurl s=blue
-SpellLocal                       cyan         none    t=underline g=italic,undercurl s=cyan
-SpellRare                        magenta      none    t=underline g=italic,undercurl s=magenta
-StatusLine                       bg2          fg1     reverse
-StatusLineNC                     bg1          fg2     reverse
+SpellBad                         red          none       t=underline g=italic,undercurl
+SpellCap                         blue         none       t=underline g=italic,undercurl
+SpellLocal                       cyan         none       t=underline g=italic,undercurl
+SpellRare                        magenta      none       t=underline g=italic,undercurl
+StatusLine                       fg1          bg2
+StatusLineNC                     fg2          bg1

 StatusLineTerm                -> StatusLine
 StatusLineTermNC              -> StatusLineNC
 TabLine                       -> TabLineFill
 TabLineFill                      fg2          bg3
 TabLineSel                       fg1          bg1
 StatusLineTerm                -> StatusLine
 StatusLineTermNC              -> StatusLineNC
 TabLine                       -> TabLineFill
 TabLineFill                      fg2          bg3
 TabLineSel                       fg1          bg1

-Title                            red          none   bold
+Title                            red          none       bold

 Visual                           none         bg1
 VisualNOS                     -> Visual
 Visual                           none         bg1
 VisualNOS                     -> Visual

-# Other conventional group names (see `:help group-name`)
+; Other conventional group names (see `:help group-name`)

 Boolean                       -> Constant
 Character                     -> Constant
 Comment                          fg3          none
 Boolean                       -> Constant
 Character                     -> Constant
 Comment                          fg3          none


@@ -133,33 +134,33 @@ Structure                     -> Type
 Tag                           -> Special
 Type                             darkcyan     none
 Typedef                       -> Type
 Tag                           -> Special
 Type                             darkcyan     none
 Typedef                       -> Type

-Underlined                       none         none    underline
-# Language mapping cursor
+Underlined                       none         none       underline
+; Language mapping cursor

 lCursor                       -> Cursor
 lCursor                       -> Cursor

-# See `:help CursorIM`
-CursorIM                         none         none    reverse
-# See `:help window-toolbar`
+; See `:help CursorIM`
+CursorIM                         none         none       reverse
+; See `:help window-toolbar`

 ToolbarLine                      none         bg3
 ToolbarLine                      none         bg3

-ToolbarButton                    fg0          bg3     bold
-# }}}
+ToolbarButton                    fg0          bg3        bold
+; }}}

 
 

-# Additional highlight groups {{{
-# Input mode cursor
+; Additional highlight groups {{{
+; Input mode cursor

 iCursor                       -> Cursor
 iCursor                       -> Cursor

-# Visual mode cursor, selection
+; Visual mode cursor, selection

 vCursor                       -> Cursor
 
 vCursor                       -> Cursor
 

-# Useful for custom status lines
-NormalMode                       fg2          bg0     reverse
-InsertMode                       blue         bg0     reverse
-ReplaceMode                      cyan         bg0     reverse
-VisualMode                       yellow       bg0     reverse
-CommandMode                      magenta      bg0     reverse
-Warnings                         yellow       bg0     reverse
-# }}}
+; Useful for custom status lines
+NormalMode                       fg2          bg0        reverse
+InsertMode                       blue         bg0        reverse
+ReplaceMode                      cyan         bg0        reverse
+VisualMode                       yellow       bg0        reverse
+CommandMode                      magenta      bg0        reverse
+Warnings                         yellow       bg0        reverse
+; }}}

 
 

-# Terminal colors {{{
+; Terminal colors {{{

 TermCursor                    -> Cursor
 TermCursorNC                     bg1          fg1
 TermCursor                    -> Cursor
 TermCursorNC                     bg1          fg1

-# }}}
+; }}}

 
 

diff --git a/templates/_dark.colortemplate b/templates/_dark.colortemplate
index 1ec41b95d124c63bd1496c8a4e8749974b189d39..b9aea579bdfda719e12dc473bad53c6eabc53024 100644 (file)
--- a/templates/_dark.colortemplate
+++ b/templates/_dark.colortemplate
@@ -1,31 +1,31 @@
-# vim: ft=colortemplate sessionoptions=buffers,tabpages,winsize,folds
+; vim: ft=colortemplate sessionoptions=buffers,tabpages,winsize,folds

 
 

-# Comment out (do not delete) the definitions that you want to keep at their default.
-# Color name                GUI         Base256  Base16 (optional)
-Color: black                #121419     ~        Black
+; Comment out (do not delete) the definitions that you want to keep at their default.
+; Color name                GUI         Base256  Base16 (optional)
+Color: black                #1c313a     ~        Black

 Color: realblack            #000000     ~        Black
 Color: darkgray             #575c66     ~        DarkGray
 Color: realblack            #000000     ~        Black
 Color: darkgray             #575c66     ~        DarkGray

-Color: red                  #e84256     ~        Red
-Color: brightred            #ddabbc     ~        LightRed
-Color: darkred              #dc1b33     ~        DarkRed
-Color: diffred              #d05a69     ~        Red
-Color: green                #00bf8a     ~        Green
-Color: brightgreen          #abddcc     ~        LightGreen
-Color: darkgreen            #008c65     ~        DarkGreen
-Color: diffgreen            #259a7a     ~        Green
-Color: yellow               #fff176     ~        Yellow
-Color: brightyellow         #ffffa8     ~        LightYellow
-Color: darkyellow           #e5d85c     ~        DarkYellow
-Color: blue                 #6699cc     ~        Blue
-Color: brightblue           #aec0e0     ~        LightBlue
-Color: darkblue             #517aa3     ~        DarkBlue
-Color: diffblue             #7e99b4     ~        Blue
-Color: magenta              #fa75e2     ~        Magenta
-Color: brightmagenta        #fc86ec     ~        LightMagenta
-Color: darkmagenta          #f844d8     ~        DarkMagenta
-Color: cyan                 #00bbcc     ~        Cyan
-Color: brightcyan           #99eaea     ~        LightCyan
-Color: darkcyan             #0095a3     ~        DarkCyan
+Color: red                  #ff616f     ~        Red
+Color: brightred            #ffcdd2     ~        LightRed
+Color: darkred              #ef5350     ~        DarkRed
+Color: diffred              #663d43     ~        Red
+Color: green                #69f0b9     ~        Green
+Color: brightgreen          #9fffe0     ~        LightGreen
+Color: darkgreen            #15cf83     ~        DarkGreen
+Color: diffgreen            #3f7070     ~        Green
+Color: yellow               #ffff8d     ~        Yellow
+Color: brightyellow         #fff9c4     ~        LightYellow
+Color: darkyellow           #ffeb3b     ~        DarkYellow
+Color: blue                 #90caf9     ~        Blue
+Color: brightblue           #bbdefb     ~        LightBlue
+Color: darkblue             #5d99c6     ~        DarkBlue
+Color: diffblue             #3f5a70     ~        Blue
+Color: magenta              #b39ddb     ~        Magenta
+Color: brightmagenta        #ce93d8     ~        LightMagenta
+Color: darkmagenta          #9575cd     ~        DarkMagenta
+Color: cyan                 #80deea     ~        Cyan
+Color: brightcyan           #b2ebf2     ~        LightCyan
+Color: darkcyan             #4dd0e1     ~        DarkCyan

 Color: white                #eff1f4     ~        White
 Color: brightwhite          #ffffff     ~        White
 
 Color: white                #eff1f4     ~        White
 Color: brightwhite          #ffffff     ~        White
 

diff --git a/templates/_help.colortemplate b/templates/_help.colortemplate
index ba94e9c4c2a286c23ffcad7e03ab576ec7146ef2..f521118d4f39a7e815a0f4105a30add410063bb5 100644 (file)
--- a/templates/_help.colortemplate
+++ b/templates/_help.colortemplate
@@ -1,4 +1,4 @@
-# vim: ft=colortemplate fdm=marker noet ts=8 tw=78
+; vim: ft=colortemplate fdm=marker noet ts=8 tw=78

 
 documentation
 *@shortname.txt*       For Vim version @vimversion       Last change: @date
 
 documentation
 *@shortname.txt*       For Vim version @vimversion       Last change: @date

diff --git a/templates/_light.colortemplate b/templates/_light.colortemplate
index 8a6baf43efe2bd034a83efaee07150ffe3674ac2..2f7a1b605c27f3ffaa51a65df514360fefe3fce1 100644 (file)
--- a/templates/_light.colortemplate
+++ b/templates/_light.colortemplate
@@ -1,31 +1,31 @@
-# vim: ft=colortemplate sessionoptions=buffers,tabpages,winsize,folds
+; vim: ft=colortemplate sessionoptions=buffers,tabpages,winsize,folds

 
 

-# Comment out (do not delete) the definitions that you want to keep at their default.
-# Color name                GUI         Base256  Base16 (optional)
-Color: black                #121419     ~        Black
+; Comment out (do not delete) the definitions that you want to keep at their default.
+; Color name                GUI         Base256  Base16 (optional)
+Color: black                #1c313a     ~        Black

 Color: realblack            #000000     ~        Black
 Color: darkgray             #575c66     ~        DarkGray
 Color: realblack            #000000     ~        Black
 Color: darkgray             #575c66     ~        DarkGray

-Color: red                  #ae1528     ~        Red
-Color: brightred            #ddabbc     ~        LightRed
-Color: darkred              #971223     ~        DarkRed
-Color: diffred              #ddabbc     ~        LightRed
-Color: green                #009a5a     ~        Green
-Color: brightgreen          #abddcc     ~        LightGreen
-Color: darkgreen            #00814b     ~        DarkGreen
-Color: diffgreen            #abddcc     ~        LightGreen
-Color: yellow               #ff8c00     ~        Yellow
-Color: brightyellow         #ffc57f     ~        LightYellow
-Color: darkyellow           #cc7000     ~        DarkYellow
-Color: blue                 #004bb4     ~        Blue
-Color: brightblue           #aec0e0     ~        LightBlue
-Color: darkblue             #00409b     ~        DarkBlue
-Color: diffblue             #aec0e0     ~        LightBlue
-Color: magenta              #b300a4     ~        Magenta
-Color: brightmagenta        #fc86ec     ~        LightMagenta
-Color: darkmagenta          #9a008d     ~        DarkMagenta
-Color: cyan                 #008d9a     ~        Cyan
-Color: brightcyan           #00d3e7     ~        LightCyan
-Color: darkcyan             #007681     ~        DarkCyan
+Color: red                  #b2000f     ~        Red
+Color: brightred            #f0cccf     ~        LightRed
+Color: darkred              #99000d     ~        DarkRed
+Color: diffred              #f0cccf     ~        LightRed
+Color: green                #0e8756     ~        Green
+Color: brightgreen          #c3e6d7     ~        LightGreen
+Color: darkgreen            #0c7047     ~        DarkGreen
+Color: diffgreen            #c3e6d7     ~        LightGreen
+Color: yellow               #ff870e     ~        Yellow
+Color: brightyellow         #ffb76e     ~        LightYellow
+Color: darkyellow           #cc6c0b     ~        DarkYellow
+Color: blue                 #0961a8     ~        Blue
+Color: brightblue           #c3d1e6     ~        LightBlue
+Color: darkblue             #064578     ~        DarkBlue
+Color: diffblue             #c3d1e6     ~        LightBlue
+Color: magenta              #7a5ab2     ~        Magenta
+Color: brightmagenta        #e1bee7     ~        LightMagenta
+Color: darkmagenta          #5f468a     ~        DarkMagenta
+Color: cyan                 #1d9fb0     ~        Cyan
+Color: brightcyan           #62ebff     ~        LightCyan
+Color: darkcyan             #198b9a     ~        DarkCyan

 Color: white                #eff1f4     ~        White
 Color: brightwhite          #ffffff     ~        White
 
 Color: white                #eff1f4     ~        White
 Color: brightwhite          #ffffff     ~        White
 

diff --git a/templates/artesanal.colortemplate b/templates/artesanal.colortemplate
index 494d5a03abedc23b673b8037a2596e95771fd2d9..3bb4ef5ea8e7baa19b41f0e64cb33c196f37eb4e 100644 (file)
--- a/templates/artesanal.colortemplate
+++ b/templates/artesanal.colortemplate
@@ -1,4 +1,4 @@
-# vim: ft=colortemplate sessionoptions=buffers,tabpages,winsize,folds
+; vim: ft=colortemplate sessionoptions=buffers,tabpages,winsize,folds

 
 Full name:       Artesanal
 Short name:      artesanal
 
 Full name:       Artesanal
 Short name:      artesanal