Updated with base16-builder

10 files changed, 120 insertions, 40 deletions

diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index 3e565dd..29d8cc9 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -105,7 +105,7 @@ 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")
-  call <SID>hi("ColorColumn",  "", s:gui01, "", s:cterm01, "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, "")
@@ -124,6 +124,7 @@ 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")
+  call <SID>hi("ColorColumn",   "", s:gui06, "", s:cterm06, "none")
   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, "")
@@ -227,9 +228,16 @@ 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, "")
+if &background == "dark"
+  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, "")
+else
+  call <SID>hi("GitGutterAdd",     s:gui0B, s:gui06, s:cterm0B, s:cterm06, "")
+  call <SID>hi("GitGutterChange",  s:gui0D, s:gui06, s:cterm0D, s:cterm06, "")
+  call <SID>hi("GitGutterDelete",  s:gui08, s:gui06, s:cterm08, s:cterm06, "")
+endif
+
 
 " GitGutter Highlighting
 call <SID>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-default.vim b/colors/base16-default.vim
index 6f37850..7e8d088 100644
--- a/colors/base16-default.vim
+++ b/colors/base16-default.vim
@@ -105,7 +105,7 @@ 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")
-  call <SID>hi("ColorColumn",  "", s:gui01, "", s:cterm01, "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, "")
@@ -124,6 +124,7 @@ 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")
+  call <SID>hi("ColorColumn",   "", s:gui06, "", s:cterm06, "none")
   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, "")
@@ -227,9 +228,16 @@ 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, "")
+if &background == "dark"
+  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, "")
+else
+  call <SID>hi("GitGutterAdd",     s:gui0B, s:gui06, s:cterm0B, s:cterm06, "")
+  call <SID>hi("GitGutterChange",  s:gui0D, s:gui06, s:cterm0D, s:cterm06, "")
+  call <SID>hi("GitGutterDelete",  s:gui08, s:gui06, s:cterm08, s:cterm06, "")
+endif
+
 
 " GitGutter Highlighting
 call <SID>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index 464a846..095f242 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -105,7 +105,7 @@ 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")
-  call <SID>hi("ColorColumn",  "", s:gui01, "", s:cterm01, "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, "")
@@ -124,6 +124,7 @@ 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")
+  call <SID>hi("ColorColumn",   "", s:gui06, "", s:cterm06, "none")
   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, "")
@@ -227,9 +228,16 @@ 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, "")
+if &background == "dark"
+  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, "")
+else
+  call <SID>hi("GitGutterAdd",     s:gui0B, s:gui06, s:cterm0B, s:cterm06, "")
+  call <SID>hi("GitGutterChange",  s:gui0D, s:gui06, s:cterm0D, s:cterm06, "")
+  call <SID>hi("GitGutterDelete",  s:gui08, s:gui06, s:cterm08, s:cterm06, "")
+endif
+
 
 " GitGutter Highlighting
 call <SID>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index 55609fe..55226ac 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -105,7 +105,7 @@ 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")
-  call <SID>hi("ColorColumn",  "", s:gui01, "", s:cterm01, "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, "")
@@ -124,6 +124,7 @@ 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")
+  call <SID>hi("ColorColumn",   "", s:gui06, "", s:cterm06, "none")
   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, "")
@@ -227,9 +228,16 @@ 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, "")
+if &background == "dark"
+  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, "")
+else
+  call <SID>hi("GitGutterAdd",     s:gui0B, s:gui06, s:cterm0B, s:cterm06, "")
+  call <SID>hi("GitGutterChange",  s:gui0D, s:gui06, s:cterm0D, s:cterm06, "")
+  call <SID>hi("GitGutterDelete",  s:gui08, s:gui06, s:cterm08, s:cterm06, "")
+endif
+
 
 " GitGutter Highlighting
 call <SID>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index 73a1cba..cc3d3e0 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -105,7 +105,7 @@ 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")
-  call <SID>hi("ColorColumn",  "", s:gui01, "", s:cterm01, "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, "")
@@ -124,6 +124,7 @@ 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")
+  call <SID>hi("ColorColumn",   "", s:gui06, "", s:cterm06, "none")
   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, "")
@@ -227,9 +228,16 @@ 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, "")
+if &background == "dark"
+  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, "")
+else
+  call <SID>hi("GitGutterAdd",     s:gui0B, s:gui06, s:cterm0B, s:cterm06, "")
+  call <SID>hi("GitGutterChange",  s:gui0D, s:gui06, s:cterm0D, s:cterm06, "")
+  call <SID>hi("GitGutterDelete",  s:gui08, s:gui06, s:cterm08, s:cterm06, "")
+endif
+
 
 " GitGutter Highlighting
 call <SID>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index d743358..c1ea944 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -105,7 +105,7 @@ 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")
-  call <SID>hi("ColorColumn",  "", s:gui01, "", s:cterm01, "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, "")
@@ -124,6 +124,7 @@ 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")
+  call <SID>hi("ColorColumn",   "", s:gui06, "", s:cterm06, "none")
   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, "")
@@ -227,9 +228,16 @@ 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, "")
+if &background == "dark"
+  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, "")
+else
+  call <SID>hi("GitGutterAdd",     s:gui0B, s:gui06, s:cterm0B, s:cterm06, "")
+  call <SID>hi("GitGutterChange",  s:gui0D, s:gui06, s:cterm0D, s:cterm06, "")
+  call <SID>hi("GitGutterDelete",  s:gui08, s:gui06, s:cterm08, s:cterm06, "")
+endif
+
 
 " GitGutter Highlighting
 call <SID>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index 9d30de5..f398532 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -105,7 +105,7 @@ 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")
-  call <SID>hi("ColorColumn",  "", s:gui01, "", s:cterm01, "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, "")
@@ -124,6 +124,7 @@ 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")
+  call <SID>hi("ColorColumn",   "", s:gui06, "", s:cterm06, "none")
   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, "")
@@ -227,9 +228,16 @@ 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, "")
+if &background == "dark"
+  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, "")
+else
+  call <SID>hi("GitGutterAdd",     s:gui0B, s:gui06, s:cterm0B, s:cterm06, "")
+  call <SID>hi("GitGutterChange",  s:gui0D, s:gui06, s:cterm0D, s:cterm06, "")
+  call <SID>hi("GitGutterDelete",  s:gui08, s:gui06, s:cterm08, s:cterm06, "")
+endif
+
 
 " GitGutter Highlighting
 call <SID>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index fc3134b..0971011 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -105,7 +105,7 @@ 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")
-  call <SID>hi("ColorColumn",  "", s:gui01, "", s:cterm01, "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, "")
@@ -124,6 +124,7 @@ 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")
+  call <SID>hi("ColorColumn",   "", s:gui06, "", s:cterm06, "none")
   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, "")
@@ -227,9 +228,16 @@ 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, "")
+if &background == "dark"
+  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, "")
+else
+  call <SID>hi("GitGutterAdd",     s:gui0B, s:gui06, s:cterm0B, s:cterm06, "")
+  call <SID>hi("GitGutterChange",  s:gui0D, s:gui06, s:cterm0D, s:cterm06, "")
+  call <SID>hi("GitGutterDelete",  s:gui08, s:gui06, s:cterm08, s:cterm06, "")
+endif
+
 
 " GitGutter Highlighting
 call <SID>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-solarized.vim b/colors/base16-solarized.vim
index a53d1fc..234596b 100644
--- a/colors/base16-solarized.vim
+++ b/colors/base16-solarized.vim
@@ -105,7 +105,7 @@ 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")
-  call <SID>hi("ColorColumn",  "", s:gui01, "", s:cterm01, "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, "")
@@ -124,6 +124,7 @@ 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")
+  call <SID>hi("ColorColumn",   "", s:gui06, "", s:cterm06, "none")
   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, "")
@@ -227,9 +228,16 @@ 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, "")
+if &background == "dark"
+  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, "")
+else
+  call <SID>hi("GitGutterAdd",     s:gui0B, s:gui06, s:cterm0B, s:cterm06, "")
+  call <SID>hi("GitGutterChange",  s:gui0D, s:gui06, s:cterm0D, s:cterm06, "")
+  call <SID>hi("GitGutterDelete",  s:gui08, s:gui06, s:cterm08, s:cterm06, "")
+endif
+
 
 " GitGutter Highlighting
 call <SID>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 7e949ce..f54b3d2 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -105,7 +105,7 @@ 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")
-  call <SID>hi("ColorColumn",  "", s:gui01, "", s:cterm01, "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, "")
@@ -124,6 +124,7 @@ 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")
+  call <SID>hi("ColorColumn",   "", s:gui06, "", s:cterm06, "none")
   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, "")
@@ -227,9 +228,16 @@ 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, "")
+if &background == "dark"
+  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, "")
+else
+  call <SID>hi("GitGutterAdd",     s:gui0B, s:gui06, s:cterm0B, s:cterm06, "")
+  call <SID>hi("GitGutterChange",  s:gui0D, s:gui06, s:cterm0D, s:cterm06, "")
+  call <SID>hi("GitGutterDelete",  s:gui08, s:gui06, s:cterm08, s:cterm06, "")
+endif
+
 
 " GitGutter Highlighting
 call <SID>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")