Updated with base16-builder

35 files changed, 70 insertions, 70 deletions

diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
index b53881f..31d7a61 100644
--- a/colors/base16-3024.vim
+++ b/colors/base16-3024.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-3024.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-3024.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim
index e7ace7e..1ff9398 100644
--- a/colors/base16-apathy.vim
+++ b/colors/base16-apathy.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-apathy.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-apathy.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim
index 79ad27f..c3a9950 100644
--- a/colors/base16-ashes.vim
+++ b/colors/base16-ashes.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-ashes.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-ashes.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-atelierdune.vim b/colors/base16-atelierdune.vim
index 060d2a3..c262561 100644
--- a/colors/base16-atelierdune.vim
+++ b/colors/base16-atelierdune.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierdune.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierdune.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-atelierforest.vim b/colors/base16-atelierforest.vim
index 895afdc..0574867 100644
--- a/colors/base16-atelierforest.vim
+++ b/colors/base16-atelierforest.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierforest.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierforest.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-atelierheath.vim b/colors/base16-atelierheath.vim
index 0d01346..fb3c4d8 100644
--- a/colors/base16-atelierheath.vim
+++ b/colors/base16-atelierheath.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierheath.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierheath.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-atelierlakeside.vim b/colors/base16-atelierlakeside.vim
index ee17dd0..10d5cd7 100644
--- a/colors/base16-atelierlakeside.vim
+++ b/colors/base16-atelierlakeside.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierlakeside.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierlakeside.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-atelierseaside.vim b/colors/base16-atelierseaside.vim
index 3022a85..5aad7d5 100644
--- a/colors/base16-atelierseaside.vim
+++ b/colors/base16-atelierseaside.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierseaside.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelierseaside.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim
index 6c4fde0..a0dec1e 100644
--- a/colors/base16-bespin.vim
+++ b/colors/base16-bespin.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-bespin.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-bespin.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim
index 7e53df1..f4a1803 100644
--- a/colors/base16-brewer.vim
+++ b/colors/base16-brewer.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-brewer.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-brewer.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim
index 86702ee..6431f7a 100644
--- a/colors/base16-bright.vim
+++ b/colors/base16-bright.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-bright.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-bright.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index 8eee203..e5f3cef 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-chalk.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-chalk.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim
index c174099..b0dbf2c 100644
--- a/colors/base16-codeschool.vim
+++ b/colors/base16-codeschool.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-codeschool.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-codeschool.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-colors.vim b/colors/base16-colors.vim
index 89e616b..7addab9 100644
--- a/colors/base16-colors.vim
+++ b/colors/base16-colors.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-colors.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-colors.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-default.vim b/colors/base16-default.vim
index 3b98f15..0da2acc 100644
--- a/colors/base16-default.vim
+++ b/colors/base16-default.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-default.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-default.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index 15c4410..bd6bb48 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-eighties.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-eighties.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim
index 4f29652..382e8ce 100644
--- a/colors/base16-embers.vim
+++ b/colors/base16-embers.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-embers.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-embers.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim
index f69f44b..cf9bc52 100644
--- a/colors/base16-flat.vim
+++ b/colors/base16-flat.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-flat.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-flat.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-google.vim b/colors/base16-google.vim
index 0dd4b12..3459813 100644
--- a/colors/base16-google.vim
+++ b/colors/base16-google.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-google.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-google.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-grayscale.vim b/colors/base16-grayscale.vim
index c036293..91eecd8 100644
--- a/colors/base16-grayscale.vim
+++ b/colors/base16-grayscale.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-grayscale.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-grayscale.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index a2849eb..13c5d17 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-greenscreen.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-greenscreen.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-harmonic16.vim b/colors/base16-harmonic16.vim
index de25d62..224ee19 100644
--- a/colors/base16-harmonic16.vim
+++ b/colors/base16-harmonic16.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-harmonic16.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-harmonic16.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim
index bc7232a..2fb2b20 100644
--- a/colors/base16-isotope.vim
+++ b/colors/base16-isotope.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-isotope.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-isotope.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-londontube.vim b/colors/base16-londontube.vim
index 06b859a..46bcfd0 100644
--- a/colors/base16-londontube.vim
+++ b/colors/base16-londontube.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-londontube.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-londontube.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim
index d8d4413..9e455a9 100644
--- a/colors/base16-marrakesh.vim
+++ b/colors/base16-marrakesh.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-marrakesh.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-marrakesh.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index 2d532be..78b8e9b 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-mocha.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-mocha.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index 45a090a..9db4c2c 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-monokai.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-monokai.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index 026cac1..edac7b2 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-ocean.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-ocean.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim
index 988b5f0..ad0c9c6 100644
--- a/colors/base16-paraiso.vim
+++ b/colors/base16-paraiso.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-paraiso.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-paraiso.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index f6fdde6..723dc0c 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-railscasts.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-railscasts.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim
index 8ca1304..c6573bc 100644
--- a/colors/base16-shapeshifter.vim
+++ b/colors/base16-shapeshifter.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-shapeshifter.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-shapeshifter.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-solarized.vim b/colors/base16-solarized.vim
index d0f4d36..390e830 100644
--- a/colors/base16-solarized.vim
+++ b/colors/base16-solarized.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-solarized.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-solarized.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-summerfruit.vim b/colors/base16-summerfruit.vim
index 2d9c925..3fa355e 100644
--- a/colors/base16-summerfruit.vim
+++ b/colors/base16-summerfruit.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-summerfruit.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-summerfruit.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 7ecb9c6..85f4ccd 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-tomorrow.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-tomorrow.".&background.".sh"
   endif
 endif
 
diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim
index d94154f..099800d 100644
--- a/colors/base16-twilight.vim
+++ b/colors/base16-twilight.vim
@@ -5,9 +5,9 @@
 " :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 !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-twilight.dark.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-twilight.".&background.".sh"
   endif
 endif