Updated with base16-builder

35 files changed, 606 insertions, 306 deletions

diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
index 2b43684..937f1d1 100644
--- a/colors/base16-3024.vim
+++ b/colors/base16-3024.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim
index ea2a5f6..f23c1a6 100644
--- a/colors/base16-apathy.vim
+++ b/colors/base16-apathy.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim
index 90d17b7..c82147a 100644
--- a/colors/base16-ashes.vim
+++ b/colors/base16-ashes.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-atelierdune.vim b/colors/base16-atelierdune.vim
index 795cbcf..273c18c 100644
--- a/colors/base16-atelierdune.vim
+++ b/colors/base16-atelierdune.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-atelierforest.vim b/colors/base16-atelierforest.vim
index 91f3fdc..f7369cd 100644
--- a/colors/base16-atelierforest.vim
+++ b/colors/base16-atelierforest.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-atelierheath.vim b/colors/base16-atelierheath.vim
index 74f3cda..ebb2880 100644
--- a/colors/base16-atelierheath.vim
+++ b/colors/base16-atelierheath.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-atelierlakeside.vim b/colors/base16-atelierlakeside.vim
index 7d3bf7a..01fcd9b 100644
--- a/colors/base16-atelierlakeside.vim
+++ b/colors/base16-atelierlakeside.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-atelierseaside.vim b/colors/base16-atelierseaside.vim
index 160e434..f56cbc2 100644
--- a/colors/base16-atelierseaside.vim
+++ b/colors/base16-atelierseaside.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim
index 5b4c372..344faae 100644
--- a/colors/base16-bespin.vim
+++ b/colors/base16-bespin.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim
index bd46c87..9f9a91c 100644
--- a/colors/base16-brewer.vim
+++ b/colors/base16-brewer.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim
index dc2ef7a..fdad6f3 100644
--- a/colors/base16-bright.vim
+++ b/colors/base16-bright.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index 8d123c8..c85f8ca 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim
index 5c6fcf2..3a7af93 100644
--- a/colors/base16-codeschool.vim
+++ b/colors/base16-codeschool.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-colors.vim b/colors/base16-colors.vim
new file mode 100644
index 0000000..56681c6
--- /dev/null
+++ b/colors/base16-colors.vim
@@ -0,0 +1,300 @@
+" Base16 Colors (https://github.com/chriskempson/base16)
+" Scheme: mrmrs (http://clrs.cc)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has('gui')
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-colors.dark.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00 = "111111"
+let s:gui01 = "333333"
+let s:gui02 = "555555"
+let s:gui03 = "777777"
+let s:gui04 = "999999"
+let s:gui05 = "bbbbbb"
+let s:gui06 = "dddddd"
+let s:gui07 = "ffffff"
+let s:gui08 = "ff4136"
+let s:gui09 = "ff851b"
+let s:gui0A = "ffdc00"
+let s:gui0B = "2ecc40"
+let s:gui0C = "7fdbff"
+let s:gui0D = "0074d9"
+let s:gui0E = "b10dc9"
+let s:gui0F = "85144b"
+
+" Terminal color definitions
+let s:cterm00 = "00"
+let s:cterm03 = "08"
+let s:cterm05 = "07"
+let s:cterm07 = "15"
+let s:cterm08 = "01"
+let s:cterm0A = "03"
+let s:cterm0B = "02"
+let s:cterm0C = "06"
+let s:cterm0D = "04"
+let s:cterm0E = "05"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "10"
+  let s:cterm02 = "11"
+  let s:cterm04 = "12"
+  let s:cterm06 = "13"
+  let s:cterm09 = "09"
+  let s:cterm0F = "14"
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-colors"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+endfun
+
+" Return GUI color for light/dark variants
+fun s:gui(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:gui00
+    return s:gui07
+  elseif a:color == s:gui01
+    return s:gui06
+  elseif a:color == s:gui02
+    return s:gui05
+  elseif a:color == s:gui03
+    return s:gui04
+  elseif a:color == s:gui04
+    return s:gui03
+  elseif a:color == s:gui05
+    return s:gui02
+  elseif a:color == s:gui06
+    return s:gui01
+  elseif a:color == s:gui07
+    return s:gui00
+  endif
+
+  return a:color
+endfun
+
+" Return terminal color for light/dark variants
+fun s:cterm(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:cterm00
+    return s:cterm07
+  elseif a:color == s:cterm01
+    return s:cterm06
+  elseif a:color == s:cterm02
+    return s:cterm05
+  elseif a:color == s:cterm03
+    return s:cterm04
+  elseif a:color == s:cterm04
+    return s:cterm03
+  elseif a:color == s:cterm05
+    return s:cterm02
+  elseif a:color == s:cterm06
+    return s:cterm01
+  elseif a:color == s:cterm07
+    return s:cterm00
+  endif
+
+  return a:color
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none")
+call <sid>hi("Italic",        "", "", "", "", "none")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Search",        s:gui03, s:gui0A, s:cterm03, s:cterm0A,  "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WildMenu",      s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
+call <sid>hi("Type",         s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
+
+" Additional diff highlighting
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation",           s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "")
+
+" Git highlighting
+call <sid>hi("gitCommitOverflow",  s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary",   s:gui0B, "", s:cterm0B, "", "")
+  
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "")
+
+" Remove functions
+delf <sid>hi
+delf <sid>gui
+delf <sid>cterm
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-default.vim b/colors/base16-default.vim
index ac9e3f2..fe48e79 100644
--- a/colors/base16-default.vim
+++ b/colors/base16-default.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index 3451ad4..5ea8c51 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim
index 38cff8c..2df034a 100644
--- a/colors/base16-embers.vim
+++ b/colors/base16-embers.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim
index 78c9505..9b12fe7 100644
--- a/colors/base16-flat.vim
+++ b/colors/base16-flat.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-google.vim b/colors/base16-google.vim
index d20b440..2c5d8a4 100644
--- a/colors/base16-google.vim
+++ b/colors/base16-google.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-grayscale.vim b/colors/base16-grayscale.vim
index 96370ac..5fb7c16 100644
--- a/colors/base16-grayscale.vim
+++ b/colors/base16-grayscale.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index 8255a7b..dbd906e 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-harmonic16.vim b/colors/base16-harmonic16.vim
index 79988a4..38ca1b1 100644
--- a/colors/base16-harmonic16.vim
+++ b/colors/base16-harmonic16.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim
index e5f054b..dbcd2ad 100644
--- a/colors/base16-isotope.vim
+++ b/colors/base16-isotope.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-londontube.vim b/colors/base16-londontube.vim
index 4d97141..3ec6c71 100644
--- a/colors/base16-londontube.vim
+++ b/colors/base16-londontube.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim
index 9cca6cd..41a0288 100644
--- a/colors/base16-marrakesh.vim
+++ b/colors/base16-marrakesh.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index ab62778..da64fd0 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index 765a4f1..c130e46 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index 44fb6ff..fd99df4 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim
index f2ac571..954ce59 100644
--- a/colors/base16-paraiso.vim
+++ b/colors/base16-paraiso.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index 2f252ca..5347fc0 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim
index 9985a9f..313fa17 100644
--- a/colors/base16-shapeshifter.vim
+++ b/colors/base16-shapeshifter.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-solarized.vim b/colors/base16-solarized.vim
index 90fe7c5..a2e18c2 100644
--- a/colors/base16-solarized.vim
+++ b/colors/base16-solarized.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-summerfruit.vim b/colors/base16-summerfruit.vim
index 58cb92b..29ff7c7 100644
--- a/colors/base16-summerfruit.vim
+++ b/colors/base16-summerfruit.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 94fdceb..bfef8ed 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim
index 4c097f2..f1c1abf 100644
--- a/colors/base16-twilight.vim
+++ b/colors/base16-twilight.vim
@@ -214,15 +214,15 @@ call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
 call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
 
 " Additional diff highlighting
-call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd",      s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffChange",   s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffDelete",   s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffText",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffAdded",    s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffFile",     s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
+call <sid>hi("DiffNewFile",  s:gui00, s:gui0B,  s:cterm00, s:cterm0B, "")
+call <sid>hi("DiffLine",     s:gui00, s:gui0D,  s:cterm00, s:cterm0D, "")
+call <sid>hi("DiffRemoved",  s:gui00, s:gui08,  s:cterm00, s:cterm08, "")
 
 " Ruby highlighting
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")