Merging upstream version 2:9.1.0199.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 143 insertions, 82 deletions

diff --git a/runtime/colors/blue.vim b/runtime/colors/blue.vim
index c53f44f..f95cf27 100644
--- a/runtime/colors/blue.vim
+++ b/runtime/colors/blue.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:33
+" Last Updated: Mon 08 Jan 2024 09:42:49 AM AEDT
 
 " Generated by Colortemplate v2.2.3
 
@@ -76,8 +76,8 @@ hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cter
 hi Label guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE
 hi! link Terminal Normal
 hi! link Debug Special
-hi! link diffAdded String
-hi! link diffRemoved WarningMsg
+hi! link Added String
+hi! link Removed WarningMsg
 hi! link diffOnly WarningMsg
 hi! link diffNoEOL WarningMsg
 hi! link diffIsA WarningMsg
@@ -186,8 +186,8 @@ if s:t_Co >= 256
   hi Label ctermfg=220 ctermbg=NONE cterm=NONE
   hi! link Terminal Normal
   hi! link Debug Special
-  hi! link diffAdded String
-  hi! link diffRemoved WarningMsg
+  hi! link Added String
+  hi! link Removed WarningMsg
   hi! link diffOnly WarningMsg
   hi! link diffNoEOL WarningMsg
   hi! link diffIsA WarningMsg
@@ -299,8 +299,8 @@ if s:t_Co >= 16
   hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
   hi! link Terminal Normal
   hi! link Debug Special
-  hi! link diffAdded String
-  hi! link diffRemoved WarningMsg
+  hi! link Added String
+  hi! link Removed WarningMsg
   hi! link diffOnly WarningMsg
   hi! link diffNoEOL WarningMsg
   hi! link diffIsA WarningMsg
@@ -411,8 +411,8 @@ if s:t_Co >= 8
   hi Label ctermfg=yellow ctermbg=NONE cterm=NONE
   hi! link Terminal Normal
   hi! link Debug Special
-  hi! link diffAdded String
-  hi! link diffRemoved WarningMsg
+  hi! link Added String
+  hi! link Removed WarningMsg
   hi! link diffOnly WarningMsg
   hi! link diffNoEOL WarningMsg
   hi! link diffIsA WarningMsg
diff --git a/runtime/colors/darkblue.vim b/runtime/colors/darkblue.vim
index 207d1ea..b792b90 100644
--- a/runtime/colors/darkblue.vim
+++ b/runtime/colors/darkblue.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original author Bohdan Vlasyuk <bohdan@vstu.edu.ua>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:33
+" Last Updated: Mon 08 Jan 2024 09:43:03 AM AEDT
 
 " Generated by Colortemplate v2.2.3
 
@@ -54,8 +54,8 @@ hi! link Structure Type
 hi! link Tag Special
 hi! link Typedef Type
 hi! link Debug Special
-hi! link diffAdded String
-hi! link diffRemoved WarningMsg
+hi! link Added String
+hi! link Removed WarningMsg
 hi! link diffOnly WarningMsg
 hi! link diffNoEOL WarningMsg
 hi! link diffIsA WarningMsg
@@ -162,8 +162,8 @@ if s:t_Co >= 256
   hi! link Tag Special
   hi! link Typedef Type
   hi! link Debug Special
-  hi! link diffAdded String
-  hi! link diffRemoved WarningMsg
+  hi! link Added String
+  hi! link Removed WarningMsg
   hi! link diffOnly WarningMsg
   hi! link diffNoEOL WarningMsg
   hi! link diffIsA WarningMsg
diff --git a/runtime/colors/evening.vim b/runtime/colors/evening.vim
index 3ac3242..2753daa 100644
--- a/runtime/colors/evening.vim
+++ b/runtime/colors/evening.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:35
+" Last Updated: Mon 08 Jan 2024 09:43:27 AM AEDT
 
 " Generated by Colortemplate v2.2.3
 
@@ -28,8 +28,8 @@ hi! link CursorIM Cursor
 hi! link LineNrAbove LineNr
 hi! link LineNrBelow LineNr
 hi! link Debug Special
-hi! link diffAdded String
-hi! link diffRemoved WarningMsg
+hi! link Added String
+hi! link Removed WarningMsg
 hi! link diffOnly WarningMsg
 hi! link diffNoEOL WarningMsg
 hi! link diffIsA WarningMsg
@@ -136,8 +136,8 @@ if s:t_Co >= 256
   hi! link LineNrAbove LineNr
   hi! link LineNrBelow LineNr
   hi! link Debug Special
-  hi! link diffAdded String
-  hi! link diffRemoved WarningMsg
+  hi! link Added String
+  hi! link Removed WarningMsg
   hi! link diffOnly WarningMsg
   hi! link diffNoEOL WarningMsg
   hi! link diffIsA WarningMsg
@@ -247,8 +247,8 @@ if s:t_Co >= 16
   hi! link LineNrAbove LineNr
   hi! link LineNrBelow LineNr
   hi! link Debug Special
-  hi! link diffAdded String
-  hi! link diffRemoved WarningMsg
+  hi! link Added String
+  hi! link Removed WarningMsg
   hi! link diffOnly WarningMsg
   hi! link diffNoEOL WarningMsg
   hi! link diffIsA WarningMsg
diff --git a/runtime/colors/habamax.vim b/runtime/colors/habamax.vim
index 4880482..f32a549 100644
--- a/runtime/colors/habamax.vim
+++ b/runtime/colors/habamax.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:35
+" Last Updated: Mon 08 Jan 2024 09:39:53 AM AEDT
 
 " Generated by Colortemplate v2.2.3
 
@@ -106,8 +106,9 @@ hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Debug guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
 hi DiffAdd guifg=#dadada guibg=#5f875f gui=NONE cterm=NONE
 hi DiffDelete guifg=#af875f guibg=NONE gui=NONE cterm=NONE
-hi diffAdded guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
-hi diffRemoved guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
+hi Added guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
+hi Changed guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
+hi Removed guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
 hi diffSubname guifg=#af87af guibg=NONE gui=NONE cterm=NONE
 hi DiffText guifg=#dadada guibg=#878787 gui=NONE cterm=NONE
 hi DiffChange guifg=#bcbcbc guibg=#5f5f5f gui=NONE cterm=NONE
@@ -199,8 +200,9 @@ if s:t_Co >= 256
   hi Debug ctermfg=66 ctermbg=NONE cterm=NONE
   hi DiffAdd ctermfg=253 ctermbg=65 cterm=NONE
   hi DiffDelete ctermfg=137 ctermbg=NONE cterm=NONE
-  hi diffAdded ctermfg=108 ctermbg=NONE cterm=NONE
-  hi diffRemoved ctermfg=167 ctermbg=NONE cterm=NONE
+  hi Added ctermfg=108 ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=66 ctermbg=NONE cterm=NONE
+  hi Removed ctermfg=167 ctermbg=NONE cterm=NONE
   hi diffSubname ctermfg=139 ctermbg=NONE cterm=NONE
   hi DiffText ctermfg=253 ctermbg=102 cterm=NONE
   hi DiffChange ctermfg=250 ctermbg=59 cterm=NONE
@@ -277,8 +279,9 @@ if s:t_Co >= 16
   hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
   hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi DiffText ctermfg=white ctermbg=lightgrey cterm=NONE
   hi DiffChange ctermfg=white ctermbg=darkgray cterm=NONE
@@ -355,8 +358,9 @@ if s:t_Co >= 8
   hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
   hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi DiffText ctermfg=white ctermbg=black cterm=bold,reverse
   hi DiffChange ctermfg=black ctermbg=white cterm=NONE
diff --git a/runtime/colors/lists/csscolors.vim b/runtime/colors/lists/csscolors.vim
index 7495522..986333d 100644
--- a/runtime/colors/lists/csscolors.vim
+++ b/runtime/colors/lists/csscolors.vim
@@ -4,6 +4,9 @@
 " Similar in spirit to rgb.txt, this plugin establishes a human-friendly name
 " for every color listed in the CSS standard:
 "
+" Note: the color names should be in lower case, because Vim will lookup the
+" a color by its lower case name.
+"
 " https://www.w3.org/TR/css-color-3/
 
 let s:keepcpo= &cpo
@@ -26,7 +29,6 @@ call extend(v:colornames, {
 			\ 'css_blue': '#0000FF',
 			\ 'css_teal': '#008080',
 			\ 'css_aqua': '#00FFFF',
-			\
 			\ 'css_aliceblue': '#f0f8ff',
 			\ 'css_antiquewhite': '#faebd7',
 			\ 'css_aquamarine': '#7fffd4',
@@ -160,6 +162,14 @@ call extend(v:colornames, {
 			\ 'css_yellowgreen': '#9acd32',
 			\ }, 'keep')
 
+" all keys should be in lower case, convert keys that are not yet
+for [key, val] in items(filter(copy(v:colornames), { key -> key  =~ '\u'}))
+  call remove(v:colornames, key)
+  if !has_key(v:colornames, tolower(key))
+    call extend(v:colornames, {tolower(key): val}, 'keep')
+  endif
+endfor
+
 let &cpo= s:keepcpo
 unlet s:keepcpo
 
diff --git a/runtime/colors/lists/default.vim b/runtime/colors/lists/default.vim
index 7d81c6f..c8df0c9 100644
--- a/runtime/colors/lists/default.vim
+++ b/runtime/colors/lists/default.vim
@@ -1,17 +1,50 @@
 " Maintainer:  Drew Vogel <dvogel@sidejump.org>
-" Last Change: 2023 Apr 19
+" Last Change: 2024 Mar 20
 "
 " Replaced rgb.txt as the source of de facto standard color names. This is
 " sourced each time the colorscheme command is run. It is also sourced each
 " time the highlight command fails to recognize a gui color. You can override
 " these colors by introducing a new colors/lists/default.vim file earlier in
 " the runtimepath.
+" Note: the color names should be in lower case, because Vim will lookup the
+" a color by its lower case name.
 
 " make sure line continuation works
 let s:keepcpo = &cpo
 set cpo&vim
 
-call extend(v:colornames, {
+function! s:Cleanup()
+  let &cpo = s:keepcpo
+  unlet s:keepcpo
+endfunction
+
+function! s:AddColors(cnames) abort
+  call extend(v:colornames, a:cnames, 'keep')
+
+  " all keys should be in lower case, convert keys that are not yet
+  let len_after = len(v:colornames)
+  if len_after == len(a:cnames)
+    " after extend(): v:colornames has all the keys of default_cnames
+    " checked: v:colornames also has no extra keys
+    " => keys are the same, and keys(default_cnames) are known to be ok
+    return
+  endif
+
+  for [key, val] in items(filter(copy(v:colornames), { key -> key  =~ '\u'}))
+    call remove(v:colornames, key)
+    if !has_key(v:colornames, tolower(key))
+      call extend(v:colornames, {tolower(key): val}, 'keep')
+    endif
+  endfor
+endfunction
+
+if exists('s:default_cnames')
+  call s:AddColors(s:default_cnames)
+  call s:Cleanup()
+  finish
+endif
+
+let s:default_cnames = {
 			\ 'snow': '#fffafa',
 			\ 'ghost white': '#f8f8ff',
 			\ 'ghostwhite': '#f8f8ff',
@@ -800,9 +833,9 @@ call extend(v:colornames, {
 			\ 'rebeccapurple': '#663399',
 			\ 'silver': '#c0c0c0',
 			\ 'teal': '#008080'
-			\ }, 'keep')
+			\ }
 
-let &cpo = s:keepcpo
-unlet s:keepcpo
+call s:AddColors(s:default_cnames)
+call s:Cleanup()
 
 "vim: sw=4
diff --git a/runtime/colors/lunaperche.vim b/runtime/colors/lunaperche.vim
index 4e4678e..3546710 100644
--- a/runtime/colors/lunaperche.vim
+++ b/runtime/colors/lunaperche.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Vim License (see `:help license`)
-" Last Updated: Fri 15 Dec 2023 20:05:37
+" Last Updated: Mon 08 Jan 2024 09:41:03 AM AEDT
 
 " Generated by Colortemplate v2.2.3
 
@@ -164,8 +164,9 @@ if &background ==# 'dark'
   hi DiffChange guifg=#c6c6c6 guibg=#5f5f5f gui=NONE cterm=NONE
   hi DiffText guifg=#afffff guibg=#5f8787 gui=NONE cterm=NONE
   hi DiffDelete guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
-  hi diffAdded guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
-  hi diffRemoved guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
+  hi Added guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
+  hi Changed guifg=#5fafff guibg=NONE gui=NONE cterm=NONE
+  hi Removed guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
   hi diffSubname guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE
   hi dirType guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
   hi dirPermissionUser guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE
@@ -254,8 +255,9 @@ else
   hi DiffChange guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
   hi DiffText guifg=#000000 guibg=#5fd7d7 gui=NONE cterm=NONE
   hi DiffDelete guifg=#870000 guibg=NONE gui=NONE cterm=NONE
-  hi diffAdded guifg=#008700 guibg=NONE gui=NONE cterm=NONE
-  hi diffRemoved guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
+  hi Added guifg=#008700 guibg=NONE gui=NONE cterm=NONE
+  hi Changed guifg=#005fd7 guibg=NONE gui=NONE cterm=NONE
+  hi Removed guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
   hi diffSubname guifg=#af00af guibg=NONE gui=NONE cterm=NONE
   hi dirType guifg=#005f5f guibg=NONE gui=NONE cterm=NONE
   hi dirPermissionUser guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE
@@ -421,8 +423,9 @@ if s:t_Co >= 256
     hi DiffChange ctermfg=251 ctermbg=59 cterm=NONE
     hi DiffText ctermfg=159 ctermbg=66 cterm=NONE
     hi DiffDelete ctermfg=174 ctermbg=NONE cterm=NONE
-    hi diffAdded ctermfg=77 ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=174 ctermbg=NONE cterm=NONE
+    hi Added ctermfg=77 ctermbg=NONE cterm=NONE
+    hi Changed ctermfg=75 ctermbg=NONE cterm=NONE
+    hi Removed ctermfg=174 ctermbg=NONE cterm=NONE
     hi diffSubname ctermfg=213 ctermbg=NONE cterm=NONE
     hi dirType ctermfg=176 ctermbg=NONE cterm=NONE
     hi dirPermissionUser ctermfg=71 ctermbg=NONE cterm=NONE
@@ -506,8 +509,9 @@ if s:t_Co >= 256
     hi DiffChange ctermfg=16 ctermbg=252 cterm=NONE
     hi DiffText ctermfg=16 ctermbg=80 cterm=NONE
     hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE
-    hi diffAdded ctermfg=28 ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=160 ctermbg=NONE cterm=NONE
+    hi Added ctermfg=28 ctermbg=NONE cterm=NONE
+    hi Changed ctermfg=26 ctermbg=NONE cterm=NONE
+    hi Removed ctermfg=160 ctermbg=NONE cterm=NONE
     hi diffSubname ctermfg=127 ctermbg=NONE cterm=NONE
     hi dirType ctermfg=23 ctermbg=NONE cterm=NONE
     hi dirPermissionUser ctermfg=130 ctermbg=NONE cterm=NONE
@@ -596,8 +600,9 @@ if s:t_Co >= 16
     hi DiffChange ctermfg=white ctermbg=darkgreen cterm=NONE
     hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
     hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
-    hi diffAdded ctermfg=green ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Added ctermfg=green ctermbg=NONE cterm=NONE
+    hi Changed ctermfg=blue ctermbg=NONE cterm=NONE
+    hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
     hi diffSubname ctermfg=magenta ctermbg=NONE cterm=NONE
     hi dirType ctermfg=darkmagenta ctermbg=NONE cterm=NONE
     hi dirPermissionUser ctermfg=darkgreen ctermbg=NONE cterm=NONE
@@ -681,8 +686,9 @@ if s:t_Co >= 16
     hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
     hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
     hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
-    hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=red ctermbg=NONE cterm=NONE
+    hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE
+    hi Removed ctermfg=red ctermbg=NONE cterm=NONE
     hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
     hi dirType ctermfg=darkcyan ctermbg=NONE cterm=NONE
     hi dirPermissionUser ctermfg=darkyellow ctermbg=NONE cterm=NONE
diff --git a/runtime/colors/murphy.vim b/runtime/colors/murphy.vim
index b829d49..a6a08ed 100644
--- a/runtime/colors/murphy.vim
+++ b/runtime/colors/murphy.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Ron Aaron <ron@ronware.org>.
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:38
+" Last Updated: Mon 08 Jan 2024 09:50:15 AM AEDT
 
 " Generated by Colortemplate v2.2.3
 
@@ -28,6 +28,7 @@ hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
 hi! link MessageWindow Pmenu
 hi! link PopupNotification Todo
+hi! link Added Constant
 hi Normal guifg=#87ff87 guibg=#000000 gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#0000ff guibg=#000000 gui=NONE cterm=NONE
 hi StatusLine guifg=#ffffff guibg=#00008b gui=NONE cterm=NONE
@@ -100,6 +101,7 @@ if s:t_Co >= 256
   hi! link StatusLineTermNC StatusLineNC
   hi! link MessageWindow Pmenu
   hi! link PopupNotification Todo
+  hi! link Added Constant
   hi Normal ctermfg=120 ctermbg=16 cterm=NONE
   hi EndOfBuffer ctermfg=21 ctermbg=16 cterm=NONE
   hi StatusLine ctermfg=231 ctermbg=18 cterm=NONE
diff --git a/runtime/colors/wildcharm.vim b/runtime/colors/wildcharm.vim
index 31facfa..ee1f376 100644
--- a/runtime/colors/wildcharm.vim
+++ b/runtime/colors/wildcharm.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:43
+" Last Updated: Mon 08 Jan 2024 09:40:36 AM AEDT
 
 " Generated by Colortemplate v2.2.3
 
@@ -93,8 +93,9 @@ if &background ==# 'dark'
   hi DiffChange guifg=#d0d0d0 guibg=#5f5f5f gui=NONE cterm=NONE
   hi DiffText guifg=#afffff guibg=#5f8787 gui=NONE cterm=NONE
   hi DiffDelete guifg=#ffafaf guibg=#875f5f gui=NONE cterm=NONE
-  hi diffAdded guifg=#00af5f guibg=NONE gui=NONE cterm=NONE
-  hi diffRemoved guifg=#d7005f guibg=NONE gui=NONE cterm=NONE
+  hi Added guifg=#00af5f guibg=NONE gui=NONE cterm=NONE
+  hi Changed guifg=#0087d7 guibg=NONE gui=NONE cterm=NONE
+  hi Removed guifg=#d7005f guibg=NONE gui=NONE cterm=NONE
 else
   " Light background
   if (has('termguicolors') && &termguicolors) || has('gui_running')
@@ -167,8 +168,9 @@ else
   hi DiffChange guifg=#262626 guibg=#dadada gui=NONE cterm=NONE
   hi DiffText guifg=#005f5f guibg=#afd7d7 gui=NONE cterm=NONE
   hi DiffDelete guifg=#875f5f guibg=#ffd7d7 gui=NONE cterm=NONE
-  hi diffAdded guifg=#008700 guibg=NONE gui=NONE cterm=NONE
-  hi diffRemoved guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
+  hi Added guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE
+  hi Changed guifg=#0087d7 guibg=NONE gui=NONE cterm=NONE
+  hi Removed guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
 endif
 
 if s:t_Co >= 256
@@ -247,8 +249,9 @@ if s:t_Co >= 256
     hi DiffChange ctermfg=252 ctermbg=59 cterm=NONE
     hi DiffText ctermfg=159 ctermbg=66 cterm=NONE
     hi DiffDelete ctermfg=217 ctermbg=95 cterm=NONE
-    hi diffAdded ctermfg=35 ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=161 ctermbg=NONE cterm=NONE
+    hi Added ctermfg=35 ctermbg=NONE cterm=NONE
+    hi Changed ctermfg=32 ctermbg=NONE cterm=NONE
+    hi Removed ctermfg=161 ctermbg=NONE cterm=NONE
   else
     " Light background
     hi Normal ctermfg=16 ctermbg=231 cterm=NONE
@@ -316,8 +319,9 @@ if s:t_Co >= 256
     hi DiffChange ctermfg=235 ctermbg=253 cterm=NONE
     hi DiffText ctermfg=23 ctermbg=152 cterm=NONE
     hi DiffDelete ctermfg=95 ctermbg=224 cterm=NONE
-    hi diffAdded ctermfg=28 ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=160 ctermbg=NONE cterm=NONE
+    hi Added ctermfg=71 ctermbg=NONE cterm=NONE
+    hi Changed ctermfg=32 ctermbg=NONE cterm=NONE
+    hi Removed ctermfg=160 ctermbg=NONE cterm=NONE
   endif
   unlet s:t_Co
   finish
@@ -386,12 +390,13 @@ if s:t_Co >= 16
     hi Directory ctermfg=blue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
     hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
     hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
     hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
-    hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE
+    hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
   else
     " Light background
     hi Normal ctermfg=black ctermbg=white cterm=NONE
@@ -455,12 +460,13 @@ if s:t_Co >= 16
     hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
     hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
     hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
     hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
-    hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=red ctermbg=NONE cterm=NONE
+    hi Added ctermfg=green ctermbg=NONE cterm=NONE
+    hi Changed ctermfg=blue ctermbg=NONE cterm=NONE
+    hi Removed ctermfg=red ctermbg=NONE cterm=NONE
   endif
   unlet s:t_Co
   finish
@@ -510,7 +516,7 @@ if s:t_Co >= 8
     hi VisualNOS ctermfg=black ctermbg=darkblue cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
     hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi Folded ctermfg=black ctermbg=NONE cterm=bold
+    hi Folded ctermfg=grey ctermbg=NONE cterm=bold
     hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
     hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse
@@ -519,20 +525,20 @@ if s:t_Co >= 8
     hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
     hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
     hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
-    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkmagenta ctermbg=NONE cterm=NONE
     hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
     hi Title ctermfg=NONE ctermbg=NONE cterm=bold
     hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=darkblue cterm=NONE
+    hi DiffText ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
   else
     " Light background
     hi Normal ctermfg=black ctermbg=grey cterm=NONE
@@ -586,20 +592,20 @@ if s:t_Co >= 8
     hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
     hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
     hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
-    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkmagenta ctermbg=NONE cterm=NONE
     hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
     hi Title ctermfg=NONE ctermbg=NONE cterm=bold
     hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi DiffText ctermfg=grey ctermbg=black cterm=NONE
-    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=darkblue cterm=NONE
+    hi DiffText ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
   endif
   unlet s:t_Co
   finish
@@ -700,7 +706,7 @@ endif
 " Color: colorlC                 #ff5fff        207            magenta
 " Color: colorDim                #878787        102            grey
 " Color: colorMP                 #ff00af        199            magenta
-" Color: diffAdd                 #5f875f        65             darkmagenta
+" Color: diffAdd                 #5f875f        65             darkgreen
 " Color: diffAddFg               #afffaf        157            black
 " Color: diffDelete              #875f5f        95             darkred
 " Color: diffDeleteFg            #ffafaf        217            black
@@ -739,7 +745,7 @@ endif
 " Color: colorDim                #626262        241            darkgrey
 " Color: colorSt                 #5f5f5f        59             darkgrey
 " Color: colorMP                 #ff00af        199            magenta
-" Color: diffAdd                 #afd7af        151            darkmagenta
+" Color: diffAdd                 #afd7af        151            darkgreen
 " Color: diffAddFg               #005f00        22             black
 " Color: diffDelete              #ffd7d7        224            darkred
 " Color: diffDeleteFg            #875f5f        95             black