diff --git a/autoload/airline/themes/base16_3024.vim b/autoload/airline/themes/base16_3024.vim
index 724719a..f4e318a 100644
--- a/autoload/airline/themes/base16_3024.vim
+++ b/autoload/airline/themes/base16_3024.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#a16a94"
 let s:gui0F = "#cdab53"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 59
+let s:cterm04 = 102
+let s:cterm05 = 145
+let s:cterm06 = 188
 let s:cterm07 = 15
 let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm09 = 182
+let s:cterm0A = 11
+let s:cterm0B = 35
+let s:cterm0C = 153
+let s:cterm0D = 38
+let s:cterm0E = 132
+let s:cterm0F = 179
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_apathy.vim b/autoload/airline/themes/base16_apathy.vim
index 101dace..85a9584 100644
--- a/autoload/airline/themes/base16_apathy.vim
+++ b/autoload/airline/themes/base16_apathy.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#4C963E"
 let s:gui0F = "#3E965B"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
-let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm01 = 22
+let s:cterm02 = 23
+let s:cterm03 = 23
+let s:cterm04 = 72
+let s:cterm05 = 109
+let s:cterm06 = 152
+let s:cterm07 = 188
+let s:cterm08 = 66
+let s:cterm09 = 66
+let s:cterm0A = 60
+let s:cterm0B = 96
+let s:cterm0C = 95
+let s:cterm0D = 101
+let s:cterm0E = 65
+let s:cterm0F = 65
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_ashes.vim b/autoload/airline/themes/base16_ashes.vim
index 510d548..a162c67 100644
--- a/autoload/airline/themes/base16_ashes.vim
+++ b/autoload/airline/themes/base16_ashes.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#C795AE"
 let s:gui0F = "#C79595"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 102
+let s:cterm04 = 145
+let s:cterm05 = 188
+let s:cterm06 = 188
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 180
+let s:cterm09 = 186
+let s:cterm0A = 150
+let s:cterm0B = 115
+let s:cterm0C = 110
+let s:cterm0D = 140
+let s:cterm0E = 175
+let s:cterm0F = 174
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_atelierdune.vim b/autoload/airline/themes/base16_atelierdune.vim
index 5ed725c..94cfacd 100644
--- a/autoload/airline/themes/base16_atelierdune.vim
+++ b/autoload/airline/themes/base16_atelierdune.vim
@@ -1,6 +1,6 @@
 " vim-airline template by chartoin (http://github.com/chartoin)
 " Base 16 Atelier Dune Scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune)
-let g:airline#themes#base16_atelier dune#palette = {}
+let g:airline#themes#base16_atelierdune#palette = {}
 let s:gui00 = "#20201d"
 let s:gui01 = "#292824"
 let s:gui02 = "#6e6b5e"
@@ -19,46 +19,46 @@ let s:gui0E = "#b854d4"
 let s:gui0F = "#d43552"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 101
+let s:cterm04 = 102
+let s:cterm05 = 144
+let s:cterm06 = 188
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 167
+let s:cterm09 = 130
+let s:cterm0A = 178
+let s:cterm0B = 71
+let s:cterm0C = 36
+let s:cterm0D = 68
+let s:cterm0E = 134
+let s:cterm0F = 167
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier dune#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#base16_atelierdune#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 
 let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
 let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier dune#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#base16_atelierdune#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 
 let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
 let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier dune#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#base16_atelierdune#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
 
 let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
 let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier dune#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#base16_atelierdune#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 
 let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
-let g:airline#themes#base16_atelier dune#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#base16_atelierdune#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
 
 " Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp
 " variable so that related functionality is loaded iff the user is using
@@ -67,7 +67,7 @@ let g:airline#themes#base16_atelier dune#palette.inactive = airline#themes#gener
 if !get(g:, 'loaded_ctrlp', 0)
   finish
 endif
-let g:airline#themes#base16_atelier dune#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+let g:airline#themes#base16_atelierdune#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
       \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
       \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
       \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/autoload/airline/themes/base16_atelierforest.vim b/autoload/airline/themes/base16_atelierforest.vim
index 0541bed..70c23de 100644
--- a/autoload/airline/themes/base16_atelierforest.vim
+++ b/autoload/airline/themes/base16_atelierforest.vim
@@ -1,6 +1,6 @@
 " vim-airline template by chartoin (http://github.com/chartoin)
 " Base 16 Atelier Forest Scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/forest)
-let g:airline#themes#base16_atelier forest#palette = {}
+let g:airline#themes#base16_atelierforest#palette = {}
 let s:gui00 = "#1b1918"
 let s:gui01 = "#2c2421"
 let s:gui02 = "#68615e"
@@ -19,46 +19,46 @@ let s:gui0E = "#6666ea"
 let s:gui0F = "#c33ff3"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 95
+let s:cterm04 = 138
+let s:cterm05 = 145
+let s:cterm06 = 188
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 197
+let s:cterm09 = 166
+let s:cterm0A = 172
+let s:cterm0B = 71
+let s:cterm0C = 37
+let s:cterm0D = 68
+let s:cterm0E = 62
+let s:cterm0F = 135
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier forest#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#base16_atelierforest#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 
 let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
 let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier forest#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#base16_atelierforest#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 
 let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
 let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier forest#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#base16_atelierforest#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
 
 let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
 let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier forest#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#base16_atelierforest#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 
 let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
-let g:airline#themes#base16_atelier forest#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#base16_atelierforest#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
 
 " Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp
 " variable so that related functionality is loaded iff the user is using
@@ -67,7 +67,7 @@ let g:airline#themes#base16_atelier forest#palette.inactive = airline#themes#gen
 if !get(g:, 'loaded_ctrlp', 0)
   finish
 endif
-let g:airline#themes#base16_atelier forest#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+let g:airline#themes#base16_atelierforest#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
       \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
       \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
       \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/autoload/airline/themes/base16_atelierheath.vim b/autoload/airline/themes/base16_atelierheath.vim
index e1e3e6a..20179c7 100644
--- a/autoload/airline/themes/base16_atelierheath.vim
+++ b/autoload/airline/themes/base16_atelierheath.vim
@@ -1,6 +1,6 @@
 " vim-airline template by chartoin (http://github.com/chartoin)
 " Base 16 Atelier Heath Scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/heath)
-let g:airline#themes#base16_atelier heath#palette = {}
+let g:airline#themes#base16_atelierheath#palette = {}
 let s:gui00 = "#1b181b"
 let s:gui01 = "#292329"
 let s:gui02 = "#695d69"
@@ -19,46 +19,46 @@ let s:gui0E = "#7b59c0"
 let s:gui0F = "#cc33cc"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 96
+let s:cterm04 = 139
+let s:cterm05 = 139
+let s:cterm06 = 188
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 166
+let s:cterm09 = 130
+let s:cterm0A = 137
+let s:cterm0B = 65
+let s:cterm0C = 30
+let s:cterm0D = 12
+let s:cterm0E = 97
+let s:cterm0F = 170
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier heath#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#base16_atelierheath#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 
 let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
 let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier heath#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#base16_atelierheath#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 
 let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
 let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier heath#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#base16_atelierheath#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
 
 let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
 let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier heath#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#base16_atelierheath#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 
 let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
-let g:airline#themes#base16_atelier heath#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#base16_atelierheath#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
 
 " Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp
 " variable so that related functionality is loaded iff the user is using
@@ -67,7 +67,7 @@ let g:airline#themes#base16_atelier heath#palette.inactive = airline#themes#gene
 if !get(g:, 'loaded_ctrlp', 0)
   finish
 endif
-let g:airline#themes#base16_atelier heath#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+let g:airline#themes#base16_atelierheath#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
       \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
       \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
       \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/autoload/airline/themes/base16_atelierlakeside.vim b/autoload/airline/themes/base16_atelierlakeside.vim
index 3097da0..0d1e758 100644
--- a/autoload/airline/themes/base16_atelierlakeside.vim
+++ b/autoload/airline/themes/base16_atelierlakeside.vim
@@ -1,6 +1,6 @@
 " vim-airline template by chartoin (http://github.com/chartoin)
 " Base 16 Atelier Lakeside Scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/lakeside/)
-let g:airline#themes#base16_atelier lakeside#palette = {}
+let g:airline#themes#base16_atelierlakeside#palette = {}
 let s:gui00 = "#161b1d"
 let s:gui01 = "#1f292e"
 let s:gui02 = "#516d7b"
@@ -19,46 +19,46 @@ let s:gui0E = "#5d5db1"
 let s:gui0F = "#b72dd2"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
-let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm01 = 0
+let s:cterm02 = 60
+let s:cterm03 = 66
+let s:cterm04 = 67
+let s:cterm05 = 109
+let s:cterm06 = 153
+let s:cterm07 = 195
+let s:cterm08 = 161
+let s:cterm09 = 94
+let s:cterm0A = 100
+let s:cterm0B = 65
+let s:cterm0C = 29
+let s:cterm0D = 31
+let s:cterm0E = 61
+let s:cterm0F = 5
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier lakeside#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#base16_atelierlakeside#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 
 let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
 let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier lakeside#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#base16_atelierlakeside#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 
 let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
 let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier lakeside#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#base16_atelierlakeside#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
 
 let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
 let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier lakeside#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#base16_atelierlakeside#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 
 let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
-let g:airline#themes#base16_atelier lakeside#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#base16_atelierlakeside#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
 
 " Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp
 " variable so that related functionality is loaded iff the user is using
@@ -67,7 +67,7 @@ let g:airline#themes#base16_atelier lakeside#palette.inactive = airline#themes#g
 if !get(g:, 'loaded_ctrlp', 0)
   finish
 endif
-let g:airline#themes#base16_atelier lakeside#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+let g:airline#themes#base16_atelierlakeside#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
       \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
       \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
       \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/autoload/airline/themes/base16_atelierseaside.vim b/autoload/airline/themes/base16_atelierseaside.vim
index 634db97..0314ea2 100644
--- a/autoload/airline/themes/base16_atelierseaside.vim
+++ b/autoload/airline/themes/base16_atelierseaside.vim
@@ -1,6 +1,6 @@
 " vim-airline template by chartoin (http://github.com/chartoin)
 " Base 16 Atelier Seaside Scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/seaside/)
-let g:airline#themes#base16_atelier seaside#palette = {}
+let g:airline#themes#base16_atelierseaside#palette = {}
 let s:gui00 = "#131513"
 let s:gui01 = "#242924"
 let s:gui02 = "#5e6e5e"
@@ -19,46 +19,46 @@ let s:gui0E = "#ad2bee"
 let s:gui0F = "#e619c3"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 65
+let s:cterm04 = 102
+let s:cterm05 = 108
+let s:cterm06 = 188
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
+let s:cterm08 = 161
+let s:cterm09 = 94
 let s:cterm0A = 3
 let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm0C = 31
+let s:cterm0D = 12
+let s:cterm0E = 129
+let s:cterm0F = 5
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier seaside#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#base16_atelierseaside#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 
 let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
 let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier seaside#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#base16_atelierseaside#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 
 let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
 let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier seaside#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#base16_atelierseaside#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
 
 let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
 let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_atelier seaside#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#base16_atelierseaside#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 
 let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
-let g:airline#themes#base16_atelier seaside#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#base16_atelierseaside#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
 
 " Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp
 " variable so that related functionality is loaded iff the user is using
@@ -67,7 +67,7 @@ let g:airline#themes#base16_atelier seaside#palette.inactive = airline#themes#ge
 if !get(g:, 'loaded_ctrlp', 0)
   finish
 endif
-let g:airline#themes#base16_atelier seaside#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+let g:airline#themes#base16_atelierseaside#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
       \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
       \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
       \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/autoload/airline/themes/base16_bespin.vim b/autoload/airline/themes/base16_bespin.vim
index a08c00b..b4f3523 100644
--- a/autoload/airline/themes/base16_bespin.vim
+++ b/autoload/airline/themes/base16_bespin.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#9b859d"
 let s:gui0F = "#937121"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
-let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm01 = 58
+let s:cterm02 = 59
+let s:cterm03 = 241
+let s:cterm04 = 102
+let s:cterm05 = 102
+let s:cterm06 = 138
+let s:cterm07 = 145
+let s:cterm08 = 167
+let s:cterm09 = 173
+let s:cterm0A = 228
+let s:cterm0B = 70
+let s:cterm0C = 152
+let s:cterm0D = 74
+let s:cterm0E = 103
+let s:cterm0F = 94
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_brewer.vim b/autoload/airline/themes/base16_brewer.vim
index da2d6cd..0164677 100644
--- a/autoload/airline/themes/base16_brewer.vim
+++ b/autoload/airline/themes/base16_brewer.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#756bb1"
 let s:gui0F = "#b15928"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 17
+let s:cterm02 = 59
+let s:cterm03 = 66
+let s:cterm04 = 102
+let s:cterm05 = 145
+let s:cterm06 = 188
 let s:cterm07 = 15
 let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm09 = 166
+let s:cterm0A = 179
+let s:cterm0B = 71
+let s:cterm0C = 110
+let s:cterm0D = 67
+let s:cterm0E = 97
+let s:cterm0F = 130
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_bright.vim b/autoload/airline/themes/base16_bright.vim
index edd40ab..23c7432 100644
--- a/autoload/airline/themes/base16_bright.vim
+++ b/autoload/airline/themes/base16_bright.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#d381c3"
 let s:gui0F = "#be643c"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 236
+let s:cterm02 = 239
+let s:cterm03 = 249
+let s:cterm04 = 252
+let s:cterm05 = 253
+let s:cterm06 = 15
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 9
+let s:cterm09 = 202
+let s:cterm0A = 215
+let s:cterm0B = 149
+let s:cterm0C = 115
+let s:cterm0D = 74
+let s:cterm0E = 175
+let s:cterm0F = 131
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_chalk.vim b/autoload/airline/themes/base16_chalk.vim
index 93c4a41..d0345a9 100644
--- a/autoload/airline/themes/base16_chalk.vim
+++ b/autoload/airline/themes/base16_chalk.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#6fc2ef"
 let s:gui0E = "#e1a3ee"
 let s:gui0F = "#deaf8f"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm00 = 233
+let s:cterm01 = 234
+let s:cterm02 = 236
+let s:cterm03 = 239
+let s:cterm04 = 249
+let s:cterm05 = 252
+let s:cterm06 = 253
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
+let s:cterm08 = 217
+let s:cterm09 = 216
+let s:cterm0A = 179
+let s:cterm0B = 143
 let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm0D = 75
+let s:cterm0E = 183
+let s:cterm0F = 180
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_codeschool.vim b/autoload/airline/themes/base16_codeschool.vim
index 992c9d2..f9cf956 100644
--- a/autoload/airline/themes/base16_codeschool.vim
+++ b/autoload/airline/themes/base16_codeschool.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#484d79"
 let s:gui0E = "#c59820"
 let s:gui0F = "#c98344"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
-let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm00 = 17
+let s:cterm01 = 23
+let s:cterm02 = 23
+let s:cterm03 = 59
+let s:cterm04 = 102
+let s:cterm05 = 145
+let s:cterm06 = 151
+let s:cterm07 = 153
+let s:cterm08 = 24
+let s:cterm09 = 64
+let s:cterm0A = 130
+let s:cterm0B = 30
+let s:cterm0C = 125
+let s:cterm0D = 60
+let s:cterm0E = 172
+let s:cterm0F = 173
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_colors.vim b/autoload/airline/themes/base16_colors.vim
index 5ac8c29..d65442d 100644
--- a/autoload/airline/themes/base16_colors.vim
+++ b/autoload/airline/themes/base16_colors.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#0074d9"
 let s:gui0E = "#b10dc9"
 let s:gui0F = "#85144b"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm00 = 233
+let s:cterm01 = 236
+let s:cterm02 = 240
+let s:cterm03 = 243
+let s:cterm04 = 246
+let s:cterm05 = 250
+let s:cterm06 = 253
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 203
+let s:cterm09 = 208
+let s:cterm0A = 220
+let s:cterm0B = 41
+let s:cterm0C = 117
+let s:cterm0D = 32
+let s:cterm0E = 128
+let s:cterm0F = 89
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_default.vim b/autoload/airline/themes/base16_default.vim
index b39920b..841c12e 100644
--- a/autoload/airline/themes/base16_default.vim
+++ b/autoload/airline/themes/base16_default.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#7cafc2"
 let s:gui0E = "#ba8baf"
 let s:gui0F = "#a16946"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm00 = 233
+let s:cterm01 = 235
+let s:cterm02 = 237
+let s:cterm03 = 240
+let s:cterm04 = 249
+let s:cterm05 = 253
+let s:cterm06 = 254
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 131
+let s:cterm09 = 173
+let s:cterm0A = 222
+let s:cterm0B = 143
+let s:cterm0C = 109
+let s:cterm0D = 109
+let s:cterm0E = 139
+let s:cterm0F = 131
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_eighties.vim b/autoload/airline/themes/base16_eighties.vim
index 1bb464e..7161e39 100644
--- a/autoload/airline/themes/base16_eighties.vim
+++ b/autoload/airline/themes/base16_eighties.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#6699cc"
 let s:gui0E = "#cc99cc"
 let s:gui0F = "#d27b53"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm00 = 236
+let s:cterm01 = 237
+let s:cterm02 = 239
+let s:cterm03 = 95
+let s:cterm04 = 144
+let s:cterm05 = 188
+let s:cterm06 = 188
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 210
+let s:cterm09 = 209
+let s:cterm0A = 221
+let s:cterm0B = 114
+let s:cterm0C = 80
+let s:cterm0D = 68
+let s:cterm0E = 176
+let s:cterm0F = 173
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_embers.vim b/autoload/airline/themes/base16_embers.vim
index 78ff72b..0c26076 100644
--- a/autoload/airline/themes/base16_embers.vim
+++ b/autoload/airline/themes/base16_embers.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#82576D"
 let s:gui0F = "#825757"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
-let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 59
+let s:cterm04 = 102
+let s:cterm05 = 138
+let s:cterm06 = 145
+let s:cterm07 = 188
+let s:cterm08 = 95
+let s:cterm09 = 101
+let s:cterm0A = 65
+let s:cterm0B = 65
+let s:cterm0C = 60
+let s:cterm0D = 60
+let s:cterm0E = 95
+let s:cterm0F = 95
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_flat.vim b/autoload/airline/themes/base16_flat.vim
index dbda152..aa4f5cf 100644
--- a/autoload/airline/themes/base16_flat.vim
+++ b/autoload/airline/themes/base16_flat.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#3498DB"
 let s:gui0E = "#9B59B6"
 let s:gui0F = "#be643c"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm00 = 23
+let s:cterm01 = 59
+let s:cterm02 = 102
+let s:cterm03 = 109
+let s:cterm04 = 146
+let s:cterm05 = 253
+let s:cterm06 = 15
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 167
+let s:cterm09 = 172
+let s:cterm0A = 220
+let s:cterm0B = 41
+let s:cterm0C = 37
+let s:cterm0D = 68
+let s:cterm0E = 97
+let s:cterm0F = 131
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_google.vim b/autoload/airline/themes/base16_google.vim
index 43cbf92..f20da8c 100644
--- a/autoload/airline/themes/base16_google.vim
+++ b/autoload/airline/themes/base16_google.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#A36AC7"
 let s:gui0F = "#3971ED"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 102
+let s:cterm04 = 145
+let s:cterm05 = 188
+let s:cterm06 = 253
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 166
+let s:cterm09 = 203
+let s:cterm0A = 214
+let s:cterm0B = 29
+let s:cterm0C = 12
+let s:cterm0D = 12
+let s:cterm0E = 134
+let s:cterm0F = 12
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_grayscale.vim b/autoload/airline/themes/base16_grayscale.vim
index 588ee39..bf60eb3 100644
--- a/autoload/airline/themes/base16_grayscale.vim
+++ b/autoload/airline/themes/base16_grayscale.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#686868"
 let s:gui0E = "#747474"
 let s:gui0F = "#5e5e5e"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm00 = 233
+let s:cterm01 = 235
+let s:cterm02 = 238
+let s:cterm03 = 239
+let s:cterm04 = 248
+let s:cterm05 = 250
+let s:cterm06 = 254
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 243
+let s:cterm09 = 246
+let s:cterm0A = 247
+let s:cterm0B = 245
+let s:cterm0C = 244
+let s:cterm0D = 241
+let s:cterm0E = 243
+let s:cterm0F = 240
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_greenscreen.vim b/autoload/airline/themes/base16_greenscreen.vim
index 74f3a38..b460449 100644
--- a/autoload/airline/themes/base16_greenscreen.vim
+++ b/autoload/airline/themes/base16_greenscreen.vim
@@ -1,6 +1,6 @@
 " vim-airline template by chartoin (http://github.com/chartoin)
 " Base 16 Green Screen Scheme by Chris Kempson (http://chriskempson.com)
-let g:airline#themes#base16_green screen#palette = {}
+let g:airline#themes#base16_greenscreen#palette = {}
 let s:gui00 = "#001100"
 let s:gui01 = "#003300"
 let s:gui02 = "#005500"
@@ -19,46 +19,46 @@ let s:gui0E = "#00bb00"
 let s:gui0F = "#005500"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
-let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm01 = 22
+let s:cterm02 = 22
+let s:cterm03 = 28
+let s:cterm04 = 28
+let s:cterm05 = 34
+let s:cterm06 = 40
+let s:cterm07 = 10
+let s:cterm08 = 28
+let s:cterm09 = 28
+let s:cterm0A = 28
+let s:cterm0B = 34
+let s:cterm0C = 22
+let s:cterm0D = 28
+let s:cterm0E = 34
+let s:cterm0F = 22
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_green screen#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#base16_greenscreen#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 
 let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
 let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_green screen#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#base16_greenscreen#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 
 let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
 let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_green screen#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#base16_greenscreen#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
 
 let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
 let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_green screen#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#base16_greenscreen#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 
 let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
-let g:airline#themes#base16_green screen#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#base16_greenscreen#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
 
 " Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp
 " variable so that related functionality is loaded iff the user is using
@@ -67,7 +67,7 @@ let g:airline#themes#base16_green screen#palette.inactive = airline#themes#gener
 if !get(g:, 'loaded_ctrlp', 0)
   finish
 endif
-let g:airline#themes#base16_green screen#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+let g:airline#themes#base16_greenscreen#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
       \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
       \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
       \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/autoload/airline/themes/base16_harmonic16.vim b/autoload/airline/themes/base16_harmonic16.vim
index 6e2b2a9..9700a04 100644
--- a/autoload/airline/themes/base16_harmonic16.vim
+++ b/autoload/airline/themes/base16_harmonic16.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#bf568b"
 let s:gui0F = "#bf5656"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 23
+let s:cterm02 = 60
+let s:cterm03 = 66
+let s:cterm04 = 146
+let s:cterm05 = 188
+let s:cterm06 = 189
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 137
+let s:cterm09 = 143
+let s:cterm0A = 107
+let s:cterm0B = 72
+let s:cterm0C = 67
+let s:cterm0D = 97
+let s:cterm0E = 132
+let s:cterm0F = 131
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_hopscotch.vim b/autoload/airline/themes/base16_hopscotch.vim
index ad26bfe..0e78688 100644
--- a/autoload/airline/themes/base16_hopscotch.vim
+++ b/autoload/airline/themes/base16_hopscotch.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#1290bf"
 let s:gui0E = "#c85e7c"
 let s:gui0F = "#b33508"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm00 = 53
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 96
+let s:cterm04 = 102
+let s:cterm05 = 145
+let s:cterm06 = 188
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 167
+let s:cterm09 = 208
+let s:cterm0A = 221
+let s:cterm0B = 107
+let s:cterm0C = 30
+let s:cterm0D = 31
+let s:cterm0E = 168
+let s:cterm0F = 130
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_isotope.vim b/autoload/airline/themes/base16_isotope.vim
index d821581..aa5e0bd 100644
--- a/autoload/airline/themes/base16_isotope.vim
+++ b/autoload/airline/themes/base16_isotope.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#cc00ff"
 let s:gui0F = "#3300ff"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 237
+let s:cterm02 = 241
+let s:cterm03 = 244
+let s:cterm04 = 250
+let s:cterm05 = 252
+let s:cterm06 = 253
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 9
+let s:cterm09 = 208
+let s:cterm0A = 198
+let s:cterm0B = 82
+let s:cterm0C = 14
+let s:cterm0D = 27
+let s:cterm0E = 165
+let s:cterm0F = 57
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_londontube.vim b/autoload/airline/themes/base16_londontube.vim
index 704aec7..b228e23 100644
--- a/autoload/airline/themes/base16_londontube.vim
+++ b/autoload/airline/themes/base16_londontube.vim
@@ -1,6 +1,6 @@
 " vim-airline template by chartoin (http://github.com/chartoin)
 " Base 16 London Tube Scheme by Jan T. Sott
-let g:airline#themes#base16_london tube#palette = {}
+let g:airline#themes#base16_londontube#palette = {}
 let s:gui00 = "#231f20"
 let s:gui01 = "#1c3f95"
 let s:gui02 = "#5a5758"
@@ -19,46 +19,46 @@ let s:gui0E = "#98005d"
 let s:gui0F = "#b06110"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 24
+let s:cterm02 = 59
+let s:cterm03 = 59
+let s:cterm04 = 109
+let s:cterm05 = 188
+let s:cterm06 = 188
 let s:cterm07 = 15
 let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm09 = 211
+let s:cterm0A = 220
+let s:cterm0B = 29
+let s:cterm0C = 115
+let s:cterm0D = 38
+let s:cterm0E = 89
+let s:cterm0F = 130
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_london tube#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#base16_londontube#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 
 let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
 let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_london tube#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#base16_londontube#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 
 let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
 let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_london tube#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#base16_londontube#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
 
 let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
 let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
 let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
-let g:airline#themes#base16_london tube#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#base16_londontube#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 
 let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
 let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
-let g:airline#themes#base16_london tube#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#base16_londontube#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
 
 " Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp
 " variable so that related functionality is loaded iff the user is using
@@ -67,7 +67,7 @@ let g:airline#themes#base16_london tube#palette.inactive = airline#themes#genera
 if !get(g:, 'loaded_ctrlp', 0)
   finish
 endif
-let g:airline#themes#base16_london tube#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+let g:airline#themes#base16_londontube#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
       \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
       \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
       \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/autoload/airline/themes/base16_marrakesh.vim b/autoload/airline/themes/base16_marrakesh.vim
index 399c124..e6cd459 100644
--- a/autoload/airline/themes/base16_marrakesh.vim
+++ b/autoload/airline/themes/base16_marrakesh.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#8868b3"
 let s:gui0F = "#b3588e"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
-let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm01 = 52
+let s:cterm02 = 58
+let s:cterm03 = 58
+let s:cterm04 = 101
+let s:cterm05 = 101
+let s:cterm06 = 180
+let s:cterm07 = 229
+let s:cterm08 = 131
+let s:cterm09 = 131
+let s:cterm0A = 137
+let s:cterm0B = 29
+let s:cterm0C = 107
+let s:cterm0D = 67
+let s:cterm0E = 97
+let s:cterm0F = 132
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_mocha.vim b/autoload/airline/themes/base16_mocha.vim
index ca07a0e..1097c95 100644
--- a/autoload/airline/themes/base16_mocha.vim
+++ b/autoload/airline/themes/base16_mocha.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#8ab3b5"
 let s:gui0E = "#a89bb9"
 let s:gui0F = "#bb9584"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
-let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm00 = 58
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 95
+let s:cterm04 = 145
+let s:cterm05 = 188
+let s:cterm06 = 188
+let s:cterm07 = 230
+let s:cterm08 = 168
+let s:cterm09 = 173
+let s:cterm0A = 216
+let s:cterm0B = 143
+let s:cterm0C = 109
+let s:cterm0D = 109
+let s:cterm0E = 139
+let s:cterm0F = 138
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_monokai.vim b/autoload/airline/themes/base16_monokai.vim
index bc1e131..fe1b774 100644
--- a/autoload/airline/themes/base16_monokai.vim
+++ b/autoload/airline/themes/base16_monokai.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#ae81ff"
 let s:gui0F = "#cc6633"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 95
+let s:cterm04 = 144
+let s:cterm05 = 15
+let s:cterm06 = 15
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 197
+let s:cterm09 = 208
+let s:cterm0A = 216
+let s:cterm0B = 3
+let s:cterm0C = 158
+let s:cterm0D = 81
+let s:cterm0E = 141
+let s:cterm0F = 167
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_ocean.vim b/autoload/airline/themes/base16_ocean.vim
index 9d6c6e3..b1a76dd 100644
--- a/autoload/airline/themes/base16_ocean.vim
+++ b/autoload/airline/themes/base16_ocean.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#8fa1b3"
 let s:gui0E = "#b48ead"
 let s:gui0F = "#ab7967"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm00 = 23
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 60
+let s:cterm04 = 145
+let s:cterm05 = 152
+let s:cterm06 = 188
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 131
+let s:cterm09 = 173
+let s:cterm0A = 186
+let s:cterm0B = 144
+let s:cterm0C = 109
+let s:cterm0D = 109
+let s:cterm0E = 139
+let s:cterm0F = 137
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_paraiso.vim b/autoload/airline/themes/base16_paraiso.vim
index 3769af6..1277b31 100644
--- a/autoload/airline/themes/base16_paraiso.vim
+++ b/autoload/airline/themes/base16_paraiso.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#815ba4"
 let s:gui0F = "#e96ba8"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
-let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 95
+let s:cterm04 = 102
+let s:cterm05 = 144
+let s:cterm06 = 145
+let s:cterm07 = 188
+let s:cterm08 = 203
+let s:cterm09 = 208
+let s:cterm0A = 220
+let s:cterm0B = 72
+let s:cterm0C = 79
+let s:cterm0D = 39
+let s:cterm0E = 97
+let s:cterm0F = 169
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_pop.vim b/autoload/airline/themes/base16_pop.vim
index 3a32ece..0888703 100644
--- a/autoload/airline/themes/base16_pop.vim
+++ b/autoload/airline/themes/base16_pop.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#b31e8d"
 let s:gui0F = "#7a2d00"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 234
+let s:cterm02 = 236
+let s:cterm03 = 239
+let s:cterm04 = 249
+let s:cterm05 = 252
+let s:cterm06 = 253
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 162
+let s:cterm09 = 209
+let s:cterm0A = 220
+let s:cterm0B = 71
+let s:cterm0C = 37
+let s:cterm0D = 24
+let s:cterm0E = 126
+let s:cterm0F = 88
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_railscasts.vim b/autoload/airline/themes/base16_railscasts.vim
index e9c9a30..771a5b1 100644
--- a/autoload/airline/themes/base16_railscasts.vim
+++ b/autoload/airline/themes/base16_railscasts.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#6d9cbe"
 let s:gui0E = "#b6b3eb"
 let s:gui0F = "#bc9458"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm00 = 235
+let s:cterm01 = 17
+let s:cterm02 = 59
+let s:cterm03 = 60
+let s:cterm04 = 188
+let s:cterm05 = 188
+let s:cterm06 = 15
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 167
+let s:cterm09 = 173
+let s:cterm0A = 221
+let s:cterm0B = 143
+let s:cterm0C = 71
+let s:cterm0D = 73
+let s:cterm0E = 146
+let s:cterm0F = 137
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_shapeshifter.vim b/autoload/airline/themes/base16_shapeshifter.vim
index 23f3416..a518265 100644
--- a/autoload/airline/themes/base16_shapeshifter.vim
+++ b/autoload/airline/themes/base16_shapeshifter.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#f996e2"
 let s:gui0F = "#69542d"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 0
+let s:cterm02 = 0
+let s:cterm03 = 236
+let s:cterm04 = 240
+let s:cterm05 = 248
+let s:cterm06 = 253
 let s:cterm07 = 15
 let s:cterm08 = 1
-let s:cterm09 = 16
+let s:cterm09 = 173
 let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm0B = 41
+let s:cterm0C = 50
+let s:cterm0D = 12
+let s:cterm0E = 212
+let s:cterm0F = 58
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_solarized.vim b/autoload/airline/themes/base16_solarized.vim
index 4edb990..81edd56 100644
--- a/autoload/airline/themes/base16_solarized.vim
+++ b/autoload/airline/themes/base16_solarized.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#268bd2"
 let s:gui0E = "#6c71c4"
 let s:gui0F = "#d33682"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
-let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm00 = 17
+let s:cterm01 = 23
+let s:cterm02 = 60
+let s:cterm03 = 66
+let s:cterm04 = 102
+let s:cterm05 = 109
+let s:cterm06 = 224
+let s:cterm07 = 230
+let s:cterm08 = 166
+let s:cterm09 = 166
+let s:cterm0A = 136
+let s:cterm0B = 100
+let s:cterm0C = 36
+let s:cterm0D = 32
+let s:cterm0E = 12
+let s:cterm0F = 168
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_summerfruit.vim b/autoload/airline/themes/base16_summerfruit.vim
index 4a7ba5f..4bafd59 100644
--- a/autoload/airline/themes/base16_summerfruit.vim
+++ b/autoload/airline/themes/base16_summerfruit.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#3777E6"
 let s:gui0E = "#AD00A1"
 let s:gui0F = "#cc6633"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm00 = 233
+let s:cterm01 = 234
+let s:cterm02 = 236
+let s:cterm03 = 239
+let s:cterm04 = 249
+let s:cterm05 = 252
+let s:cterm06 = 253
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
+let s:cterm08 = 198
+let s:cterm09 = 208
+let s:cterm0A = 142
 let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm0C = 37
+let s:cterm0D = 68
+let s:cterm0E = 127
+let s:cterm0F = 167
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_tomorrow.vim b/autoload/airline/themes/base16_tomorrow.vim
index 4336535..f8128bc 100644
--- a/autoload/airline/themes/base16_tomorrow.vim
+++ b/autoload/airline/themes/base16_tomorrow.vim
@@ -19,21 +19,21 @@ let s:gui0E = "#b294bb"
 let s:gui0F = "#a3685a"
 
 let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 102
+let s:cterm04 = 145
+let s:cterm05 = 188
+let s:cterm06 = 253
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 167
+let s:cterm09 = 173
+let s:cterm0A = 222
+let s:cterm0B = 143
+let s:cterm0C = 109
+let s:cterm0D = 109
+let s:cterm0E = 139
+let s:cterm0F = 131
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
diff --git a/autoload/airline/themes/base16_twilight.vim b/autoload/airline/themes/base16_twilight.vim
index 1ec6d3e..fa82418 100644
--- a/autoload/airline/themes/base16_twilight.vim
+++ b/autoload/airline/themes/base16_twilight.vim
@@ -18,22 +18,22 @@ let s:gui0D = "#7587a6"
 let s:gui0E = "#9b859d"
 let s:gui0F = "#9b703f"
 
-let s:cterm00 = 0
-let s:cterm01 = 18
-let s:cterm02 = 19
-let s:cterm03 = 8
-let s:cterm04 = 20
-let s:cterm05 = 7
-let s:cterm06 = 21
+let s:cterm00 = 234
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 59
+let s:cterm04 = 102
+let s:cterm05 = 248
+let s:cterm06 = 251
 let s:cterm07 = 15
-let s:cterm08 = 1
-let s:cterm09 = 16
-let s:cterm0A = 3
-let s:cterm0B = 2
-let s:cterm0C = 6
-let s:cterm0D = 4
-let s:cterm0E = 5
-let s:cterm0F = 17
+let s:cterm08 = 167
+let s:cterm09 = 179
+let s:cterm0A = 228
+let s:cterm0B = 107
+let s:cterm0C = 152
+let s:cterm0D = 103
+let s:cterm0E = 103
+let s:cterm0F = 95
 
 let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
 let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]