Updated with base16-builder

10 files changed, 270 insertions, 370 deletions

diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index b8d755d..cc078c5 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -104,24 +104,19 @@ if &background == "dark"
   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")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui00, s:cterm05, 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, "")
-
-  if version >= 700
-    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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui00, s:cterm05, 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, "")
 else
   call <SID>hi("Cursor",        s:gui00, s:gui02, s:cterm00, s:cterm02, "")
   call <SID>hi("NonText",       s:gui05, "", s:cterm05, "", "")
@@ -131,26 +126,21 @@ else
   call <SID>hi("StatusLine",    s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("StatusLineNC",  s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("VertSplit",     s:gui05, s:gui05, s:cterm05, s:cterm05, "none")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
-  call <SID>hi("DiffDelete",   s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
-  call <SID>hi("DiffText",     s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
-
-  if version >= 700
-    call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
-    call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
-    call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
+  call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
+  call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
+  call <SID>hi("DiffDelete",    s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
+  call <SID>hi("DiffText",      s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
 endif
 
-" Syntax Highlighting
+" 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, "", "")
@@ -186,7 +176,7 @@ call <SID>hi("SpellBad",     s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellRare",   s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellLocal",  s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 
-" Diff Highlighting
+" Additional Diff Highlighting
 call <SID>hi("DiffAdded",    s:gui0B, "", s:cterm0B, "", "")
 call <SID>hi("DiffFile",     s:gui08, "", s:cterm08, "", "")
 call <SID>hi("DiffNewFile",  s:gui0B, "", s:cterm0B, "", "")
diff --git a/colors/base16-default.vim b/colors/base16-default.vim
index aca81de..512b7ef 100644
--- a/colors/base16-default.vim
+++ b/colors/base16-default.vim
@@ -104,24 +104,19 @@ if &background == "dark"
   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")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui00, s:cterm05, 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, "")
-
-  if version >= 700
-    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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui00, s:cterm05, 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, "")
 else
   call <SID>hi("Cursor",        s:gui00, s:gui02, s:cterm00, s:cterm02, "")
   call <SID>hi("NonText",       s:gui05, "", s:cterm05, "", "")
@@ -131,26 +126,21 @@ else
   call <SID>hi("StatusLine",    s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("StatusLineNC",  s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("VertSplit",     s:gui05, s:gui05, s:cterm05, s:cterm05, "none")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
-  call <SID>hi("DiffDelete",   s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
-  call <SID>hi("DiffText",     s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
-
-  if version >= 700
-    call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
-    call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
-    call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
+  call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
+  call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
+  call <SID>hi("DiffDelete",    s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
+  call <SID>hi("DiffText",      s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
 endif
 
-" Syntax Highlighting
+" 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, "", "")
@@ -186,7 +176,7 @@ call <SID>hi("SpellBad",     s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellRare",   s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellLocal",  s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 
-" Diff Highlighting
+" Additional Diff Highlighting
 call <SID>hi("DiffAdded",    s:gui0B, "", s:cterm0B, "", "")
 call <SID>hi("DiffFile",     s:gui08, "", s:cterm08, "", "")
 call <SID>hi("DiffNewFile",  s:gui0B, "", s:cterm0B, "", "")
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index f97047e..2ea3bcf 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -104,24 +104,19 @@ if &background == "dark"
   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")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui00, s:cterm05, 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, "")
-
-  if version >= 700
-    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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui00, s:cterm05, 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, "")
 else
   call <SID>hi("Cursor",        s:gui00, s:gui02, s:cterm00, s:cterm02, "")
   call <SID>hi("NonText",       s:gui05, "", s:cterm05, "", "")
@@ -131,26 +126,21 @@ else
   call <SID>hi("StatusLine",    s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("StatusLineNC",  s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("VertSplit",     s:gui05, s:gui05, s:cterm05, s:cterm05, "none")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
-  call <SID>hi("DiffDelete",   s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
-  call <SID>hi("DiffText",     s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
-
-  if version >= 700
-    call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
-    call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
-    call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
+  call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
+  call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
+  call <SID>hi("DiffDelete",    s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
+  call <SID>hi("DiffText",      s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
 endif
 
-" Syntax Highlighting
+" 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, "", "")
@@ -186,7 +176,7 @@ call <SID>hi("SpellBad",     s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellRare",   s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellLocal",  s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 
-" Diff Highlighting
+" Additional Diff Highlighting
 call <SID>hi("DiffAdded",    s:gui0B, "", s:cterm0B, "", "")
 call <SID>hi("DiffFile",     s:gui08, "", s:cterm08, "", "")
 call <SID>hi("DiffNewFile",  s:gui0B, "", s:cterm0B, "", "")
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index e30f1a0..6cb2a8a 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -104,24 +104,19 @@ if &background == "dark"
   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")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui00, s:cterm05, 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, "")
-
-  if version >= 700
-    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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui00, s:cterm05, 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, "")
 else
   call <SID>hi("Cursor",        s:gui00, s:gui02, s:cterm00, s:cterm02, "")
   call <SID>hi("NonText",       s:gui05, "", s:cterm05, "", "")
@@ -131,26 +126,21 @@ else
   call <SID>hi("StatusLine",    s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("StatusLineNC",  s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("VertSplit",     s:gui05, s:gui05, s:cterm05, s:cterm05, "none")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
-  call <SID>hi("DiffDelete",   s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
-  call <SID>hi("DiffText",     s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
-
-  if version >= 700
-    call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
-    call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
-    call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
+  call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
+  call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
+  call <SID>hi("DiffDelete",    s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
+  call <SID>hi("DiffText",      s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
 endif
 
-" Syntax Highlighting
+" 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, "", "")
@@ -186,7 +176,7 @@ call <SID>hi("SpellBad",     s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellRare",   s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellLocal",  s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 
-" Diff Highlighting
+" Additional Diff Highlighting
 call <SID>hi("DiffAdded",    s:gui0B, "", s:cterm0B, "", "")
 call <SID>hi("DiffFile",     s:gui08, "", s:cterm08, "", "")
 call <SID>hi("DiffNewFile",  s:gui0B, "", s:cterm0B, "", "")
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index 437a444..b1b0628 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -104,24 +104,19 @@ if &background == "dark"
   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")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui00, s:cterm05, 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, "")
-
-  if version >= 700
-    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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui00, s:cterm05, 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, "")
 else
   call <SID>hi("Cursor",        s:gui00, s:gui02, s:cterm00, s:cterm02, "")
   call <SID>hi("NonText",       s:gui05, "", s:cterm05, "", "")
@@ -131,26 +126,21 @@ else
   call <SID>hi("StatusLine",    s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("StatusLineNC",  s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("VertSplit",     s:gui05, s:gui05, s:cterm05, s:cterm05, "none")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
-  call <SID>hi("DiffDelete",   s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
-  call <SID>hi("DiffText",     s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
-
-  if version >= 700
-    call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
-    call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
-    call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
+  call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
+  call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
+  call <SID>hi("DiffDelete",    s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
+  call <SID>hi("DiffText",      s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
 endif
 
-" Syntax Highlighting
+" 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, "", "")
@@ -186,7 +176,7 @@ call <SID>hi("SpellBad",     s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellRare",   s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellLocal",  s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 
-" Diff Highlighting
+" Additional Diff Highlighting
 call <SID>hi("DiffAdded",    s:gui0B, "", s:cterm0B, "", "")
 call <SID>hi("DiffFile",     s:gui08, "", s:cterm08, "", "")
 call <SID>hi("DiffNewFile",  s:gui0B, "", s:cterm0B, "", "")
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index 52f0201..7e42709 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -104,24 +104,19 @@ if &background == "dark"
   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")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui00, s:cterm05, 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, "")
-
-  if version >= 700
-    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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui00, s:cterm05, 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, "")
 else
   call <SID>hi("Cursor",        s:gui00, s:gui02, s:cterm00, s:cterm02, "")
   call <SID>hi("NonText",       s:gui05, "", s:cterm05, "", "")
@@ -131,26 +126,21 @@ else
   call <SID>hi("StatusLine",    s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("StatusLineNC",  s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("VertSplit",     s:gui05, s:gui05, s:cterm05, s:cterm05, "none")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
-  call <SID>hi("DiffDelete",   s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
-  call <SID>hi("DiffText",     s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
-
-  if version >= 700
-    call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
-    call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
-    call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
+  call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
+  call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
+  call <SID>hi("DiffDelete",    s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
+  call <SID>hi("DiffText",      s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
 endif
 
-" Syntax Highlighting
+" 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, "", "")
@@ -186,7 +176,7 @@ call <SID>hi("SpellBad",     s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellRare",   s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellLocal",  s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 
-" Diff Highlighting
+" Additional Diff Highlighting
 call <SID>hi("DiffAdded",    s:gui0B, "", s:cterm0B, "", "")
 call <SID>hi("DiffFile",     s:gui08, "", s:cterm08, "", "")
 call <SID>hi("DiffNewFile",  s:gui0B, "", s:cterm0B, "", "")
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index 9bd8e8c..b03af7d 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -104,24 +104,19 @@ if &background == "dark"
   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")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui00, s:cterm05, 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, "")
-
-  if version >= 700
-    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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui00, s:cterm05, 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, "")
 else
   call <SID>hi("Cursor",        s:gui00, s:gui02, s:cterm00, s:cterm02, "")
   call <SID>hi("NonText",       s:gui05, "", s:cterm05, "", "")
@@ -131,26 +126,21 @@ else
   call <SID>hi("StatusLine",    s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("StatusLineNC",  s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("VertSplit",     s:gui05, s:gui05, s:cterm05, s:cterm05, "none")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
-  call <SID>hi("DiffDelete",   s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
-  call <SID>hi("DiffText",     s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
-
-  if version >= 700
-    call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
-    call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
-    call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
+  call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
+  call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
+  call <SID>hi("DiffDelete",    s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
+  call <SID>hi("DiffText",      s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
 endif
 
-" Syntax Highlighting
+" 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, "", "")
@@ -186,7 +176,7 @@ call <SID>hi("SpellBad",     s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellRare",   s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellLocal",  s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 
-" Diff Highlighting
+" Additional Diff Highlighting
 call <SID>hi("DiffAdded",    s:gui0B, "", s:cterm0B, "", "")
 call <SID>hi("DiffFile",     s:gui08, "", s:cterm08, "", "")
 call <SID>hi("DiffNewFile",  s:gui0B, "", s:cterm0B, "", "")
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index 4c87d71..e1b33bf 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -104,24 +104,19 @@ if &background == "dark"
   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")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui00, s:cterm05, 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, "")
-
-  if version >= 700
-    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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui00, s:cterm05, 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, "")
 else
   call <SID>hi("Cursor",        s:gui00, s:gui02, s:cterm00, s:cterm02, "")
   call <SID>hi("NonText",       s:gui05, "", s:cterm05, "", "")
@@ -131,26 +126,21 @@ else
   call <SID>hi("StatusLine",    s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("StatusLineNC",  s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("VertSplit",     s:gui05, s:gui05, s:cterm05, s:cterm05, "none")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
-  call <SID>hi("DiffDelete",   s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
-  call <SID>hi("DiffText",     s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
-
-  if version >= 700
-    call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
-    call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
-    call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
+  call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
+  call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
+  call <SID>hi("DiffDelete",    s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
+  call <SID>hi("DiffText",      s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
 endif
 
-" Syntax Highlighting
+" 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, "", "")
@@ -186,7 +176,7 @@ call <SID>hi("SpellBad",     s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellRare",   s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellLocal",  s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 
-" Diff Highlighting
+" Additional Diff Highlighting
 call <SID>hi("DiffAdded",    s:gui0B, "", s:cterm0B, "", "")
 call <SID>hi("DiffFile",     s:gui08, "", s:cterm08, "", "")
 call <SID>hi("DiffNewFile",  s:gui0B, "", s:cterm0B, "", "")
diff --git a/colors/base16-solarized.vim b/colors/base16-solarized.vim
index 6ee1961..39f1498 100644
--- a/colors/base16-solarized.vim
+++ b/colors/base16-solarized.vim
@@ -104,24 +104,19 @@ if &background == "dark"
   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")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui00, s:cterm05, 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, "")
-
-  if version >= 700
-    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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui00, s:cterm05, 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, "")
 else
   call <SID>hi("Cursor",        s:gui00, s:gui02, s:cterm00, s:cterm02, "")
   call <SID>hi("NonText",       s:gui05, "", s:cterm05, "", "")
@@ -131,26 +126,21 @@ else
   call <SID>hi("StatusLine",    s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("StatusLineNC",  s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("VertSplit",     s:gui05, s:gui05, s:cterm05, s:cterm05, "none")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
-  call <SID>hi("DiffDelete",   s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
-  call <SID>hi("DiffText",     s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
-
-  if version >= 700
-    call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
-    call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
-    call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
+  call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
+  call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
+  call <SID>hi("DiffDelete",    s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
+  call <SID>hi("DiffText",      s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
 endif
 
-" Syntax Highlighting
+" 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, "", "")
@@ -186,7 +176,7 @@ call <SID>hi("SpellBad",     s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellRare",   s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellLocal",  s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 
-" Diff Highlighting
+" Additional Diff Highlighting
 call <SID>hi("DiffAdded",    s:gui0B, "", s:cterm0B, "", "")
 call <SID>hi("DiffFile",     s:gui08, "", s:cterm08, "", "")
 call <SID>hi("DiffNewFile",  s:gui0B, "", s:cterm0B, "", "")
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 4096b53..aba9611 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -104,24 +104,19 @@ if &background == "dark"
   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")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui00, s:cterm05, 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, "")
-
-  if version >= 700
-    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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  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:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui00, s:cterm05, 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, "")
 else
   call <SID>hi("Cursor",        s:gui00, s:gui02, s:cterm00, s:cterm02, "")
   call <SID>hi("NonText",       s:gui05, "", s:cterm05, "", "")
@@ -131,26 +126,21 @@ else
   call <SID>hi("StatusLine",    s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("StatusLineNC",  s:gui04, s:gui06, s:cterm04, s:cterm06, "none")
   call <SID>hi("VertSplit",     s:gui05, s:gui05, s:cterm05, s:cterm05, "none")
-
-  " Diff Highlighting
-  call <SID>hi("DiffAdd",      s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
-  call <SID>hi("DiffChange",   s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
-  call <SID>hi("DiffDelete",   s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
-  call <SID>hi("DiffText",     s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
-
-  if version >= 700
-    call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
-    call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
-    call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
-    call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
-    call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
-    call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-    call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
-  endif
+  call <SID>hi("CursorColumn",  "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLine",    "", s:gui06, "", s:cterm06, "none")
+  call <SID>hi("CursorLineNr",  s:gui04, s:gui06, s:cterm04, s:cterm06, "")
+  call <SID>hi("PMenu",         s:gui05, s:gui03, s:cterm05, s:cterm03, "none")
+  call <SID>hi("PMenuSel",      s:gui05, s:gui03, s:cterm05, s:cterm03, "reverse")
+  call <SID>hi("TabLine",       s:gui05, s:gui01, s:cterm05, s:cterm01, "reverse")
+  call <SID>hi("TabLineFill",   s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("TabLineSel",    s:gui06, s:gui01, s:cterm06, s:cterm01, "reverse")
+  call <SID>hi("DiffAdd",       s:gui0B, s:gui0F, s:cterm0B, s:cterm0F, "")
+  call <SID>hi("DiffChange",    s:gui05, s:gui0F, s:cterm05, s:cterm0F, "")
+  call <SID>hi("DiffDelete",    s:gui08, s:gui0F, s:cterm08, s:cterm0F, "")
+  call <SID>hi("DiffText",      s:gui0D, s:gui0F, s:cterm0D, s:cterm0F, "")
 endif
 
-" Syntax Highlighting
+" 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, "", "")
@@ -186,7 +176,7 @@ call <SID>hi("SpellBad",     s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellRare",   s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 "call <SID>hi("SpellLocal",  s:gui00, s:gui08, s:cterm00, s:cterm08, "")
 
-" Diff Highlighting
+" Additional Diff Highlighting
 call <SID>hi("DiffAdded",    s:gui0B, "", s:cterm0B, "", "")
 call <SID>hi("DiffFile",     s:gui08, "", s:cterm08, "", "")
 call <SID>hi("DiffNewFile",  s:gui0B, "", s:cterm0B, "", "")