- migrate to new Colortemplate v2.1 syntax

[etc/vim.git] / colors / artesanal.vim

diff --git a/colors/artesanal.vim b/colors/artesanal.vim
index 4a225b27012b160704e94e429c40fd446697ffa5..72a33e542812a3dcf74f98218f82e7078772f2e8 100644 (file)
--- a/colors/artesanal.vim
+++ b/colors/artesanal.vim
@@ -4,115 +4,149 @@
 " 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: Wed 12 Jun 2019 12:15:55 AM CEST
+" Last Updated: Thu 25 Feb 2021 05:07:02 PM CET

 
 

-" Generated by Colortemplate v2.0.0b3
+" 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

-let s:italics = (((&t_ZH != '' && &t_ZH != '\e[7m') || has('gui_running')) && !has('iOS')) || has('nvim')
+let s:italics = (&t_ZH != '' && &t_ZH != '\e[7m') || has('gui_running') || has('nvim')

 
 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
       let g:terminal_color_15 = '#eff1f4'
     endif

-    if !has('gui_running') && get(g:, 'artesanal_transp_bg', 0)
-      hi Normal guifg=#e4e6eb guibg=NONE guisp=NONE gui=NONE cterm=NONE
-      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
+    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 gui=NONE cterm=NONE
+        else
+          hi Normal guifg=#000000 guibg=#2e3440 gui=NONE cterm=NONE
+        endif
+      elseif !has('gui_running') && &background ==# 'dark'
+        if get(g:, 'artesanal_transparent', 0)
+          hi Normal guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
+        else
+          hi Normal guifg=#ffffff guibg=#2e3440 gui=NONE cterm=NONE
+        endif
+      endif
+      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
     else

-      hi Normal guifg=#e4e6eb guibg=#2e3440 guisp=NONE gui=NONE cterm=NONE
-      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
+      if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+        hi Normal guifg=#e4e6eb guibg=NONE gui=NONE cterm=NONE
+      else
+        hi Normal guifg=#e4e6eb guibg=#2e3440 gui=NONE cterm=NONE
+      endif
+      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
     endif

-    hi ColorColumn guifg=NONE guibg=#37474f guisp=NONE gui=NONE cterm=NONE
-    hi Conceal guifg=#6699cc guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi! link CursorColumn ColorColumn
-    hi! link CursorLine ColorColumn
-    hi DiffAdd guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-    hi DiffAdded guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-    hi DiffChange guifg=#aec0e0 guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-    hi DiffDelete guifg=#ddabbc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-    hi DiffRemoved guifg=#ddabbc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-    hi DiffText guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-    hi Directory guifg=#6699cc guibg=NONE guisp=NONE gui=bold cterm=bold
-    hi EndOfBuffer guifg=#2e3440 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Error guifg=#e84256 guibg=NONE guisp=NONE gui=bold,standout cterm=bold,standout
+    if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+      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
+      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
+    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! link IncSearch Search
-    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 ModeMsg guifg=#6699cc guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi MoreMsg guifg=#00bf8a guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    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=#eff1f4 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 VisualNOS Visual

-    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! link Boolean Constant
     hi! link Character Constant
     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 Conditional Statement

-    hi Constant guifg=#00bf8a guibg=NONE guisp=NONE gui=NONE cterm=NONE

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

-    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 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


@@ -120,140 +154,174 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi! link Number Constant
     hi! link Operator Statement
     hi! link PreCondit PreProc
     hi! link Number Constant
     hi! link Operator Statement
     hi! link PreCondit PreProc

-    hi PreProc guifg=#00bbcc guibg=NONE guisp=NONE gui=NONE cterm=NONE

     hi! link Repeat Statement
     hi! link SpecialChar Special
     hi! link SpecialComment Special
     hi! link Repeat Statement
     hi! link SpecialChar Special
     hi! link SpecialComment Special

-    hi Statement guifg=#e84256 guibg=NONE guisp=NONE gui=NONE cterm=NONE

     hi! link StorageClass Type
     hi! link StorageClass Type

-    hi Special guifg=#fff176 guibg=NONE guisp=NONE gui=NONE cterm=NONE

     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 Todo guifg=#00bbcc guibg=NONE guisp=NONE gui=reverse cterm=reverse
-    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
     let g:terminal_color_15 = '#ffffff'
   endif

-  if !has('gui_running') && get(g:, 'artesanal_transp_bg', 0)
-    hi Normal guifg=#37474f guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    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
+  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 gui=NONE cterm=NONE
+      else
+        hi Normal guifg=#000000 guibg=#eff1f4 gui=NONE cterm=NONE
+      endif
+    elseif !has('gui_running') && &background ==# 'dark'
+      if get(g:, 'artesanal_transparent', 0)
+        hi Normal guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
+      else
+        hi Normal guifg=#ffffff guibg=#eff1f4 gui=NONE cterm=NONE
+      endif
+    endif
+    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
   else

-    hi Normal guifg=#37474f guibg=#eff1f4 guisp=NONE gui=NONE cterm=NONE
-    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
+    if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+      hi Normal guifg=#37474f guibg=NONE gui=NONE cterm=NONE
+    else
+      hi Normal guifg=#37474f guibg=#eff1f4 gui=NONE cterm=NONE
+    endif
+    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)
+    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
+    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=NONE cterm=NONE
-  hi Conceal guifg=#004bb4 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-  hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi! link CursorColumn ColorColumn
-  hi! link CursorLine ColorColumn
-  hi DiffAdd guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-  hi DiffAdded guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-  hi DiffChange guifg=#aec0e0 guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-  hi DiffDelete guifg=#ddabbc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-  hi DiffRemoved guifg=#ddabbc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-  hi DiffText guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
-  hi Directory guifg=#004bb4 guibg=NONE guisp=NONE gui=bold cterm=bold
-  hi EndOfBuffer guifg=#eff1f4 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-  hi Error guifg=#ae1528 guibg=NONE guisp=NONE gui=bold,standout cterm=bold,standout
+  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! link IncSearch Search
-  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 ModeMsg guifg=#004bb4 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-  hi MoreMsg guifg=#009a5a guibg=NONE guisp=NONE gui=NONE cterm=NONE
-  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=#2e3440 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 VisualNOS Visual

-  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! link Boolean Constant
   hi! link Character Constant
   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 Conditional Statement

-  hi Constant guifg=#009a5a guibg=NONE guisp=NONE gui=NONE cterm=NONE

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

-  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 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


@@ -261,42 +329,38 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   hi! link Number Constant
   hi! link Operator Statement
   hi! link PreCondit PreProc
   hi! link Number Constant
   hi! link Operator Statement
   hi! link PreCondit PreProc

-  hi PreProc guifg=#008d9a guibg=NONE guisp=NONE gui=NONE cterm=NONE

   hi! link Repeat Statement
   hi! link SpecialChar Special
   hi! link SpecialComment Special
   hi! link Repeat Statement
   hi! link SpecialChar Special
   hi! link SpecialComment Special

-  hi Statement guifg=#ae1528 guibg=NONE guisp=NONE gui=NONE cterm=NONE

   hi! link StorageClass Type
   hi! link StorageClass Type

-  hi Special guifg=#ff8c00 guibg=NONE guisp=NONE gui=NONE cterm=NONE

   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 Todo guifg=#008d9a guibg=NONE guisp=NONE gui=reverse cterm=reverse
-  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


@@ -304,80 +368,124 @@ endif
 
 if s:t_Co >= 256
   if &background ==# 'dark'
 
 if s:t_Co >= 256
   if &background ==# 'dark'

-    if !has('gui_running') && get(g:, 'artesanal_transp_bg', 0)
-      hi Normal ctermfg=254 ctermbg=NONE cterm=NONE
+    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 ctermfg=16 ctermbg=NONE cterm=NONE
+        else
+          hi Normal ctermfg=16 ctermbg=236 cterm=NONE
+          if !has('patch-8.0.0616') && !has('nvim') " Fix for Vim bug
+            set background=dark
+          endif
+        endif
+      elseif !has('gui_running') && &background ==# 'dark'
+        if get(g:, 'artesanal_transparent', 0)
+          hi Normal ctermfg=231 ctermbg=NONE cterm=NONE
+        else
+          hi Normal ctermfg=231 ctermbg=236 cterm=NONE
+          if !has('patch-8.0.0616') && !has('nvim') " Fix for Vim bug
+            set background=dark
+          endif
+        endif
+      endif
+      hi Conceal ctermfg=67 ctermbg=NONE cterm=NONE
+      hi Constant ctermfg=42 ctermbg=NONE cterm=NONE
+      hi Directory ctermfg=67 ctermbg=NONE cterm=bold
+      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 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 Normal ctermfg=254 ctermbg=NONE cterm=NONE
+      else
+        hi Normal ctermfg=254 ctermbg=236 cterm=NONE
+        if !has('patch-8.0.0616') && !has('nvim') " Fix for Vim bug
+          set background=dark
+        endif
+      endif
+      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 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
       hi FoldColumn ctermfg=59 ctermbg=NONE cterm=NONE
       hi SignColumn ctermfg=252 ctermbg=NONE cterm=NONE
       hi VertSplit ctermfg=242 ctermbg=NONE cterm=NONE
     else
       hi CursorLineNr ctermfg=228 ctermbg=NONE cterm=NONE
       hi FoldColumn ctermfg=59 ctermbg=NONE cterm=NONE
       hi SignColumn ctermfg=252 ctermbg=NONE cterm=NONE
       hi VertSplit ctermfg=242 ctermbg=NONE cterm=NONE
     else

-      hi Normal ctermfg=254 ctermbg=236 cterm=NONE
-      if !has('patch-8.0.0616') && !has('nvim') " Fix for Vim bug
-        set background=dark
-      endif

       hi CursorLineNr ctermfg=228 ctermbg=238 cterm=NONE
       hi FoldColumn ctermfg=59 ctermbg=238 cterm=NONE
       hi SignColumn ctermfg=252 ctermbg=238 cterm=NONE
       hi VertSplit ctermfg=242 ctermbg=236 cterm=NONE
     endif
       hi CursorLineNr ctermfg=228 ctermbg=238 cterm=NONE
       hi FoldColumn ctermfg=59 ctermbg=238 cterm=NONE
       hi SignColumn ctermfg=252 ctermbg=238 cterm=NONE
       hi VertSplit ctermfg=242 ctermbg=236 cterm=NONE
     endif

-    hi ColorColumn ctermfg=NONE ctermbg=238 cterm=NONE
-    hi Conceal ctermfg=67 ctermbg=NONE cterm=NONE
-    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi! link CursorColumn ColorColumn
-    hi! link CursorLine ColorColumn
-    hi DiffAdd ctermfg=152 ctermbg=233 cterm=reverse
-    hi DiffAdded ctermfg=152 ctermbg=233 cterm=reverse
-    hi DiffChange ctermfg=153 ctermbg=233 cterm=reverse
-    hi DiffDelete ctermfg=181 ctermbg=233 cterm=reverse
-    hi DiffRemoved ctermfg=181 ctermbg=233 cterm=reverse
-    hi DiffText ctermfg=152 ctermbg=233 cterm=reverse
-    hi Directory ctermfg=67 ctermbg=NONE cterm=bold
+    hi ColorColumn ctermfg=NONE ctermbg=238 cterm=bold
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    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 EndOfBuffer ctermfg=236 ctermbg=NONE cterm=NONE

-    hi Error ctermfg=167 ctermbg=NONE cterm=bold,reverse

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

-    hi! link IncSearch Search
+    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 MatchParen ctermfg=NONE ctermbg=240 cterm=bold

-    hi ModeMsg ctermfg=67 ctermbg=NONE cterm=NONE
-    hi MoreMsg ctermfg=36 ctermbg=NONE cterm=NONE

     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 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=255 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 Visual ctermfg=NONE ctermbg=238 cterm=NONE
     hi! link VisualNOS Visual

-    hi WarningMsg ctermfg=167 ctermbg=NONE cterm=NONE
-    hi WildMenu ctermfg=67 ctermbg=240 cterm=bold

     hi! link Boolean Constant
     hi! link Character Constant
     hi Comment ctermfg=250 ctermbg=NONE cterm=NONE
     hi! link Conditional Statement
     hi! link Boolean Constant
     hi! link Character Constant
     hi Comment ctermfg=250 ctermbg=NONE cterm=NONE
     hi! link Conditional Statement

-    hi Constant ctermfg=36 ctermbg=NONE cterm=NONE

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

-    hi Function ctermfg=37 ctermbg=NONE cterm=NONE
-    hi Identifier ctermfg=67 ctermbg=NONE cterm=NONE

     hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
     hi! link Include PreProc
     hi! link Keyword Statement
     hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
     hi! link Include PreProc
     hi! link Keyword Statement


@@ -386,18 +494,14 @@ if s:t_Co >= 256
     hi! link Number Constant
     hi! link Operator Statement
     hi! link PreCondit PreProc
     hi! link Number Constant
     hi! link Operator Statement
     hi! link PreCondit PreProc

-    hi PreProc ctermfg=37 ctermbg=NONE cterm=NONE

     hi! link Repeat Statement
     hi! link SpecialChar Special
     hi! link SpecialComment Special
     hi! link Repeat Statement
     hi! link SpecialChar Special
     hi! link SpecialComment Special

-    hi Statement ctermfg=167 ctermbg=NONE cterm=NONE

     hi! link StorageClass Type
     hi! link StorageClass Type

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

     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 Todo ctermfg=37 ctermbg=NONE cterm=reverse
-    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


@@ -407,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


@@ -420,40 +524,83 @@ if s:t_Co >= 256
     finish
   endif
   " Light background
     finish
   endif
   " Light background

-  if !has('gui_running') && get(g:, 'artesanal_transp_bg', 0)
-    hi Normal ctermfg=238 ctermbg=NONE cterm=NONE
+  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 ctermfg=16 ctermbg=NONE cterm=NONE
+      else
+        hi Normal ctermfg=16 ctermbg=255 cterm=NONE
+      endif
+    elseif !has('gui_running') && &background ==# 'dark'
+      if get(g:, 'artesanal_transparent', 0)
+        hi Normal ctermfg=231 ctermbg=NONE cterm=NONE
+      else
+        hi Normal ctermfg=231 ctermbg=255 cterm=NONE
+      endif
+    endif
+    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=88 ctermbg=NONE cterm=bold,reverse
+    hi Function ctermfg=30 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=30 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=88 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=166 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=30 ctermbg=NONE cterm=reverse
+    hi WarningMsg ctermfg=88 ctermbg=NONE cterm=NONE
+    hi WildMenu ctermfg=25 ctermbg=252 cterm=bold
+  else
+    if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+      hi Normal ctermfg=238 ctermbg=NONE cterm=NONE
+    else
+      hi Normal ctermfg=238 ctermbg=255 cterm=NONE
+    endif
+    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 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 Todo ctermfg=37 ctermbg=NONE cterm=reverse
+    hi WarningMsg ctermfg=124 ctermbg=NONE cterm=NONE
+    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
     hi FoldColumn ctermfg=59 ctermbg=NONE cterm=NONE
     hi SignColumn ctermfg=240 ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=250 ctermbg=NONE cterm=NONE
   else
     hi CursorLineNr ctermfg=208 ctermbg=NONE cterm=NONE
     hi FoldColumn ctermfg=59 ctermbg=NONE cterm=NONE
     hi SignColumn ctermfg=240 ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=250 ctermbg=NONE cterm=NONE
   else

-    hi Normal ctermfg=238 ctermbg=255 cterm=NONE

     hi CursorLineNr ctermfg=208 ctermbg=254 cterm=NONE
     hi FoldColumn ctermfg=59 ctermbg=254 cterm=NONE
     hi SignColumn ctermfg=240 ctermbg=254 cterm=NONE
     hi VertSplit ctermfg=250 ctermbg=255 cterm=NONE
   endif
     hi CursorLineNr ctermfg=208 ctermbg=254 cterm=NONE
     hi FoldColumn ctermfg=59 ctermbg=254 cterm=NONE
     hi SignColumn ctermfg=240 ctermbg=254 cterm=NONE
     hi VertSplit ctermfg=250 ctermbg=255 cterm=NONE
   endif

-  hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
-  hi Conceal ctermfg=26 ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi! link CursorColumn ColorColumn
-  hi! link CursorLine ColorColumn
-  hi DiffAdd ctermfg=152 ctermbg=233 cterm=reverse
-  hi DiffAdded ctermfg=152 ctermbg=233 cterm=reverse
-  hi DiffChange ctermfg=153 ctermbg=233 cterm=reverse
-  hi DiffDelete ctermfg=181 ctermbg=233 cterm=reverse
-  hi DiffRemoved ctermfg=181 ctermbg=233 cterm=reverse
-  hi DiffText ctermfg=152 ctermbg=233 cterm=reverse
-  hi Directory ctermfg=26 ctermbg=NONE cterm=bold
+  hi ColorColumn ctermfg=NONE ctermbg=254 cterm=bold
+  hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  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 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 EndOfBuffer ctermfg=255 ctermbg=NONE cterm=NONE

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

   hi! link ErrorMsg Error
   hi Folded ctermfg=250 ctermbg=254 cterm=NONE
   hi! link ErrorMsg Error
   hi Folded ctermfg=250 ctermbg=254 cterm=NONE

-  hi! link IncSearch Search
+  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 MatchParen ctermfg=NONE ctermbg=252 cterm=bold

-  hi ModeMsg ctermfg=26 ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=35 ctermbg=NONE cterm=NONE

   hi NonText ctermfg=248 ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=238 ctermbg=252 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=252 cterm=NONE
   hi NonText ctermfg=248 ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=238 ctermbg=252 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=252 cterm=NONE


@@ -461,36 +608,31 @@ 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 TabLineFill ctermfg=240 ctermbg=250 cterm=NONE
   hi TabLineSel ctermfg=238 ctermbg=254 cterm=NONE
   hi! link StatusLineTerm StatusLine
   hi! link StatusLineTermNC StatusLineNC
   hi! link TabLine TabLineFill
   hi TabLineFill ctermfg=240 ctermbg=250 cterm=NONE
   hi TabLineSel ctermfg=238 ctermbg=254 cterm=NONE

-  hi Title ctermfg=236 ctermbg=NONE cterm=bold
+  hi Title ctermfg=124 ctermbg=NONE cterm=bold

   hi Visual ctermfg=NONE ctermbg=254 cterm=NONE
   hi! link VisualNOS Visual
   hi Visual ctermfg=NONE ctermbg=254 cterm=NONE
   hi! link VisualNOS Visual

-  hi WarningMsg ctermfg=124 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=26 ctermbg=252 cterm=bold

   hi! link Boolean Constant
   hi! link Character Constant
   hi Comment ctermfg=242 ctermbg=NONE cterm=NONE
   hi! link Conditional Statement
   hi! link Boolean Constant
   hi! link Character Constant
   hi Comment ctermfg=242 ctermbg=NONE cterm=NONE
   hi! link Conditional Statement

-  hi Constant ctermfg=35 ctermbg=NONE cterm=NONE

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

-  hi Function ctermfg=30 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=26 ctermbg=NONE cterm=NONE

   hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
   hi! link Include PreProc
   hi! link Keyword Statement
   hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
   hi! link Include PreProc
   hi! link Keyword Statement


@@ -499,17 +641,13 @@ if s:t_Co >= 256
   hi! link Number Constant
   hi! link Operator Statement
   hi! link PreCondit PreProc
   hi! link Number Constant
   hi! link Operator Statement
   hi! link PreCondit PreProc

-  hi PreProc ctermfg=30 ctermbg=NONE cterm=NONE

   hi! link Repeat Statement
   hi! link SpecialChar Special
   hi! link SpecialComment Special
   hi! link Repeat Statement
   hi! link SpecialChar Special
   hi! link SpecialComment Special

-  hi Statement ctermfg=124 ctermbg=NONE cterm=NONE

   hi! link StorageClass Type
   hi! link StorageClass Type

-  hi Special ctermfg=208 ctermbg=NONE cterm=NONE

   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 Todo ctermfg=30 ctermbg=NONE cterm=reverse

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


@@ -520,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


@@ -535,40 +673,83 @@ endif
 
 if s:t_Co >= 16
   if &background ==# 'dark'
 
 if s:t_Co >= 16
   if &background ==# 'dark'

-    if !has('gui_running') && get(g:, 'artesanal_transp_bg', 0)
-      hi Normal ctermfg=White ctermbg=NONE cterm=NONE
+    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 ctermfg=Black ctermbg=NONE cterm=NONE
+        else
+          hi Normal ctermfg=Black ctermbg=Black cterm=NONE
+        endif
+      elseif !has('gui_running') && &background ==# 'dark'
+        if get(g:, 'artesanal_transparent', 0)
+          hi Normal ctermfg=White ctermbg=NONE cterm=NONE
+        else
+          hi Normal ctermfg=White ctermbg=Black cterm=NONE
+        endif
+      endif
+      hi Conceal ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+      hi Constant ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+      hi Directory ctermfg=DarkBlue ctermbg=NONE cterm=bold
+      hi Error ctermfg=DarkRed ctermbg=NONE cterm=bold,reverse
+      hi Function ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+      hi Identifier ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+      hi ModeMsg ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+      hi MoreMsg ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+      hi PreProc ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+      hi Statement ctermfg=DarkRed ctermbg=NONE cterm=NONE
+      hi Special ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+      hi Todo ctermfg=DarkCyan ctermbg=NONE cterm=reverse
+      hi WarningMsg ctermfg=DarkRed ctermbg=NONE cterm=NONE
+      hi WildMenu ctermfg=DarkBlue ctermbg=DarkGrey cterm=bold
+    else
+      if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+        hi Normal ctermfg=White ctermbg=NONE cterm=NONE
+      else
+        hi Normal ctermfg=White ctermbg=Black cterm=NONE
+      endif
+      hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
+      hi Constant ctermfg=Green ctermbg=NONE cterm=NONE
+      hi Directory ctermfg=Blue ctermbg=NONE cterm=bold
+      hi Error ctermfg=Red ctermbg=NONE cterm=bold,reverse
+      hi Function ctermfg=Cyan ctermbg=NONE cterm=NONE
+      hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
+      hi ModeMsg ctermfg=Blue ctermbg=NONE cterm=NONE
+      hi MoreMsg ctermfg=Green ctermbg=NONE cterm=NONE
+      hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
+      hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
+      hi Special ctermfg=Yellow ctermbg=NONE cterm=NONE
+      hi Todo ctermfg=Cyan ctermbg=NONE cterm=reverse
+      hi WarningMsg ctermfg=Red ctermbg=NONE cterm=NONE
+      hi WildMenu ctermfg=Blue ctermbg=DarkGrey cterm=bold
+    endif
+    if !has('gui_running') && get(g:, 'artesanal_transparent', 0)

       hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
       hi FoldColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE
       hi SignColumn ctermfg=LightGrey ctermbg=NONE cterm=NONE
       hi VertSplit ctermfg=DarkGrey ctermbg=NONE cterm=NONE
     else
       hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
       hi FoldColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE
       hi SignColumn ctermfg=LightGrey ctermbg=NONE cterm=NONE
       hi VertSplit ctermfg=DarkGrey ctermbg=NONE cterm=NONE
     else

-      hi Normal ctermfg=White ctermbg=Black cterm=NONE

       hi CursorLineNr ctermfg=Yellow ctermbg=Black cterm=NONE
       hi FoldColumn ctermfg=DarkGray ctermbg=Black cterm=NONE
       hi SignColumn ctermfg=LightGrey ctermbg=Black cterm=NONE
       hi VertSplit ctermfg=DarkGrey ctermbg=Black cterm=NONE
     endif
       hi CursorLineNr ctermfg=Yellow ctermbg=Black cterm=NONE
       hi FoldColumn ctermfg=DarkGray ctermbg=Black cterm=NONE
       hi SignColumn ctermfg=LightGrey ctermbg=Black cterm=NONE
       hi VertSplit ctermfg=DarkGrey ctermbg=Black cterm=NONE
     endif

-    hi ColorColumn ctermfg=NONE ctermbg=Black cterm=NONE
-    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
-    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi! link CursorColumn ColorColumn
-    hi! link CursorLine ColorColumn
-    hi DiffAdd ctermfg=LightGreen ctermbg=Black cterm=reverse
-    hi DiffAdded ctermfg=LightGreen ctermbg=Black cterm=reverse
-    hi DiffChange ctermfg=LightBlue ctermbg=Black cterm=reverse
-    hi DiffDelete ctermfg=LightRed ctermbg=Black cterm=reverse
-    hi DiffRemoved ctermfg=LightRed ctermbg=Black cterm=reverse
-    hi DiffText ctermfg=LightGreen ctermbg=Black cterm=reverse
-    hi Directory ctermfg=Blue ctermbg=NONE cterm=bold
+    hi ColorColumn ctermfg=NONE ctermbg=Black cterm=bold
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    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 DiffDelete ctermfg=NONE ctermbg=Red cterm=NONE
+    hi DiffRemoved ctermfg=NONE ctermbg=Red cterm=NONE
+    hi DiffText ctermfg=NONE ctermbg=Green cterm=NONE

     hi EndOfBuffer ctermfg=Black ctermbg=NONE cterm=NONE
     hi EndOfBuffer ctermfg=Black ctermbg=NONE cterm=NONE

-    hi Error ctermfg=Red ctermbg=NONE cterm=bold,reverse

     hi! link ErrorMsg Error
     hi Folded ctermfg=DarkGrey ctermbg=Black cterm=NONE
     hi! link ErrorMsg Error
     hi Folded ctermfg=DarkGrey ctermbg=Black cterm=NONE

-    hi! link IncSearch Search
+    hi IncSearch ctermfg=Yellow ctermbg=Black cterm=reverse

     hi LineNr ctermfg=DarkGrey ctermbg=Black cterm=NONE
     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 MatchParen ctermfg=NONE ctermbg=DarkGrey cterm=bold

-    hi ModeMsg ctermfg=Blue ctermbg=NONE cterm=NONE
-    hi MoreMsg ctermfg=Green ctermbg=NONE cterm=NONE

     hi NonText ctermfg=LightGrey ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=White ctermbg=DarkGrey cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=DarkGrey cterm=NONE
     hi NonText ctermfg=LightGrey ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=White ctermbg=DarkGrey cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=DarkGrey cterm=NONE


@@ -582,30 +763,25 @@ 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 TabLineFill ctermfg=LightGrey ctermbg=DarkGrey cterm=NONE
     hi TabLineSel ctermfg=White ctermbg=Black cterm=NONE
     hi! link StatusLineTerm StatusLine
     hi! link StatusLineTermNC StatusLineNC
     hi! link TabLine TabLineFill
     hi TabLineFill ctermfg=LightGrey ctermbg=DarkGrey cterm=NONE
     hi TabLineSel ctermfg=White ctermbg=Black cterm=NONE

-    hi Title ctermfg=White ctermbg=NONE cterm=bold
+    hi Title ctermfg=Red ctermbg=NONE cterm=bold

     hi Visual ctermfg=NONE ctermbg=Black cterm=NONE
     hi! link VisualNOS Visual
     hi Visual ctermfg=NONE ctermbg=Black cterm=NONE
     hi! link VisualNOS Visual

-    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=NONE
-    hi WildMenu ctermfg=Blue ctermbg=DarkGrey cterm=bold

     hi! link Boolean Constant
     hi! link Character Constant
     hi Comment ctermfg=DarkGrey ctermbg=NONE cterm=NONE
     hi! link Conditional Statement
     hi! link Boolean Constant
     hi! link Character Constant
     hi Comment ctermfg=DarkGrey ctermbg=NONE cterm=NONE
     hi! link Conditional Statement

-    hi Constant ctermfg=Green ctermbg=NONE cterm=NONE

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

-    hi Function ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE

     hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
     hi! link Include PreProc
     hi! link Keyword Statement
     hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
     hi! link Include PreProc
     hi! link Keyword Statement


@@ -614,17 +790,13 @@ if s:t_Co >= 16
     hi! link Number Constant
     hi! link Operator Statement
     hi! link PreCondit PreProc
     hi! link Number Constant
     hi! link Operator Statement
     hi! link PreCondit PreProc

-    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE

     hi! link Repeat Statement
     hi! link SpecialChar Special
     hi! link SpecialComment Special
     hi! link Repeat Statement
     hi! link SpecialChar Special
     hi! link SpecialComment Special

-    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE

     hi! link StorageClass Type
     hi! link StorageClass Type

-    hi Special ctermfg=Yellow ctermbg=NONE cterm=NONE

     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 Todo ctermfg=Cyan ctermbg=NONE cterm=reverse

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


@@ -648,40 +820,83 @@ if s:t_Co >= 16
     finish
   endif
   " Light background
     finish
   endif
   " Light background

-  if !has('gui_running') && get(g:, 'artesanal_transp_bg', 0)
-    hi Normal ctermfg=Black ctermbg=NONE cterm=NONE
+  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 ctermfg=Black ctermbg=NONE cterm=NONE
+      else
+        hi Normal ctermfg=Black ctermbg=White cterm=NONE
+      endif
+    elseif !has('gui_running') && &background ==# 'dark'
+      if get(g:, 'artesanal_transparent', 0)
+        hi Normal ctermfg=White ctermbg=NONE cterm=NONE
+      else
+        hi Normal ctermfg=White ctermbg=White cterm=NONE
+      endif
+    endif
+    hi Conceal ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+    hi Directory ctermfg=DarkBlue ctermbg=NONE cterm=bold
+    hi Error ctermfg=DarkRed ctermbg=NONE cterm=bold,reverse
+    hi Function ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+    hi ModeMsg ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+    hi MoreMsg ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=DarkRed ctermbg=NONE cterm=NONE
+    hi Special ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=DarkCyan ctermbg=NONE cterm=reverse
+    hi WarningMsg ctermfg=DarkRed ctermbg=NONE cterm=NONE
+    hi WildMenu ctermfg=DarkBlue ctermbg=LightGrey cterm=bold
+  else
+    if !has('gui_running') && get(g:, 'artesanal_transparent', 0)
+      hi Normal ctermfg=Black ctermbg=NONE cterm=NONE
+    else
+      hi Normal ctermfg=Black ctermbg=White cterm=NONE
+    endif
+    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=Green ctermbg=NONE cterm=NONE
+    hi Directory ctermfg=Blue ctermbg=NONE cterm=bold
+    hi Error ctermfg=Red ctermbg=NONE cterm=bold,reverse
+    hi Function ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi ModeMsg ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi MoreMsg ctermfg=Green ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Special ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=Cyan ctermbg=NONE cterm=reverse
+    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=NONE
+    hi WildMenu ctermfg=Blue ctermbg=LightGrey cterm=bold
+  endif
+  if !has('gui_running') && get(g:, 'artesanal_transparent', 0)

     hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
     hi FoldColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE
     hi SignColumn ctermfg=DarkGrey ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=DarkGrey ctermbg=NONE cterm=NONE
   else
     hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
     hi FoldColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE
     hi SignColumn ctermfg=DarkGrey ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=DarkGrey ctermbg=NONE cterm=NONE
   else

-    hi Normal ctermfg=Black ctermbg=White cterm=NONE

     hi CursorLineNr ctermfg=Yellow ctermbg=White cterm=NONE
     hi FoldColumn ctermfg=DarkGray ctermbg=White cterm=NONE
     hi SignColumn ctermfg=DarkGrey ctermbg=White cterm=NONE
     hi VertSplit ctermfg=DarkGrey ctermbg=White cterm=NONE
   endif
     hi CursorLineNr ctermfg=Yellow ctermbg=White cterm=NONE
     hi FoldColumn ctermfg=DarkGray ctermbg=White cterm=NONE
     hi SignColumn ctermfg=DarkGrey ctermbg=White cterm=NONE
     hi VertSplit ctermfg=DarkGrey ctermbg=White cterm=NONE
   endif

-  hi ColorColumn ctermfg=NONE ctermbg=White cterm=NONE
-  hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi! link CursorColumn ColorColumn
-  hi! link CursorLine ColorColumn
-  hi DiffAdd ctermfg=LightGreen ctermbg=Black cterm=reverse
-  hi DiffAdded ctermfg=LightGreen ctermbg=Black cterm=reverse
-  hi DiffChange ctermfg=LightBlue ctermbg=Black cterm=reverse
-  hi DiffDelete ctermfg=LightRed ctermbg=Black cterm=reverse
-  hi DiffRemoved ctermfg=LightRed ctermbg=Black cterm=reverse
-  hi DiffText ctermfg=LightGreen ctermbg=Black cterm=reverse
-  hi Directory ctermfg=Blue ctermbg=NONE cterm=bold
+  hi ColorColumn ctermfg=NONE ctermbg=White cterm=bold
+  hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  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 DiffDelete ctermfg=NONE ctermbg=LightRed cterm=NONE
+  hi DiffRemoved ctermfg=NONE ctermbg=LightRed cterm=NONE
+  hi DiffText ctermfg=NONE ctermbg=LightGreen cterm=NONE

   hi EndOfBuffer ctermfg=White ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=White ctermbg=NONE cterm=NONE

-  hi Error ctermfg=Red ctermbg=NONE cterm=bold,reverse

   hi! link ErrorMsg Error
   hi Folded ctermfg=DarkGrey ctermbg=White cterm=NONE
   hi! link ErrorMsg Error
   hi Folded ctermfg=DarkGrey ctermbg=White cterm=NONE

-  hi! link IncSearch Search
+  hi IncSearch ctermfg=Yellow ctermbg=Black cterm=reverse

   hi LineNr ctermfg=DarkGrey ctermbg=White cterm=NONE
   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 MatchParen ctermfg=NONE ctermbg=LightGrey cterm=bold

-  hi ModeMsg ctermfg=Blue ctermbg=NONE cterm=NONE
-  hi MoreMsg ctermfg=Green ctermbg=NONE cterm=NONE

   hi NonText ctermfg=DarkGrey ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=Black ctermbg=LightGrey cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=LightGrey cterm=NONE
   hi NonText ctermfg=DarkGrey ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=Black ctermbg=LightGrey cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=LightGrey cterm=NONE


@@ -695,30 +910,25 @@ 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 TabLineFill ctermfg=DarkGrey ctermbg=DarkGrey cterm=NONE
   hi TabLineSel ctermfg=Black ctermbg=White cterm=NONE
   hi! link StatusLineTerm StatusLine
   hi! link StatusLineTermNC StatusLineNC
   hi! link TabLine TabLineFill
   hi TabLineFill ctermfg=DarkGrey ctermbg=DarkGrey cterm=NONE
   hi TabLineSel ctermfg=Black ctermbg=White cterm=NONE

-  hi Title ctermfg=Black ctermbg=NONE cterm=bold
+  hi Title ctermfg=Red ctermbg=NONE cterm=bold

   hi Visual ctermfg=NONE ctermbg=White cterm=NONE
   hi! link VisualNOS Visual
   hi Visual ctermfg=NONE ctermbg=White cterm=NONE
   hi! link VisualNOS Visual

-  hi WarningMsg ctermfg=Red ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=Blue ctermbg=LightGrey cterm=bold

   hi! link Boolean Constant
   hi! link Character Constant
   hi Comment ctermfg=DarkGrey ctermbg=NONE cterm=NONE
   hi! link Conditional Statement
   hi! link Boolean Constant
   hi! link Character Constant
   hi Comment ctermfg=DarkGrey ctermbg=NONE cterm=NONE
   hi! link Conditional Statement

-  hi Constant ctermfg=Green ctermbg=NONE cterm=NONE

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

-  hi Function ctermfg=Cyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE

   hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
   hi! link Include PreProc
   hi! link Keyword Statement
   hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
   hi! link Include PreProc
   hi! link Keyword Statement


@@ -727,17 +937,13 @@ if s:t_Co >= 16
   hi! link Number Constant
   hi! link Operator Statement
   hi! link PreCondit PreProc
   hi! link Number Constant
   hi! link Operator Statement
   hi! link PreCondit PreProc

-  hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE

   hi! link Repeat Statement
   hi! link SpecialChar Special
   hi! link SpecialComment Special
   hi! link Repeat Statement
   hi! link SpecialChar Special
   hi! link SpecialComment Special

-  hi Statement ctermfg=Red ctermbg=NONE cterm=NONE

   hi! link StorageClass Type
   hi! link StorageClass Type

-  hi Special ctermfg=Yellow ctermbg=NONE cterm=NONE

   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 Todo ctermfg=Cyan ctermbg=NONE cterm=reverse

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


@@ -761,9 +967,7 @@ if s:t_Co >= 16
   finish
 endif
 
   finish
 endif
 

-" Variant:         gui 256 16

 " Background: light
 " Background: light

-" Variant:   gui     256 16

 " Color: fg0 #2e3440 ~   Black
 " Color: fg1 #37474f ~   Black
 " Color: fg2 #455a64 ~   DarkGrey
 " Color: fg0 #2e3440 ~   Black
 " Color: fg1 #37474f ~   Black
 " Color: fg2 #455a64 ~   DarkGrey


@@ -774,139 +978,35 @@ 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: darkgray             #575c66     ~        DarkGray

-" Color: red                  #ae1528     ~        Red
-" Color: brightred            #ddabbc     ~        LightRed
-" Color: darkred              #971223     ~        DarkRed
-" Color: green                #009a5a     ~        Green
-" Color: brightgreen          #abddcc     ~        LightGreen
-" Color: darkgreen            #00814b     ~        DarkGreen
-" 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: 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
 " Term Colors: darkgray red green yellow blue magenta cyan brightwhite
 " Color: white                #eff1f4     ~        White
 " Color: brightwhite          #ffffff     ~        White
 " Term Colors: black darkred darkgreen darkyellow darkblue darkmagenta darkcyan white
 " Term Colors: darkgray red green yellow blue magenta cyan brightwhite

-" if !has('gui_running') && get(g:, '@optionprefix_transp_bg', 0)
-"   Normal       fg1           none
-"   CursorLineNr yellow        none
-"   FoldColumn   darkgray      none
-"   SignColumn   fg2           none
-"   VertSplit    bg3           none
-" else
-"   Normal       fg1           bg0
-"   CursorLineNr yellow        bg1
-"   FoldColumn   darkgray      bg1
-"   SignColumn   fg2           bg1
-"   VertSplit    bg3           bg0
-" endif
-" ColorColumn                      none         bg1
-" Conceal                          blue         none
-" Cursor                           none         none    reverse
-" 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                            red          none    t=reverse,bold g=standout,bold
-" ErrorMsg                      -> Error
-" Folded                           bg3          bg1     g=italic
-" IncSearch                     -> Search
-" LineNr                           bg3          bg1
-" MatchParen                       none         bg2     bold
-" ModeMsg                          blue         none
-" MoreMsg                          green        none
-" NonText                          bg4          none
-" Pmenu                            fg1          bg2
-" PmenuSbar                        none         bg2
-" PmenuSel                         bg1          fg2    bold
-" PmenuThumb                       none         bg4
-" Question                         darkyellow   none
-" QuickFixLine                  -> Search
-" Search                           brightyellow black   reverse
-" 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
-" StatusLineTerm                -> StatusLine
-" StatusLineTermNC              -> StatusLineNC
-" TabLine                       -> TabLineFill
-" TabLineFill                      fg2          bg3
-" TabLineSel                       fg1          bg1
-" Title                            fg0          none    bold
-" Visual                           none         bg1
-" VisualNOS                     -> Visual
-" WarningMsg                       red          none
-" WildMenu                         blue         bg2     bold
-" 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                       -> PreProc
-" Keyword                       -> Statement
-" Label                         -> Statement
-" Macro                         -> PreProc
-" Number                        -> Constant
-" Operator                      -> Statement
-" PreCondit                     -> PreProc
-" PreProc                          cyan         none
-" Repeat                        -> Statement
-" SpecialChar                   -> Special
-" SpecialComment                -> Special
-" Statement                        red          none
-" StorageClass                  -> Type
-" Special                          yellow       none
-" String                        -> Constant
-" Structure                     -> Type
-" Tag                           -> Special
-" Todo                             cyan         none    reverse
-" Type                             darkcyan     none
-" Typedef                       -> Type
-" Underlined                       none         none    underline
-" lCursor                       -> Cursor
-" CursorIM                         none         none    reverse
-" ToolbarLine                      none         bg3
-" ToolbarButton                    fg0          bg3     bold
-" iCursor                       -> Cursor
-" vCursor                       -> Cursor
-" NormalMode                       fg2          bg0     reverse
-" InsertMode                       blue         bg0     reverse
-" ReplaceMode                      cyan         bg0     reverse
-" VisualMode                       yellow       bg0     reverse
-" CommandMode                      magenta      bg0     reverse
-" Warnings                         yellow       bg0     reverse
-" TermCursor                    -> Cursor
-" TermCursorNC                     bg1          fg1

 " Background: dark
 " Background: dark

-" Variant:   gui     256 16

 " Color: fg0 #eff1f4 ~   White
 " Color: fg1 #e4e6eb ~   White
 " Color: fg2 #cdd2db ~   LightGrey
 " Color: fg0 #eff1f4 ~   White
 " Color: fg1 #e4e6eb ~   White
 " Color: fg2 #cdd2db ~   LightGrey


@@ -917,134 +1017,32 @@ 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: darkgray             #575c66     ~        DarkGray

-" Color: red                  #e84256     ~        Red
-" Color: brightred            #ddabbc     ~        LightRed
-" Color: darkred              #dc1b33     ~        DarkRed
-" Color: green                #00bf8a     ~        Green
-" Color: brightgreen          #abddcc     ~        LightGreen
-" Color: darkgreen            #008c65     ~        DarkGreen
-" 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: 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
 " Term Colors: black darkred darkgreen darkyellow darkblue darkmagenta darkcyan white
 " Color: white                #eff1f4     ~        White
 " Color: brightwhite          #ffffff     ~        White
 " Term Colors: darkgray red green yellow blue magenta cyan brightwhite
 " Term Colors: black darkred darkgreen darkyellow darkblue darkmagenta darkcyan white

-" if !has('gui_running') && get(g:, '@optionprefix_transp_bg', 0)
-"   Normal       fg1           none
-"   CursorLineNr yellow        none
-"   FoldColumn   darkgray      none
-"   SignColumn   fg2           none
-"   VertSplit    bg3           none
-" else
-"   Normal       fg1           bg0
-"   CursorLineNr yellow        bg1
-"   FoldColumn   darkgray      bg1
-"   SignColumn   fg2           bg1
-"   VertSplit    bg3           bg0
-" endif
-" ColorColumn                      none         bg1
-" Conceal                          blue         none
-" Cursor                           none         none    reverse
-" 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                            red          none    t=reverse,bold g=standout,bold
-" ErrorMsg                      -> Error
-" Folded                           bg3          bg1     g=italic
-" IncSearch                     -> Search
-" LineNr                           bg3          bg1
-" MatchParen                       none         bg2     bold
-" ModeMsg                          blue         none
-" MoreMsg                          green        none
-" NonText                          bg4          none
-" Pmenu                            fg1          bg2
-" PmenuSbar                        none         bg2
-" PmenuSel                         bg1          fg2    bold
-" PmenuThumb                       none         bg4
-" Question                         darkyellow   none
-" QuickFixLine                  -> Search
-" Search                           brightyellow black   reverse
-" 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
-" StatusLineTerm                -> StatusLine
-" StatusLineTermNC              -> StatusLineNC
-" TabLine                       -> TabLineFill
-" TabLineFill                      fg2          bg3
-" TabLineSel                       fg1          bg1
-" Title                            fg0          none    bold
-" Visual                           none         bg1
-" VisualNOS                     -> Visual
-" WarningMsg                       red          none
-" WildMenu                         blue         bg2     bold
-" 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                       -> PreProc
-" Keyword                       -> Statement
-" Label                         -> Statement
-" Macro                         -> PreProc
-" Number                        -> Constant
-" Operator                      -> Statement
-" PreCondit                     -> PreProc
-" PreProc                          cyan         none
-" Repeat                        -> Statement
-" SpecialChar                   -> Special
-" SpecialComment                -> Special
-" Statement                        red          none
-" StorageClass                  -> Type
-" Special                          yellow       none
-" String                        -> Constant
-" Structure                     -> Type
-" Tag                           -> Special
-" Todo                             cyan         none    reverse
-" Type                             darkcyan     none
-" Typedef                       -> Type
-" Underlined                       none         none    underline
-" lCursor                       -> Cursor
-" CursorIM                         none         none    reverse
-" ToolbarLine                      none         bg3
-" ToolbarButton                    fg0          bg3     bold
-" iCursor                       -> Cursor
-" vCursor                       -> Cursor
-" NormalMode                       fg2          bg0     reverse
-" InsertMode                       blue         bg0     reverse
-" ReplaceMode                      cyan         bg0     reverse
-" VisualMode                       yellow       bg0     reverse
-" CommandMode                      magenta      bg0     reverse
-" Warnings                         yellow       bg0     reverse
-" TermCursor                    -> Cursor
-" TermCursorNC                     bg1          fg1
+" vim: et ts=2 sw=2