Fixes issue with missing scheme slug in output

99 files changed, 198 insertions, 198 deletions

diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
index eda70c5..9bb4581 100644
--- a/colors/base16-3024.vim
+++ b/colors/base16-3024.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-3024.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-3024"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim
index 1af520a..d8ed869 100644
--- a/colors/base16-apathy.vim
+++ b/colors/base16-apathy.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-apathy.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-apathy"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim
index 86c17be..3cada36 100644
--- a/colors/base16-ashes.vim
+++ b/colors/base16-ashes.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-ashes.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-ashes"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-cave-light.vim b/colors/base16-atelier-cave-light.vim
index 3f71a80..cc40eb9 100644
--- a/colors/base16-atelier-cave-light.vim
+++ b/colors/base16-atelier-cave-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-cave-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-cave-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim
index 6064555..8b1ca9f 100644
--- a/colors/base16-atelier-cave.vim
+++ b/colors/base16-atelier-cave.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-cave.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-cave"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-dune-light.vim b/colors/base16-atelier-dune-light.vim
index 149b9c5..c181a6e 100644
--- a/colors/base16-atelier-dune-light.vim
+++ b/colors/base16-atelier-dune-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-dune-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-dune-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim
index 441c72b..4f636bd 100644
--- a/colors/base16-atelier-dune.vim
+++ b/colors/base16-atelier-dune.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-dune.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-dune"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-estuary-light.vim b/colors/base16-atelier-estuary-light.vim
index 0f0e197..8a4b320 100644
--- a/colors/base16-atelier-estuary-light.vim
+++ b/colors/base16-atelier-estuary-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-estuary-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-estuary-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim
index 62d8773..e4f3ed6 100644
--- a/colors/base16-atelier-estuary.vim
+++ b/colors/base16-atelier-estuary.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-estuary.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-estuary"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-forest-light.vim b/colors/base16-atelier-forest-light.vim
index c3d532d..9494b77 100644
--- a/colors/base16-atelier-forest-light.vim
+++ b/colors/base16-atelier-forest-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-forest-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-forest-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim
index 689f155..f64687d 100644
--- a/colors/base16-atelier-forest.vim
+++ b/colors/base16-atelier-forest.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-forest.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-forest"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-heath-light.vim b/colors/base16-atelier-heath-light.vim
index 3779010..b87fe02 100644
--- a/colors/base16-atelier-heath-light.vim
+++ b/colors/base16-atelier-heath-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-heath-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-heath-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim
index ba82900..088139f 100644
--- a/colors/base16-atelier-heath.vim
+++ b/colors/base16-atelier-heath.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-heath.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-heath"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-lakeside-light.vim b/colors/base16-atelier-lakeside-light.vim
index 83ecaed..37b2009 100644
--- a/colors/base16-atelier-lakeside-light.vim
+++ b/colors/base16-atelier-lakeside-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-lakeside-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-lakeside-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim
index 25bbd3d..78d306e 100644
--- a/colors/base16-atelier-lakeside.vim
+++ b/colors/base16-atelier-lakeside.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-lakeside.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-lakeside"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-plateau-light.vim b/colors/base16-atelier-plateau-light.vim
index daff903..1045204 100644
--- a/colors/base16-atelier-plateau-light.vim
+++ b/colors/base16-atelier-plateau-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-plateau-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-plateau-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim
index ce27f1e..4407d1f 100644
--- a/colors/base16-atelier-plateau.vim
+++ b/colors/base16-atelier-plateau.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-plateau.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-plateau"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-savanna-light.vim b/colors/base16-atelier-savanna-light.vim
index 1458c0f..a79034d 100644
--- a/colors/base16-atelier-savanna-light.vim
+++ b/colors/base16-atelier-savanna-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-savanna-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-savanna-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim
index 099a3e2..78812dd 100644
--- a/colors/base16-atelier-savanna.vim
+++ b/colors/base16-atelier-savanna.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-savanna.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-savanna"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-seaside-light.vim b/colors/base16-atelier-seaside-light.vim
index 70cf16b..90a1296 100644
--- a/colors/base16-atelier-seaside-light.vim
+++ b/colors/base16-atelier-seaside-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-seaside-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-seaside-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim
index e84d47d..c88af5e 100644
--- a/colors/base16-atelier-seaside.vim
+++ b/colors/base16-atelier-seaside.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-seaside.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-seaside"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-sulphurpool-light.vim b/colors/base16-atelier-sulphurpool-light.vim
index fae74ea..5c6dadc 100644
--- a/colors/base16-atelier-sulphurpool-light.vim
+++ b/colors/base16-atelier-sulphurpool-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-sulphurpool-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-sulphurpool-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim
index e65c908..e8fbad2 100644
--- a/colors/base16-atelier-sulphurpool.vim
+++ b/colors/base16-atelier-sulphurpool.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-atelier-sulphurpool.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-atelier-sulphurpool"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim
index 8f00b50..b49e315 100644
--- a/colors/base16-bespin.vim
+++ b/colors/base16-bespin.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-bespin.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-bespin"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim
index 0e09f73..447f6a7 100644
--- a/colors/base16-brewer.vim
+++ b/colors/base16-brewer.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-brewer.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-brewer"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim
index 8ffc1d7..2f968fb 100644
--- a/colors/base16-bright.vim
+++ b/colors/base16-bright.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-bright.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-bright"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-brushtrees-dark.vim b/colors/base16-brushtrees-dark.vim
index 2d2d0d6..142b5f7 100644
--- a/colors/base16-brushtrees-dark.vim
+++ b/colors/base16-brushtrees-dark.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-brushtrees-dark.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-brushtrees-dark"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-brushtrees.vim b/colors/base16-brushtrees.vim
index db40808..ab335ba 100644
--- a/colors/base16-brushtrees.vim
+++ b/colors/base16-brushtrees.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-brushtrees.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-brushtrees"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index ecb10be..0019f72 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-chalk.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-chalk"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-circus.vim b/colors/base16-circus.vim
index 79a7d51..5ec8393 100644
--- a/colors/base16-circus.vim
+++ b/colors/base16-circus.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-circus.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-circus"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-classic-dark.vim b/colors/base16-classic-dark.vim
index cb41a7b..56d6976 100644
--- a/colors/base16-classic-dark.vim
+++ b/colors/base16-classic-dark.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-classic-dark.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-classic-dark"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-classic-light.vim b/colors/base16-classic-light.vim
index 4e733dc..423ac49 100644
--- a/colors/base16-classic-light.vim
+++ b/colors/base16-classic-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-classic-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-classic-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim
index 9970176..4ecfc92 100644
--- a/colors/base16-codeschool.vim
+++ b/colors/base16-codeschool.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-codeschool.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-codeschool"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-cupcake.vim b/colors/base16-cupcake.vim
index 5ebe808..1e10290 100644
--- a/colors/base16-cupcake.vim
+++ b/colors/base16-cupcake.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-cupcake.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-cupcake"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-cupertino.vim b/colors/base16-cupertino.vim
index 9a8a213..c0395e9 100644
--- a/colors/base16-cupertino.vim
+++ b/colors/base16-cupertino.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-cupertino.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-cupertino"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim
index f4dc32d..5cbda5d 100644
--- a/colors/base16-darktooth.vim
+++ b/colors/base16-darktooth.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-darktooth.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-darktooth"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim
index 30c7104..ea529ec 100644
--- a/colors/base16-default-dark.vim
+++ b/colors/base16-default-dark.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-default-dark.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-default-dark"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim
index c5accce..299eadf 100644
--- a/colors/base16-default-light.vim
+++ b/colors/base16-default-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-default-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-default-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-dracula.vim b/colors/base16-dracula.vim
index 1005b91..16cab70 100644
--- a/colors/base16-dracula.vim
+++ b/colors/base16-dracula.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-dracula.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-dracula"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index d05b2cd..9946e47 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-eighties.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-eighties"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim
index 13ef288..ac095c9 100644
--- a/colors/base16-embers.vim
+++ b/colors/base16-embers.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-embers.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-embers"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim
index e4c20df..95628c2 100644
--- a/colors/base16-flat.vim
+++ b/colors/base16-flat.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-flat.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-flat"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-github.vim b/colors/base16-github.vim
index 4973840..a23bd81 100644
--- a/colors/base16-github.vim
+++ b/colors/base16-github.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-github.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-github"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-google-dark.vim b/colors/base16-google-dark.vim
index b7eaaea..0155bcd 100644
--- a/colors/base16-google-dark.vim
+++ b/colors/base16-google-dark.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-google-dark.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-google-dark"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-google-light.vim b/colors/base16-google-light.vim
index bd030d3..98e6995 100644
--- a/colors/base16-google-light.vim
+++ b/colors/base16-google-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-google-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-google-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-grayscale-dark.vim b/colors/base16-grayscale-dark.vim
index 1a5d92f..acd21a6 100644
--- a/colors/base16-grayscale-dark.vim
+++ b/colors/base16-grayscale-dark.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-grayscale-dark.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-grayscale-dark"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-grayscale-light.vim b/colors/base16-grayscale-light.vim
index ac67087..1be8de6 100644
--- a/colors/base16-grayscale-light.vim
+++ b/colors/base16-grayscale-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-grayscale-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-grayscale-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index 1badf5c..8b20ad0 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-greenscreen.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-greenscreen"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-gruvbox-dark-hard.vim b/colors/base16-gruvbox-dark-hard.vim
index 5443a50..138671c 100644
--- a/colors/base16-gruvbox-dark-hard.vim
+++ b/colors/base16-gruvbox-dark-hard.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-dark-hard.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-gruvbox-dark-hard"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-gruvbox-dark-medium.vim b/colors/base16-gruvbox-dark-medium.vim
index b3e87b3..75f2a5c 100644
--- a/colors/base16-gruvbox-dark-medium.vim
+++ b/colors/base16-gruvbox-dark-medium.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-dark-medium.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-gruvbox-dark-medium"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-gruvbox-dark-pale.vim b/colors/base16-gruvbox-dark-pale.vim
index 3693ac9..2ba0cbf 100644
--- a/colors/base16-gruvbox-dark-pale.vim
+++ b/colors/base16-gruvbox-dark-pale.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-dark-pale.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-gruvbox-dark-pale"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-gruvbox-dark-soft.vim b/colors/base16-gruvbox-dark-soft.vim
index fa8f6de..5e2095c 100644
--- a/colors/base16-gruvbox-dark-soft.vim
+++ b/colors/base16-gruvbox-dark-soft.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-dark-soft.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-gruvbox-dark-soft"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-gruvbox-light-hard.vim b/colors/base16-gruvbox-light-hard.vim
index 4522d68..51dafe1 100644
--- a/colors/base16-gruvbox-light-hard.vim
+++ b/colors/base16-gruvbox-light-hard.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-light-hard.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-gruvbox-light-hard"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-gruvbox-light-medium.vim b/colors/base16-gruvbox-light-medium.vim
index df67e17..51a2b95 100644
--- a/colors/base16-gruvbox-light-medium.vim
+++ b/colors/base16-gruvbox-light-medium.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-light-medium.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-gruvbox-light-medium"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-gruvbox-light-soft.vim b/colors/base16-gruvbox-light-soft.vim
index 69c3e0a..be1ab4a 100644
--- a/colors/base16-gruvbox-light-soft.vim
+++ b/colors/base16-gruvbox-light-soft.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-light-soft.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-gruvbox-light-soft"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic-dark.vim
index 0b17a82..d741873 100644
--- a/colors/base16-harmonic-dark.vim
+++ b/colors/base16-harmonic-dark.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-harmonic-dark.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-harmonic-dark"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic-light.vim
index d195f81..e930003 100644
--- a/colors/base16-harmonic-light.vim
+++ b/colors/base16-harmonic-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-harmonic-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-harmonic-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-hopscotch.vim b/colors/base16-hopscotch.vim
index 3b84e5c..935ee9c 100644
--- a/colors/base16-hopscotch.vim
+++ b/colors/base16-hopscotch.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-hopscotch.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-hopscotch"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-irblack.vim b/colors/base16-irblack.vim
index a924d63..3e00883 100644
--- a/colors/base16-irblack.vim
+++ b/colors/base16-irblack.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-irblack.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-irblack"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim
index aafdc94..7a1fd50 100644
--- a/colors/base16-isotope.vim
+++ b/colors/base16-isotope.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-isotope.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-isotope"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim
index a4b51ef..4ca8c63 100644
--- a/colors/base16-macintosh.vim
+++ b/colors/base16-macintosh.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-macintosh.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-macintosh"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim
index 8b69776..b6d988e 100644
--- a/colors/base16-marrakesh.vim
+++ b/colors/base16-marrakesh.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-marrakesh.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-marrakesh"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-materia.vim b/colors/base16-materia.vim
index f4c5c02..f3a45c3 100644
--- a/colors/base16-materia.vim
+++ b/colors/base16-materia.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-materia.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-materia"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-material-darker.vim b/colors/base16-material-darker.vim
index f71e778..84e7453 100644
--- a/colors/base16-material-darker.vim
+++ b/colors/base16-material-darker.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-material-darker.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-material-darker"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-material-lighter.vim b/colors/base16-material-lighter.vim
index 86b5a27..72e891f 100644
--- a/colors/base16-material-lighter.vim
+++ b/colors/base16-material-lighter.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-material-lighter.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-material-lighter"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-material-palenight.vim b/colors/base16-material-palenight.vim
index d71b078..9b56d3e 100644
--- a/colors/base16-material-palenight.vim
+++ b/colors/base16-material-palenight.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-material-palenight.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-material-palenight"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-material.vim b/colors/base16-material.vim
index dd6f51a..2adc90a 100644
--- a/colors/base16-material.vim
+++ b/colors/base16-material.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-material.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-material"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-mellow-purple.vim b/colors/base16-mellow-purple.vim
index 2f806cc..9eecd2f 100644
--- a/colors/base16-mellow-purple.vim
+++ b/colors/base16-mellow-purple.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-mellow-purple.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-mellow-purple"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-mexico-light.vim b/colors/base16-mexico-light.vim
index d058eb2..f4aa66a 100644
--- a/colors/base16-mexico-light.vim
+++ b/colors/base16-mexico-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-mexico-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-mexico-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index ecf4e62..5232dd4 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-mocha.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-mocha"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index 84bbabf..e961b3e 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-monokai.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-monokai"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-nord.vim b/colors/base16-nord.vim
index f0980ba..09eab83 100644
--- a/colors/base16-nord.vim
+++ b/colors/base16-nord.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-nord.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-nord"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index 5e07c3a..e1676d9 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-ocean.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-ocean"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim
index b6b663e..13d2163 100644
--- a/colors/base16-oceanicnext.vim
+++ b/colors/base16-oceanicnext.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-oceanicnext.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-oceanicnext"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-one-light.vim b/colors/base16-one-light.vim
index 9ffc237..d9a5abd 100644
--- a/colors/base16-one-light.vim
+++ b/colors/base16-one-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-one-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-one-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-onedark.vim b/colors/base16-onedark.vim
index 3d942c1..ad7c7b8 100644
--- a/colors/base16-onedark.vim
+++ b/colors/base16-onedark.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-onedark.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-onedark"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim
index f840063..6816e5e 100644
--- a/colors/base16-paraiso.vim
+++ b/colors/base16-paraiso.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-paraiso.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-paraiso"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim
index fbb3022..7178692 100644
--- a/colors/base16-phd.vim
+++ b/colors/base16-phd.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-phd.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-phd"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim
index a651e94..96a32b5 100644
--- a/colors/base16-pico.vim
+++ b/colors/base16-pico.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-pico.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-pico"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim
index 3ce2e5a..75bef85 100644
--- a/colors/base16-pop.vim
+++ b/colors/base16-pop.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-pop.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-pop"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index 1e4dbd8..0908edc 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-railscasts.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-railscasts"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-rebecca.vim b/colors/base16-rebecca.vim
index cf74ea8..6d3d822 100644
--- a/colors/base16-rebecca.vim
+++ b/colors/base16-rebecca.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-rebecca.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-rebecca"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-seti.vim b/colors/base16-seti.vim
index 6292d95..009ed09 100644
--- a/colors/base16-seti.vim
+++ b/colors/base16-seti.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-seti.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-seti"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim
index a928e74..f065f87 100644
--- a/colors/base16-shapeshifter.vim
+++ b/colors/base16-shapeshifter.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-shapeshifter.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-shapeshifter"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-solarflare.vim b/colors/base16-solarflare.vim
index 4713eab..1f12eee 100644
--- a/colors/base16-solarflare.vim
+++ b/colors/base16-solarflare.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-solarflare.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-solarflare"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-solarized-dark.vim b/colors/base16-solarized-dark.vim
index 228055e..055acf6 100644
--- a/colors/base16-solarized-dark.vim
+++ b/colors/base16-solarized-dark.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-solarized-dark.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-solarized-dark"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-solarized-light.vim b/colors/base16-solarized-light.vim
index 1a562f8..5311d78 100644
--- a/colors/base16-solarized-light.vim
+++ b/colors/base16-solarized-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-solarized-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-solarized-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim
index 80c6bb8..5cedb81 100644
--- a/colors/base16-spacemacs.vim
+++ b/colors/base16-spacemacs.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-spacemacs.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-spacemacs"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-summerfruit-dark.vim b/colors/base16-summerfruit-dark.vim
index 0b4535b..6e75ca8 100644
--- a/colors/base16-summerfruit-dark.vim
+++ b/colors/base16-summerfruit-dark.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-summerfruit-dark.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-summerfruit-dark"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-summerfruit-light.vim b/colors/base16-summerfruit-light.vim
index 152129b..e1620cd 100644
--- a/colors/base16-summerfruit-light.vim
+++ b/colors/base16-summerfruit-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-summerfruit-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-summerfruit-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-tomorrow-night.vim b/colors/base16-tomorrow-night.vim
index 4cc5573..c80222e 100644
--- a/colors/base16-tomorrow-night.vim
+++ b/colors/base16-tomorrow-night.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-tomorrow-night.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-tomorrow-night"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 5b66c89..e590d56 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-tomorrow.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-tomorrow"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-tube.vim b/colors/base16-tube.vim
index 8fedb2b..e909e0e 100644
--- a/colors/base16-tube.vim
+++ b/colors/base16-tube.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-tube.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-tube"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim
index 583efa2..9225281 100644
--- a/colors/base16-twilight.vim
+++ b/colors/base16-twilight.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-twilight.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-twilight"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-unikitty-dark.vim b/colors/base16-unikitty-dark.vim
index 0df6e3d..3af05bf 100644
--- a/colors/base16-unikitty-dark.vim
+++ b/colors/base16-unikitty-dark.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-unikitty-dark.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-unikitty-dark"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-unikitty-light.vim b/colors/base16-unikitty-light.vim
index 989ea0d..829addd 100644
--- a/colors/base16-unikitty-light.vim
+++ b/colors/base16-unikitty-light.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-unikitty-light.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-unikitty-light"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-woodland.vim b/colors/base16-woodland.vim
index 6974ce0..fb226a2 100644
--- a/colors/base16-woodland.vim
+++ b/colors/base16-woodland.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-woodland.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-woodland"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-xcode-dusk.vim b/colors/base16-xcode-dusk.vim
index 22bb903..b73b74e 100644
--- a/colors/base16-xcode-dusk.vim
+++ b/colors/base16-xcode-dusk.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-xcode-dusk.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-xcode-dusk"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
diff --git a/colors/base16-zenburn.vim b/colors/base16-zenburn.vim
index a5e67fe..442fbb5 100644
--- a/colors/base16-zenburn.vim
+++ b/colors/base16-zenburn.vim
@@ -10,7 +10,7 @@
 "   let g:base16_shell_path=base16-builder/output/shell/
 if !has('gui_running')
   if exists("g:base16_shell_path")
-    execute "silent !/bin/sh ".g:base16_shell_path."/base16-.sh"
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-zenburn.sh"
   endif
 endif
 
@@ -88,7 +88,7 @@ endif
 " Theme setup
 hi clear
 syntax reset
-let g:colors_name = "base16-"
+let g:colors_name = "base16-zenburn"
 
 " Highlighting function
 fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)