replace all obsolete color groups in all themes

autoload/airline/themes/badwolf.vim

@@ -21,31 +21,25 @@ let s:IA   = [ s:N2[1]   , s:N3[1] , s:N2[3] , s:N3[3] , '' ]
 
 let g:airline#themes#badwolf#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
 let g:airline#themes#badwolf#normal_modified = {
-      \ 'mode_separator' : [ s:N1[1]   , s:N4[0]   , s:N1[3]   , s:N4[1]   , 'bold' ] ,
+      \ 'airline_b': [ s:N2[0]   , s:N4[0]   , s:N2[2]   , s:N4[1]   , ''     ] ,
-      \ 'info'           : [ s:N2[0]   , s:N4[0]   , s:N2[2]   , s:N4[1]   , ''     ] ,
+      \ 'airline_c': [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
-      \ 'info_separator' : [ s:N4[0]   , s:N2[1]   , s:N4[1]   , s:N2[3]   , 'bold' ] ,
-      \ 'statusline'     : [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
 
 
 let g:airline#themes#badwolf#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
 let g:airline#themes#badwolf#insert_modified = {
-      \ 'info_separator' : [ s:I2[1]   , s:N2[1]   , s:I2[3]   , s:N2[3]   , 'bold' ] ,
+      \ 'airline_c': [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
-      \ 'statusline'     : [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
 let g:airline#themes#badwolf#insert_paste = {
-      \ 'mode'           : [ s:I1[0]   , s:PA[0]   , s:I1[2]   , s:PA[1]   , ''     ] ,
+      \ 'airline_a': [ s:I1[0]   , s:PA[0]   , s:I1[2]   , s:PA[1]   , ''     ] }
-      \ 'mode_separator' : [ s:PA[0]   , s:I2[1]   , s:PA[1]   , s:I2[3]   , ''     ] }
 
 
 let g:airline#themes#badwolf#replace = copy(airline#themes#badwolf#insert)
-let g:airline#themes#badwolf#replace.mode           = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#badwolf#replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
-let g:airline#themes#badwolf#replace.mode_separator = [ s:RE[0] , s:I2[1] , s:RE[1] , s:I2[3] , '' ]
 let g:airline#themes#badwolf#replace_modified = g:airline#themes#badwolf#insert_modified
 
 
 let g:airline#themes#badwolf#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
 let g:airline#themes#badwolf#visual_modified = {
-      \ 'info_separator' : [ s:V2[1]   , s:V4[0]   , s:V2[3]   , s:V4[1]   , 'bold' ] ,
+      \ 'airline_c': [ s:V3[0]   , s:V4[0]   , s:V3[2]   , s:V4[1]   , ''     ] }
-      \ 'statusline'     : [ s:V3[0]   , s:V4[0]   , s:V3[2]   , s:V4[1]   , ''     ] }
 
 
 let g:airline#themes#badwolf#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)

autoload/airline/themes/bubblegum.vim

@@ -23,12 +23,12 @@ let s:cterm_pink = 182
 let s:file  = ['#ff0000', '', 160, '', '']
 
 " Normal mode
-let s:N1    = [s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green]
+let s:N1 = [s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green]
-let s:N2    = [s:gui_light_gray, s:gui_med_gray_lo, s:cterm_light_gray, s:cterm_med_gray_lo]
+let s:N2 = [s:gui_light_gray, s:gui_med_gray_lo, s:cterm_light_gray, s:cterm_med_gray_lo]
-let s:N3    = [s:gui_green, s:gui_med_gray_hi, s:cterm_green, s:cterm_med_gray_hi]
+let s:N3 = [s:gui_green, s:gui_med_gray_hi, s:cterm_green, s:cterm_med_gray_hi]
 let g:airline#themes#bubblegum#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
 let g:airline#themes#bubblegum#normal_modified = {
-      \ 'statusline': [s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, ''],
+      \ 'airline_c': [s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, ''],
       \ }
 
 " Insert mode
@@ -37,15 +37,13 @@ let s:I3 = [s:gui_blue, s:gui_med_gray_hi, s:cterm_blue, s:cterm_med_gray_hi]
 let g:airline#themes#bubblegum#insert = airline#themes#generate_color_map(s:I1, s:N2, s:I3, s:file)
 let g:airline#themes#bubblegum#insert_modified = copy(g:airline#themes#bubblegum#normal_modified)
 let g:airline#themes#bubblegum#insert_paste = {
-      \ 'mode':           [s:gui_dark_gray, s:gui_orange, s:cterm_dark_gray, s:cterm_orange, ''],
+      \ 'airline_a': [s:gui_dark_gray, s:gui_orange, s:cterm_dark_gray, s:cterm_orange, ''],
-      \ 'mode_separator': [s:gui_orange, s:gui_med_gray_lo, s:cterm_orange, s:cterm_med_gray_lo, ''],
       \ }
 
 " Replace mode
 let g:airline#themes#bubblegum#replace = {
-      \ 'mode':           [s:gui_dark_gray, s:gui_red, s:cterm_dark_gray, s:cterm_red, ''],
+      \ 'airline_a': [s:gui_dark_gray, s:gui_red, s:cterm_dark_gray, s:cterm_red, ''],
-      \ 'mode_separator': [s:gui_red, s:N2[1], s:cterm_red, s:N2[3], ''],
+      \ 'airline_c': [s:gui_red, s:gui_med_gray_hi, s:cterm_red, s:cterm_med_gray_hi, ''],
-      \ 'statusline':     [s:gui_red, s:gui_med_gray_hi, s:cterm_red, s:cterm_med_gray_hi, ''],
       \ }
 let g:airline#themes#bubblegum#replace_modified = copy(g:airline#themes#bubblegum#insert_modified)
 

autoload/airline/themes/dark.vim

@@ -44,8 +44,7 @@ let g:airline#themes#dark#normal = airline#themes#generate_color_map(s:N1, s:N2,
 " applied after g:airline#themes#dark#normal, hence why only certain keys are
 " declared.
 let g:airline#themes#dark#normal_modified = {
-      \ 'info_separator': [ '#444444' , '#5f005f' , 238     , 53      , ''     ] ,
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
-      \ 'statusline':     [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
       \ }
 
 
@@ -54,18 +53,15 @@ let s:I2 = [ '#ffffff' , '#005fff' , 255 , 27  ]
 let s:I3 = [ '#ffffff' , '#000080' , 15  , 17  ]
 let g:airline#themes#dark#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
 let g:airline#themes#dark#insert_modified = {
-      \ 'info_separator': [ '#005fff' , '#5f005f' , 27      , 53      , ''     ] ,
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
-      \ 'statusline':     [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
       \ }
 let g:airline#themes#dark#insert_paste = {
-      \ 'mode':           [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
-      \ 'mode_separator': [ '#d78700' , s:I2[1]   , 172     , s:I2[3] , ''     ] ,
       \ }
 
 
 let g:airline#themes#dark#replace = copy(g:airline#themes#dark#insert)
-let g:airline#themes#dark#replace.mode           = [ s:I2[0]   , '#af0000' , s:I2[2] , 124     , ''     ]
+let g:airline#themes#dark#replace.airline_a = [ s:I2[0]   , '#af0000' , s:I2[2] , 124     , ''     ]
-let g:airline#themes#dark#replace.mode_separator = [ '#af0000' , s:I2[1]   , 124     , s:I2[3] , ''     ]
 let g:airline#themes#dark#replace_modified = g:airline#themes#dark#insert_modified
 
 
@@ -74,8 +70,7 @@ let s:V2 = [ '#000000' , '#ff5f00' , 232 , 202 ]
 let s:V3 = [ '#ffffff' , '#5f0000' , 15  , 52  ]
 let g:airline#themes#dark#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
 let g:airline#themes#dark#visual_modified = {
-      \ 'info_separator': [ '#ff5f00' , '#5f005f' , 202     , 53      , ''     ] ,
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
-      \ 'statusline':     [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
       \ }
 
 

autoload/airline/themes/jellybeans.vim

@@ -18,7 +18,7 @@ function! s:generate()
 
   let g:airline#themes#jellybeans#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
   let g:airline#themes#jellybeans#normal_modified = {
-        \ 'statusline': [ '#ffb964', '', 215, '', '' ]
+        \ 'airline_c': [ '#ffb964', '', 215, '', '' ]
         \ }
 
   let s:I1 = airline#themes#get_highlight('DiffAdd', 'bold')

autoload/airline/themes/laederon.vim

@@ -25,36 +25,30 @@ let s:RE = [ '#233e09' , 22 ] " oakleaf
 let s:PA = [ '#ab3e5d' , 161 ] " raspberry
 
 let s:file = [ '#ef393d' , '' , 196 , '' , '' ]
-let s:IA = [ s:N2[1]	, s:N3[1]	, s:N2[3],	s:N3[3]	, '' ]	
+let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3], s:N3[3] , '' ]
 
 
 let g:airline#themes#laederon#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
 let g:airline#themes#laederon#normal_modified = {
-      \ 'mode_separator' : [ s:N1[1] , s:N4[0] , s:N1[3] , s:N4[1] , 'bold' ] ,
+      \ 'airline_a' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
-      \ 'info' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
+      \ 'airline_c' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
-      \ 'info_separator' : [ s:N4[0] , s:N2[1] , s:N4[1] , s:N2[3] , 'bold' ] ,
-      \ 'statusline' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
 
 
 let g:airline#themes#laederon#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
 let g:airline#themes#laederon#insert_modified = {
-      \ 'info_separator' : [ s:I2[1] , s:N2[1] , s:I2[3] , s:N2[3] , 'bold' ] ,
+      \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
-      \ 'statusline' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
 let g:airline#themes#laederon#insert_paste = {
-      \ 'mode' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] ,
+      \ 'airline_a' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] }
-      \ 'mode_separator' : [ s:PA[0] , s:I2[1] , s:PA[1] , s:I2[3] , '' ] }
 
 
 let g:airline#themes#laederon#replace = copy(airline#themes#laederon#insert)
-let g:airline#themes#laederon#replace.mode           = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#laederon#replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
-let g:airline#themes#laederon#replace.mode_separator = [ s:RE[0] , s:I2[1] , s:RE[1] , s:I2[3] , '' ]
 let g:airline#themes#laederon#replace_modified = g:airline#themes#laederon#insert_modified
 
 
 let g:airline#themes#laederon#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
 let g:airline#themes#laederon#visual_modified = {
-      \ 'info_separator' : [ s:V2[1] , s:V4[0] , s:V2[3] , s:V4[1] , 'bold' ] ,
+      \ 'airline_c' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
-      \ 'statusline' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
 
 
 let g:airline#themes#laederon#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)

autoload/airline/themes/light.vim

@@ -4,8 +4,7 @@ let s:N2 = [ '#000087' , '#00dfff' , 18  , 45  ]
 let s:N3 = [ '#005fff' , '#afffff' , 27  , 159 ]
 let g:airline#themes#light#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
 let g:airline#themes#light#normal_modified = {
-      \ 'info_separator': [ '#00dfff' , '#ffdfdf' , 45      , 224     , ''     ] ,
+      \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
-      \ 'statusline':     [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
       \ }
 
 
@@ -14,18 +13,15 @@ let s:I2 = [ '#005f00' , '#00df87' , 22  , 42  ]
 let s:I3 = [ '#005f5f' , '#afff87' , 23  , 156 ]
 let g:airline#themes#light#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
 let g:airline#themes#light#insert_modified = {
-      \ 'info_separator': [ '#00df87' , '#ffdfdf' , 42      , 224     , ''     ] ,
+      \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
-      \ 'statusline':     [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
       \ }
 let g:airline#themes#light#insert_paste = {
-      \ 'mode':           [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
-      \ 'mode_separator': [ '#d78700' , s:I2[1]   , 172     , s:I2[3] , ''     ] ,
       \ }
 
 
 let g:airline#themes#light#replace = copy(g:airline#themes#light#insert)
-let g:airline#themes#light#replace.mode           = [ s:I2[0]   , '#ff0000' , s:I1[2] , 196     , ''     ]
+let g:airline#themes#light#replace.airline_a = [ s:I2[0]   , '#ff0000' , s:I1[2] , 196     , ''     ]
-let g:airline#themes#light#replace.mode_separator = [ '#ff0000' , s:I2[1]   , 196     , s:I2[3] , ''     ]
 let g:airline#themes#light#replace_modified = g:airline#themes#light#insert_modified
 
 
@@ -34,8 +30,7 @@ let s:V2 = [ '#5f0000' , '#ffaf00' , 52  , 214 ]
 let s:V3 = [ '#df5f00' , '#ffff87' , 166 , 228 ]
 let g:airline#themes#light#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
 let g:airline#themes#light#visual_modified = {
-      \ 'info_separator': [ '#ffaf00' , '#ffdfdf' , 214     , 224     , ''     ] ,
+      \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
-      \ 'statusline':     [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
       \ }
 
 

autoload/airline/themes/luna.vim

@@ -7,10 +7,8 @@ let s:N2 = [ '#ffffff' , '#003f3f' , 231 , 29 ]
 let s:N3 = [ '#ffffff' , '#002b2b' , 231  , 23 ] 
 
 let g:airline#themes#luna#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
-
 let g:airline#themes#luna#normal_modified = {
-      \ 'info_separator': [ '#003f3f' , '#450000' , 29     , 52      , ''     ] ,
+      \ 'airline_c': [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
-      \ 'statusline':     [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
       \ }
 
 
@@ -19,18 +17,15 @@ let s:I2 = [ '#ffffff' , '#003f3f' , 231 , 29  ]
 let s:I3 = [ '#ffffff' , '#002b2b' , 231  , 23  ] 
 let g:airline#themes#luna#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
 let g:airline#themes#luna#insert_modified = {
-      \ 'info_separator': [ '#003f3f' , '#005e5e' , 29      , 52      , ''     ] ,
+      \ 'airline_c': [ '#ffffff' , '#005e5e' , 255     , 52      , ''     ] ,
-      \ 'statusline':     [ '#ffffff' , '#005e5e' , 255     , 52      , ''     ] ,
       \ }
 let g:airline#themes#luna#insert_paste = {
-      \ 'mode':           [ s:I1[0]   , '#789f00' , s:I1[2] , 106     , ''     ] ,
+      \ 'airline_a': [ s:I1[0]   , '#789f00' , s:I1[2] , 106     , ''     ] ,
-      \ 'mode_separator': [ '#789f00' , s:I2[1]   , 106     , s:I2[3] , ''     ] ,
       \ }
 
 
 let g:airline#themes#luna#replace = copy(g:airline#themes#luna#insert)
-let g:airline#themes#luna#replace.mode           = [ s:I2[0]   , '#920000' , s:I2[2] , 88     , ''     ]
+let g:airline#themes#luna#replace.airline_a = [ s:I2[0]   , '#920000' , s:I2[2] , 88     , ''     ]
-let g:airline#themes#luna#replace.mode_separator = [ '#920000' , s:I2[1]   , 88     , s:I2[3] , ''     ]
 let g:airline#themes#luna#replace_modified = g:airline#themes#luna#insert_modified
 
 let s:V1 = [ '#ffff9a' , '#ff8036' , 222 , 208 ]
@@ -38,8 +33,7 @@ let s:V2 = [ '#ffffff' , '#003f3f' , 231 , 29 ]
 let s:V3 = [ '#ffffff' , '#002b2b' , 231  , 23  ]
 let g:airline#themes#luna#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
 let g:airline#themes#luna#visual_modified = {
-      \ 'info_separator': [ '#003f3f' , '#450000' , 29     , 52      , ''     ] ,
+      \ 'airline_c': [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
-      \ 'statusline':     [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
       \ }
 
 let s:IA = [ '#4e4e4e' , '#002b2b' , 59 , 23 , '' ]

autoload/airline/themes/molokai.vim

@@ -7,8 +7,7 @@ let s:N3 = [ '#f8f8f0' , '#465457' , 253 , 67  ] " statusline
 
 let g:airline#themes#molokai#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
 let g:airline#themes#molokai#normal_modified = {
-      \ 'info_separator': [ '#232526' , '#e6db74' , 16  , 144 , '' ] ,
+      \ 'airline_c': [ '#080808' , '#e6db74' , 232 , 144 , '' ] ,
-      \ 'statusline':     [ '#080808' , '#e6db74' , 232 , 144 , '' ] ,
       \ }
 
 
@@ -19,18 +18,15 @@ let s:I3 = [ '#f8f8f0' , '#465457' , 253 , 67 ]
 
 let g:airline#themes#molokai#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
 let g:airline#themes#molokai#insert_modified = {
-      \ 'info_separator': [ '#232526' , '#66d9ef' , 16  , 81 , '' ] ,
+      \ 'airline_c': [ '#080808' , '#66d9ef' , 232 , 81 , '' ] ,
-      \ 'statusline':     [ '#080808' , '#66d9ef' , 232 , 81 , '' ] ,
       \ }
 
 
 " Replace mode
 let g:airline#themes#molokai#replace = copy(g:airline#themes#molokai#insert)
-let g:airline#themes#molokai#replace.mode           = [ s:I1[0]   , '#ef5939' , s:I1[2] , 166     , ''     ]
+let g:airline#themes#molokai#replace.airline_a = [ s:I1[0]   , '#ef5939' , s:I1[2] , 166     , ''     ]
-let g:airline#themes#molokai#replace.mode_separator = [ '#ef5939' , s:I2[1]   , 166     , s:I2[3] , ''     ]
+let g:airline#themes#molokai#replace_modified = {
-let g:airline#themes#molokai#replace_modified       = {
+      \ 'airline_c': [ '#080808' , '#ef5939' , 232 , 166 , '' ] ,
-      \ 'info_separator': [ '#232526' , '#ef5939' , 16  , 166 , '' ] ,
-      \ 'statusline':     [ '#080808' , '#ef5939' , 232 , 166 , '' ] ,
       \ }
 
 
@@ -41,8 +37,7 @@ let s:V3 = [ '#f8f8f0' , '#465457' , 253 , 67  ]
 
 let g:airline#themes#molokai#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
 let g:airline#themes#molokai#visual_modified = {
-      \ 'info_separator': [ '#232526' , '#fd971f' , 16  , 208 , '' ] ,
+      \ 'airline_c': [ '#080808' , '#fd971f' , 232 , 208 , '' ] ,
-      \ 'statusline':     [ '#080808' , '#fd971f' , 232 , 208 , '' ] ,
       \ }
 
 

autoload/airline/themes/powerlineish.vim

@@ -32,17 +32,15 @@ let g:airline#themes#powerlineish#normal = airline#themes#generate_color_map(s:N
 
 let g:airline#themes#powerlineish#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
 let g:airline#themes#powerlineish#insert_replace = {
-      \ 'mode'           : [ s:RE[0]   , s:I1[1]   , s:RE[1]   , s:I1[3]   , ''     ] ,
+      \ 'airline_a': [ s:RE[0]   , s:I1[1]   , s:RE[1]   , s:I1[3]   , ''     ] }
-      \ 'mode_separator' : [ s:I1[1]   , s:I2[1]   , s:I1[3]   , s:I2[3]   , ''     ] }
 
 let g:airline#themes#powerlineish#visual = {
-      \ 'mode'           : [ s:V1[0]   , s:V1[1]   , s:V1[2]   , s:V1[3]   , ''     ] ,
+      \ 'airline_a': [ s:V1[0]   , s:V1[1]   , s:V1[2]   , s:V1[3]   , ''     ] }
-      \ 'mode_separator' : [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
 
 let g:airline#themes#powerlineish#replace = copy(airline#themes#powerlineish#normal)
-let g:airline#themes#powerlineish#replace.mode           = [ s:RE[0] , s:RE[1] , s:RE[2] , s:RE[3] , '' ]
+let g:airline#themes#powerlineish#replace.airline_a = [ s:RE[0] , s:RE[1] , s:RE[2] , s:RE[3] , '' ]
-let g:airline#themes#powerlineish#replace.mode_separator = [ s:RE[1] , s:N2[1] , s:RE[3] , s:N2[3] , '' ]
 
 
-let s:IA = [ s:N2[1]   , s:N3[1]   , s:N2[3]   , s:N3[3]   , ''     ]
+let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ]
 let g:airline#themes#powerlineish#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+

autoload/airline/themes/simple.vim

@@ -1,98 +1,38 @@
-let s:swap = 0
-if exists('g:airline_powerline_fonts') && g:airline_powerline_fonts
-  let s:swap = 1
-
-  let s:left = 0
-  function! airline#themes#simple#left()
-    if s:left == 1
-      let s:left = 0
-      return ''
-    else
-      let s:left = 1
-      return ''
-    endif
-  endfunction
-  let g:airline_left_sep = '%{airline#themes#simple#left()}'
-
-  let s:right = 0
-  function! airline#themes#simple#right()
-    if s:right == 1
-      let s:right = 0
-      return ''
-    else
-      let s:right = 1
-      return ''
-    endif
-  endfunction
-  let g:airline_right_sep = '%{airline#themes#simple#right()}'
-endif
-
-if g:airline_left_sep == '' && g:airline_right_sep == ''
-  let s:swap = 1
-endif
-
 let s:guibg = '#080808'
+let s:guibg2 = '#1c1c1c'
 let s:termbg = 232
-let s:termsep = 236
+let s:termbg2= 234
-let s:guisep = '#303030'
 
 let s:file = [ '#ff0000' , '' , 160 , '' , '' ]
-let s:N1 = s:swap ? [ s:guibg , '#00dfff' , s:termbg , 45 ] : [ '#00dfff' , s:guibg , 45 , s:termbg ]
+let s:N1 = [ s:guibg , '#00dfff' , s:termbg , 45 ]
-let s:N2 = [ '#ff5f00' , s:guibg, 202 , s:termbg ]
+let s:N2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
-let s:N3 = [ '#767676' , s:guibg, 243 , s:termbg ]
+let s:N3 = [ '#767676' , s:guibg, 243 , s:termbg]
-let g:airline#themes#simple#normal = {
+let g:airline#themes#simple#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
-      \ 'mode':           [ s:N1[0]   , s:N1[1] , s:N1[2]   , s:N1[3]  , 'bold' ] ,
-      \ 'mode_separator': s:swap
-                      \ ? [ '#00dfff' , s:N2[1] , 45        , s:N2[3]  , 'bold' ]
-                      \ : [ s:guisep  , s:N2[1] , s:termsep , s:N2[3]  , 'bold' ] ,
-      \ 'info':           [ s:N2[0]   , s:N2[1] , s:N2[2]   , s:N2[3]  , ''     ] ,
-      \ 'info_separator': [ s:guisep  , s:N3[1] , s:termsep , s:N3[3]  , 'bold' ] ,
-      \ 'statusline':     [ s:N3[0]   , s:N3[1] , s:N3[2]   , s:N3[3]  , ''     ] ,
-      \ 'file':           s:file,
-      \ }
 let g:airline#themes#simple#normal_modified = {
-      \ 'statusline':     [ '#df0000' , s:guibg, 160     , s:termbg    , ''     ] ,
+      \ 'airline_c': [ '#df0000' , s:guibg, 160     , s:termbg    , ''     ] ,
       \ }
 
 
-let s:I1 = s:swap ? [ s:guibg, '#5fff00' , s:termbg , 82 ] : [ '#5fff00' , s:guibg, 82 , s:termbg ]
+let s:I1 = [ s:guibg, '#5fff00' , s:termbg , 82 ]
-let s:I2 = [ '#ff5f00' , s:guibg, 202 , s:termbg ]
+let s:I2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
 let s:I3 = [ '#767676' , s:guibg, 243 , s:termbg ]
-let g:airline#themes#simple#insert = {
+let g:airline#themes#simple#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
-      \ 'mode':           [ s:I1[0]   , s:I1[1] , s:I1[2]   , s:I1[3] , 'bold' ] ,
-      \ 'mode_separator': s:swap
-                      \ ? [ '#5fff00' , s:I2[1] , 82        , s:I2[3] , 'bold' ]
-                      \ : [ s:guisep  , s:I2[1] , s:termsep , s:I2[3] , 'bold' ] ,
-      \ 'info':           [ s:I2[0]   , s:I2[1] , s:I2[2]   , s:I2[3] , ''     ] ,
-      \ 'info_separator': [ s:guisep  , s:I3[1] , s:termsep , s:I3[3] , 'bold' ] ,
-      \ 'statusline':     [ s:I3[0]   , s:I3[1] , s:I3[2]   , s:I3[3] , ''     ] ,
-      \ }
 let g:airline#themes#simple#insert_modified = copy(g:airline#themes#simple#normal_modified)
 let g:airline#themes#simple#insert_paste = {
-      \ 'mode':           [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
-      \ 'mode_separator': [ '#d78700' , s:I2[1]   , 172     , s:I2[3] , ''     ] ,
       \ }
 
 
 let g:airline#themes#simple#replace = {
-      \ 'mode':           [ s:I1[0]   , '#af0000' , s:I1[2] , 124     , ''     ] ,
+      \ 'airline_a': [ s:I1[0]   , '#af0000' , s:I1[2] , 124     , ''     ] ,
-      \ 'mode_separator': [ '#af0000' , s:I2[1]   , 124     , s:I2[3] , ''     ] ,
       \ }
 let g:airline#themes#simple#replace_modified = copy(g:airline#themes#simple#normal_modified)
 
 
-let s:V1 = s:swap ? [ s:guibg, '#dfdf00' , s:termbg , 184 ] : [ '#dfdf00' , s:guibg, 184 , s:termbg ]
+let s:V1 = [ s:guibg, '#dfdf00' , s:termbg , 184 ]
-let s:V2 = [ '#ff5f00' , s:guibg, 202 , s:termbg ]
+let s:V2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
 let s:V3 = [ '#767676' , s:guibg, 243 , s:termbg ]
-let g:airline#themes#simple#visual = {
+let g:airline#themes#simple#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
-      \ 'mode':           [ s:V1[0]   , s:V1[1] , s:V1[2]   , s:V1[3] , 'bold' ] ,
-      \ 'mode_separator': s:swap
-                      \ ? [ '#dfdf00' , s:V2[1] , 184       , s:V2[3] , 'bold' ]
-                      \ : [ s:guisep  , s:V2[1] , s:termsep , s:V2[3] , 'bold' ] ,
-      \ 'info':           [ s:V2[0]   , s:V2[1] , s:V2[2]   , s:V2[3] , ''     ] ,
-      \ 'info_separator': [ s:guisep  , s:V3[1] , s:termsep , s:V3[3] , 'bold' ] ,
-      \ 'statusline':     [ s:V3[0]   , s:V3[1] , s:V3[2]   , s:V3[3] , ''     ] ,
-      \ }
 let g:airline#themes#simple#visual_modified = copy(g:airline#themes#simple#normal_modified)
 
 

autoload/airline/themes/solarized.vim

@@ -46,27 +46,15 @@ function! s:generate()
   let s:NF = [s:orange, s:N3[1], '']
   if s:reduced
     if s:background == 'dark'
-      let s:NM = {
+      let s:NM = [s:magenta, s:N3[1], '']
-            \ 'info_separator': [s:N2[1], s:N3[1], ''],
-            \ 'statusline': [s:magenta, s:N3[1], ''],
-            \ }
     else
-      let s:NM = {
+      let s:NM = [s:magenta, s:N3[1], '']
-            \ 'info_separator': [s:N2[1], s:N3[1], ''],
-            \ 'statusline': [s:magenta, s:N3[1], ''],
-            \ }
     endif
   else
     if s:background == 'dark'
-      let s:NM = {
+      let s:NM = [s:c218, s:c52, '']
-            \ 'info_separator':  [s:N2[1], s:c52, ''],
-            \ 'statusline': [s:c218, s:c52, '']
-            \ }
     else
-      let s:NM = {
+      let s:NM = [s:red, s:c218, '']
-            \ 'info_separator': [s:N2[1], s:c218, ''],
-            \ 'statusline': [s:red, s:c218, '']
-            \ }
     endif
   endif
 
@@ -80,14 +68,7 @@ function! s:generate()
   endif
   let s:I3 = s:N3
   let s:IF = s:NF
-  if s:reduced
+  let s:IM = s:NM
-    let s:IM = s:NM
-  else
-    let s:IM = {
-          \ 'info_separator': [s:I2[1], s:NM.statusline[1], ''],
-          \ 'statusline': s:NM.statusline
-          \ }
-  endif
 
   " Visual mode
   let s:V1 = [s:N1[0], s:orange, 'bold']
@@ -133,10 +114,8 @@ function! s:generate()
         \ s:NFa)
 
   let g:airline#themes#solarized#normal_modified = {
-        \ 'info_separator': [s:NM.info_separator[0].g, s:NM.info_separator[1].g,
+        \ 'airline_c': [s:NM[0].g, s:NM[1].g,
-        \ s:NM.info_separator[0].t, s:NM.info_separator[1].t, s:NM.info_separator[2]],
+        \ s:NM[0].t, s:NM[1].t, s:NM[2]]}
-        \ 'statusline': [s:NM.statusline[0].g, s:NM.statusline[1].g,
-        \ s:NM.statusline[0].t, s:NM.statusline[1].t, s:NM.statusline[2]]}
 
   let g:airline#themes#solarized#insert = airline#themes#generate_color_map(
         \ [s:I1[0].g, s:I1[1].g, s:I1[0].t, s:I1[1].t, s:I1[2]],
@@ -145,10 +124,8 @@ function! s:generate()
         \ s:IFa)
 
   let g:airline#themes#solarized#insert_modified = {
-        \ 'info_separator': [s:IM.info_separator[0].g, s:IM.info_separator[1].g,
+        \ 'airline_c': [s:IM[0].g, s:IM[1].g,
-        \ s:IM.info_separator[0].t, s:IM.info_separator[1].t, s:IM.info_separator[2]],
+        \ s:IM[0].t, s:IM[1].t, s:IM[2]]}
-        \ 'statusline': [s:IM.statusline[0].g, s:IM.statusline[1].g,
-        \ s:IM.statusline[0].t, s:IM.statusline[1].t, s:IM.statusline[2]]}
 
   let g:airline#themes#solarized#visual = airline#themes#generate_color_map(
         \ [s:V1[0].g, s:V1[1].g, s:V1[0].t, s:V1[1].t, s:V1[2]],
@@ -157,10 +134,8 @@ function! s:generate()
         \ s:VFa)
 
   let g:airline#themes#solarized#visual_modified = {
-        \ 'info_separator': [s:VM.info_separator[0].g, s:VM.info_separator[1].g,
+        \ 'airline_c': [s:VM[0].g, s:VM[1].g,
-        \ s:VM.info_separator[0].t, s:VM.info_separator[1].t, s:VM.info_separator[2]],
+        \ s:VM[0].t, s:VM[1].t, s:VM[2]]}
-        \ 'statusline': [s:VM.statusline[0].g, s:VM.statusline[1].g,
-        \ s:VM.statusline[0].t, s:VM.statusline[1].t, s:VM.statusline[2]]}
 endfunction
 
 call s:generate()

autoload/airline/themes/tomorrow.vim

@@ -11,7 +11,7 @@ function! s:generate()
 
   let group = airline#themes#get_highlight('vimCommand')
   let g:airline#themes#tomorrow#normal_modified = {
-        \ 'statusline': [ group[0], '', group[2], '', '' ]
+        \ 'airline_c': [ group[0], '', group[2], '', '' ]
         \ }
 
   let s:I1 = airline#themes#get_highlight2(['Normal', 'bg'], ['MoreMsg', 'fg'], 'bold')

autoload/airline/themes/ubaryd.vim

@@ -25,38 +25,32 @@ let s:RE = [ '#c7915b' , 173 ] " nut
 let s:PA = [ '#f9ef6d' , 154 ] " bleaklemon
 
 let s:file = [ '#ff7400' , '' , 196 , '' , '' ]
-let s:IA = [ s:N2[1]	, s:N3[1]	, s:N2[3],	s:N3[3]	, '' ]	
+let s:IA = [ s:N2[1], s:N3[1], s:N2[3], s:N3[3], '' ]	
 
 
 let g:airline#themes#ubaryd#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
 let g:airline#themes#ubaryd#normal_modified = {
-      \ 'mode_separator' : [ s:N1[1] , s:N4[0] , s:N1[3] , s:N4[1] , 'bold' ] ,
+      \ 'airline_a' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
-      \ 'info' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
+      \ 'airline_c' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
-      \ 'info_separator' : [ s:N4[0] , s:N2[1] , s:N4[1] , s:N2[3] , 'bold' ] ,
-      \ 'statusline' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
 let g:airline#themes#ubaryd#inactive = {
-      \ 'mode' : [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ] }
+      \ 'airline_a' : [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ] }
 
 
 let g:airline#themes#ubaryd#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
 let g:airline#themes#ubaryd#insert_modified = {
-      \ 'info_separator' : [ s:I2[1] , s:N2[1] , s:I2[3] , s:N2[3] , 'bold' ] ,
+      \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
-      \ 'statusline' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
 let g:airline#themes#ubaryd#insert_paste = {
-      \ 'mode' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] ,
+      \ 'airline_a' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] }
-      \ 'mode_separator' : [ s:PA[0] , s:I2[1] , s:PA[1] , s:I2[3] , '' ] }
 
 
 let g:airline#themes#ubaryd#replace = copy(airline#themes#ubaryd#insert)
-let g:airline#themes#ubaryd#replace.mode           = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#ubaryd#replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
-let g:airline#themes#ubaryd#replace.mode_separator = [ s:RE[0] , s:I2[1] , s:RE[1] , s:I2[3] , '' ]
 let g:airline#themes#ubaryd#replace_modified = g:airline#themes#ubaryd#insert_modified
 
 
 let g:airline#themes#ubaryd#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
 let g:airline#themes#ubaryd#visual_modified = {
-      \ 'info_separator' : [ s:V2[1] , s:V4[0] , s:V2[3] , s:V4[1] , 'bold' ] ,
+      \ 'airline_c' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
-      \ 'statusline' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
 
 let g:airline#themes#ubaryd#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 

autoload/airline/themes/wombat.vim

@@ -41,46 +41,36 @@ let s:IA = [ '#767676' , s:N3[1] , 243 , s:N3[3] , '' ]
 
 let g:airline#themes#wombat#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
 let g:airline#themes#wombat#normal_modified = {
-    \ 'mode'           : [ s:N1[0] , s:N4[0] , s:N1[2] , s:N4[1] , ''     ] ,
+    \ 'airline_a': [ s:N1[0] , s:N4[0] , s:N1[2] , s:N4[1] , ''     ] ,
-    \ 'mode_separator' : [ s:N4[0] , s:IM[0] , s:N4[1] , s:IM[1] , 'bold' ] ,
+    \ 'airline_b': [ s:N4[0] , s:IM[0] , s:N4[1] , s:IM[1] , ''     ] ,
-    \ 'info'           : [ s:N4[0] , s:IM[0] , s:N4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:N4[0] , s:N3[1] , s:N4[1] , s:N3[3] , ''     ] }
-    \ 'info_separator' : [ s:IM[0] , s:N3[1] , s:IM[1] , s:N3[3] , 'bold' ] ,
-    \ 'statusline'     : [ s:N4[0] , s:N3[1] , s:N4[1] , s:N3[3] , ''     ] }
 
 
 let g:airline#themes#wombat#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
 let g:airline#themes#wombat#insert_modified = {
-    \ 'mode'           : [ s:I1[0] , s:I4[0] , s:I1[2] , s:I4[1] , ''     ] ,
+    \ 'airline_a': [ s:I1[0] , s:I4[0] , s:I1[2] , s:I4[1] , ''     ] ,
-    \ 'mode_separator' : [ s:I4[0] , s:IM[0] , s:I4[1] , s:IM[1] , 'bold' ] ,
+    \ 'airline_b': [ s:I4[0] , s:IM[0] , s:I4[1] , s:IM[1] , ''     ] ,
-    \ 'info'           : [ s:I4[0] , s:IM[0] , s:I4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:I4[0] , s:N3[1] , s:I4[1] , s:N3[3] , ''     ] }
-    \ 'info_separator' : [ s:IM[0] , s:N3[1] , s:IM[1] , s:N3[3] , 'bold' ] ,
-    \ 'statusline'     : [ s:I4[0] , s:N3[1] , s:I4[1] , s:N3[3] , ''     ] }
 
 
 let g:airline#themes#wombat#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
 let g:airline#themes#wombat#visual_modified = {
-    \ 'mode'           : [ s:V1[0] , s:V4[0] , s:V1[2] , s:V4[1] , ''     ] ,
+    \ 'airline_a': [ s:V1[0] , s:V4[0] , s:V1[2] , s:V4[1] , ''     ] ,
-    \ 'mode_separator' : [ s:V4[0] , s:IM[0] , s:V4[1] , s:IM[1] , 'bold' ] ,
+    \ 'airline_b': [ s:V4[0] , s:IM[0] , s:V4[1] , s:IM[1] , ''     ] ,
-    \ 'info'           : [ s:V4[0] , s:IM[0] , s:V4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:V4[0] , s:N3[1] , s:V4[1] , s:N3[3] , ''     ] }
-    \ 'info_separator' : [ s:IM[0] , s:N3[1] , s:IM[1] , s:N3[3] , 'bold' ] ,
-    \ 'statusline'     : [ s:V4[0] , s:N3[1] , s:V4[1] , s:N3[3] , ''     ] }
 
 
 let g:airline#themes#wombat#replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3, s:file)
 let g:airline#themes#wombat#replace_modified = {
-    \ 'mode'           : [ s:R1[0] , s:R4[0] , s:R1[2] , s:R4[1] , ''     ] ,
+    \ 'airline_a': [ s:R1[0] , s:R4[0] , s:R1[2] , s:R4[1] , ''     ] ,
-    \ 'mode_separator' : [ s:R4[0] , s:IM[0] , s:R4[1] , s:IM[1] , 'bold' ] ,
+    \ 'airline_b': [ s:R4[0] , s:IM[0] , s:R4[1] , s:IM[1] , ''     ] ,
-    \ 'info'           : [ s:R4[0] , s:IM[0] , s:R4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:R4[0] , s:N3[1] , s:R4[1] , s:N3[3] , ''     ] }
-    \ 'info_separator' : [ s:IM[0] , s:N3[1] , s:IM[1] , s:N3[3] , 'bold' ] ,
-    \ 'statusline'     : [ s:R4[0] , s:N3[1] , s:R4[1] , s:N3[3] , ''     ] }
 
 
 let g:airline#themes#wombat#insert_paste = {
-    \ 'mode'           : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , ''     ] ,
+    \ 'airline_a': [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , ''     ] ,
-    \ 'mode_separator' : [ s:PA[0] , s:IM[0] , s:PA[1] , s:IM[1] , 'bold' ] ,
+    \ 'airline_b': [ s:PA[0] , s:IM[0] , s:PA[1] , s:IM[1] , ''     ] ,
-    \ 'info'           : [ s:PA[0] , s:IM[0] , s:PA[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:PA[0] , s:N3[1] , s:PA[1] , s:N3[3] , ''     ] }
-    \ 'info_separator' : [ s:IM[0] , s:N3[1] , s:IM[1] , s:N3[3] , 'bold' ] ,
-    \ 'statusline'     : [ s:PA[0] , s:N3[1] , s:PA[1] , s:N3[3] , ''     ] }
 
 
 let g:airline#themes#wombat#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)