diff --git a/autoload/airline.vim b/autoload/airline.vim
index ae578148..fac171eb 100644
--- a/autoload/airline.vim
+++ b/autoload/airline.vim
@@ -11,7 +11,8 @@ endfunction
 
 function! airline#switch_theme(name)
   let g:airline_theme = a:name
-  let inactive_colors = g:airline#themes#{g:airline_theme}#inactive "also lazy loads the theme
+  let palette = g:airline#themes#{g:airline_theme}#palette "also lazy loads the theme
+
   let w:airline_lastmode = ''
   call airline#update_statusline()
   call airline#load_theme()
diff --git a/autoload/airline/extensions/ctrlp.vim b/autoload/airline/extensions/ctrlp.vim
index 738faff0..dbe6691d 100644
--- a/autoload/airline/extensions/ctrlp.vim
+++ b/autoload/airline/extensions/ctrlp.vim
@@ -13,13 +13,13 @@ function! airline#extensions#ctrlp#generate_color_map(dark, light, white)
 endfunction
 
 function! airline#extensions#ctrlp#load_theme()
-  if exists('g:airline#themes#{g:airline_theme}#ctrlp')
-    let theme = g:airline#themes#{g:airline_theme}#ctrlp
+  if exists('g:airline#themes#{g:airline_theme}#palette.ctrlp')
+    let theme = g:airline#themes#{g:airline_theme}#palette.ctrlp
   else
     let theme = airline#extensions#ctrlp#generate_color_map(
-          \ g:airline#themes#{g:airline_theme}#insert['airline_c'],
-          \ g:airline#themes#{g:airline_theme}#insert['airline_b'],
-          \ g:airline#themes#{g:airline_theme}#insert['airline_a'])
+          \ g:airline#themes#{g:airline_theme}#palette.insert['airline_c'],
+          \ g:airline#themes#{g:airline_theme}#palette.insert['airline_b'],
+          \ g:airline#themes#{g:airline_theme}#palette.insert['airline_a'])
   endif
   for key in keys(theme)
     call airline#highlighter#exec(key, theme[key])
diff --git a/autoload/airline/highlighter.vim b/autoload/airline/highlighter.vim
index a9c8f351..5e8e1efe 100644
--- a/autoload/airline/highlighter.vim
+++ b/autoload/airline/highlighter.vim
@@ -48,8 +48,8 @@ function! airline#highlighter#new()
     let mapped = map(a:modes, 'v:val == a:modes[0] ? v:val : a:modes[0]."_".v:val')
     let suffix = a:modes[0] == 'inactive' ? '_inactive' : ''
     for mode in mapped
-      if exists('g:airline#themes#{g:airline_theme}#{mode}')
-        let dict = g:airline#themes#{g:airline_theme}#{mode}
+      if exists('g:airline#themes#{g:airline_theme}#palette[mode]')
+        let dict = g:airline#themes#{g:airline_theme}#palette[mode]
         for kvp in items(dict)
           call airline#highlighter#exec(kvp[0].suffix, kvp[1])
         endfor
diff --git a/autoload/airline/themes/badwolf.vim b/autoload/airline/themes/badwolf.vim
index cb82523d..cc9d2624 100644
--- a/autoload/airline/themes/badwolf.vim
+++ b/autoload/airline/themes/badwolf.vim
@@ -18,29 +18,30 @@ let s:RE = [ '#ff9eb8' , 211 ]                   " dress
 let s:file = [ '#ff2c4b' , ''      , 196     , ''      , '' ]
 let s:IA   = [ s:N2[1]   , s:N3[1] , s:N2[3] , s:N3[3] , '' ]
 
+let g:airline#themes#badwolf#palette = {}
 
-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 = {
+let g:airline#themes#badwolf#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#badwolf#palette.normal_modified = {
       \ 'airline_b': [ 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]   , ''     ] }
 
 
-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 = {
+let g:airline#themes#badwolf#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#badwolf#palette.insert_modified = {
       \ 'airline_c': [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
-let g:airline#themes#badwolf#insert_paste = {
+let g:airline#themes#badwolf#palette.insert_paste = {
       \ 'airline_a': [ s:I1[0]   , s:PA[0]   , s:I1[2]   , s:PA[1]   , ''     ] }
 
 
-let g:airline#themes#badwolf#replace = copy(airline#themes#badwolf#insert)
-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_modified = g:airline#themes#badwolf#insert_modified
+let g:airline#themes#badwolf#palette.replace = copy(airline#themes#badwolf#palette.insert)
+let g:airline#themes#badwolf#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#badwolf#palette.replace_modified = g:airline#themes#badwolf#palette.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 = {
+let g:airline#themes#badwolf#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#badwolf#palette.visual_modified = {
       \ 'airline_c': [ 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)
+let g:airline#themes#badwolf#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 
diff --git a/autoload/airline/themes/bubblegum.vim b/autoload/airline/themes/bubblegum.vim
index ccf6401e..1f293769 100644
--- a/autoload/airline/themes/bubblegum.vim
+++ b/autoload/airline/themes/bubblegum.vim
@@ -22,38 +22,40 @@ let s:cterm_pink = 182
 
 let s:file  = ['#ff0000', '', 160, '', '']
 
+let g:airline#themes#bubblegum#palette = {}
+
 " Normal mode
 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: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 = {
+let g:airline#themes#bubblegum#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#bubblegum#palette.normal_modified = {
       \ 'airline_c': [s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, ''],
       \ }
 
 " Insert mode
 let s:I1 = [s:gui_med_gray_hi, s:gui_blue, s:cterm_med_gray_hi, s:cterm_blue]
 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 = {
+let g:airline#themes#bubblegum#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:I3, s:file)
+let g:airline#themes#bubblegum#palette.insert_modified = copy(g:airline#themes#bubblegum#palette.normal_modified)
+let g:airline#themes#bubblegum#palette.insert_paste = {
       \ 'airline_a': [s:gui_dark_gray, s:gui_orange, s:cterm_dark_gray, s:cterm_orange, ''],
       \ }
 
 " Replace mode
-let g:airline#themes#bubblegum#replace = {
+let g:airline#themes#bubblegum#palette.replace = {
       \ 'airline_a': [s:gui_dark_gray, s:gui_red, s:cterm_dark_gray, s:cterm_red, ''],
       \ 'airline_c': [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)
+let g:airline#themes#bubblegum#palette.replace_modified = copy(g:airline#themes#bubblegum#palette.insert_modified)
 
 " Visual mode
 let s:V1 = [s:gui_dark_gray, s:gui_pink, s:cterm_dark_gray, s:cterm_pink]
 let s:V3 = [s:gui_pink, s:gui_med_gray_hi, s:cterm_pink, s:cterm_med_gray_hi]
-let g:airline#themes#bubblegum#visual = airline#themes#generate_color_map(s:V1, s:N2, s:V3, s:file)
-let g:airline#themes#bubblegum#visual_modified = copy(g:airline#themes#bubblegum#insert_modified)
+let g:airline#themes#bubblegum#palette.visual = airline#themes#generate_color_map(s:V1, s:N2, s:V3, s:file)
+let g:airline#themes#bubblegum#palette.visual_modified = copy(g:airline#themes#bubblegum#palette.insert_modified)
 
 " Inactive window
 let s:IA = [s:gui_dark_gray, s:gui_med_gray_hi, s:cterm_dark_gray, s:cterm_med_gray_hi, '']
-let g:airline#themes#bubblegum#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#bubblegum#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 
diff --git a/autoload/airline/themes/dark.vim b/autoload/airline/themes/dark.vim
index 216299a5..3b714a3f 100644
--- a/autoload/airline/themes/dark.vim
+++ b/autoload/airline/themes/dark.vim
@@ -35,15 +35,18 @@ let s:N3   = [ '#9cffd3' , '#202020' , 85  , 234 ]
 " for the statusline.  See the source code of "autoload/airline/themes.vim"
 " for the full set of keys available for theming.
 
-" Now let's define the global g: variable that declares the colors used for
-" normal mode.  The # is a separator that maps with the directory structure.
-" If you get this wrong, Vim will complain loudly.
-let g:airline#themes#dark#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+" First, let's define a palette.  Airline will search for this variable.
+" The # is a separator that maps with the directory structure. If you get
+" this wrong, Vim will complain loudly.
+let g:airline#themes#dark#palette = {}
+
+" Now let's declare some colors for normal mode and add it to the dictionary.
+let g:airline#themes#dark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
 
 " Here we define overrides for when the buffer is modified.  This will be
-" applied after g:airline#themes#dark#normal, hence why only certain keys are
+" applied after g:airline#themes#dark#palette.normal, hence why only certain keys are
 " declared.
-let g:airline#themes#dark#normal_modified = {
+let g:airline#themes#dark#palette.normal_modified = {
       \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
       \ }
 
@@ -51,31 +54,31 @@ let g:airline#themes#dark#normal_modified = {
 let s:I1 = [ '#00005f' , '#00dfff' , 17  , 45  ]
 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 = {
+let g:airline#themes#dark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#dark#palette.insert_modified = {
       \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
       \ }
-let g:airline#themes#dark#insert_paste = {
+let g:airline#themes#dark#palette.insert_paste = {
       \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
       \ }
 
 
-let g:airline#themes#dark#replace = copy(g:airline#themes#dark#insert)
-let g:airline#themes#dark#replace.airline_a = [ s:I2[0]   , '#af0000' , s:I2[2] , 124     , ''     ]
-let g:airline#themes#dark#replace_modified = g:airline#themes#dark#insert_modified
+let g:airline#themes#dark#palette.replace = copy(g:airline#themes#dark#palette.insert)
+let g:airline#themes#dark#palette.replace.airline_a = [ s:I2[0]   , '#af0000' , s:I2[2] , 124     , ''     ]
+let g:airline#themes#dark#palette.replace_modified = g:airline#themes#dark#palette.insert_modified
 
 
 let s:V1 = [ '#000000' , '#ffaf00' , 232 , 214 ]
 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 = {
+let g:airline#themes#dark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#dark#palette.visual_modified = {
       \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
       \ }
 
 
 let s:IA = [ '#4e4e4e' , '#1c1c1c' , 239 , 234 , '' ]
-let g:airline#themes#dark#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#dark#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 
 
 " Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp
@@ -83,7 +86,7 @@ let g:airline#themes#dark#inactive = airline#themes#generate_color_map(s:IA, s:I
 " ctrlp. Note that this is optional, and if you do not define ctrlp colors
 " they will be chosen automatically from the existing palette.
 if get(g:, 'loaded_ctrlp', 0)
-  let g:airline#themes#dark#ctrlp = airline#extensions#ctrlp#generate_color_map(
+  let g:airline#themes#dark#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
         \ [ '#d7d7ff' , '#5f00af' , 189 , 55  , ''     ],
         \ [ '#ffffff' , '#875fd7' , 231 , 98  , ''     ],
         \ [ '#5f00af' , '#ffffff' , 55  , 231 , 'bold' ])
diff --git a/autoload/airline/themes/jellybeans.vim b/autoload/airline/themes/jellybeans.vim
index 78c93bab..88ed2662 100644
--- a/autoload/airline/themes/jellybeans.vim
+++ b/autoload/airline/themes/jellybeans.vim
@@ -1,3 +1,5 @@
+let g:airline#themes#jellybeans#palette = {}
+
 function! s:generate()
   " This theme is an example of how to use helper functions to extract highlight
   " values from the corresponding colorscheme. It was written in a hurry, so it
@@ -16,34 +18,34 @@ function! s:generate()
   let s:file[1] = ''
   let s:file[3] = ''
 
-  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 = {
+  let g:airline#themes#jellybeans#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+  let g:airline#themes#jellybeans#palette.normal_modified = {
         \ 'airline_c': [ '#ffb964', '', 215, '', '' ]
         \ }
 
   let s:I1 = airline#themes#get_highlight('DiffAdd', 'bold')
   let s:I2 = s:N2
   let s:I3 = s:N3
-  let g:airline#themes#jellybeans#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
-  let g:airline#themes#jellybeans#insert_modified = g:airline#themes#jellybeans#normal_modified
+  let g:airline#themes#jellybeans#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+  let g:airline#themes#jellybeans#palette.insert_modified = g:airline#themes#jellybeans#palette.normal_modified
 
   let s:R1 = airline#themes#get_highlight('WildMenu', 'bold')
   let s:R2 = s:N2
   let s:R3 = s:N3
-  let g:airline#themes#jellybeans#replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3, s:file)
-  let g:airline#themes#jellybeans#replace_modified = g:airline#themes#jellybeans#normal_modified
+  let g:airline#themes#jellybeans#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3, s:file)
+  let g:airline#themes#jellybeans#palette.replace_modified = g:airline#themes#jellybeans#palette.normal_modified
 
   " Sometimes you want to mix and match colors from different groups, you can do
   " that with this method.
   let s:V1 = airline#themes#get_highlight2(['TabLineSel', 'bg'], ['DiffDelete', 'bg'], 'bold')
   let s:V2 = s:N2
   let s:V3 = s:N3
-  let g:airline#themes#jellybeans#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
-  let g:airline#themes#jellybeans#visual_modified = g:airline#themes#jellybeans#normal_modified
+  let g:airline#themes#jellybeans#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+  let g:airline#themes#jellybeans#palette.visual_modified = g:airline#themes#jellybeans#palette.normal_modified
 
   " And of course, you can always do it manually as well.
   let s:IA = [ '#444444', '#1c1c1c', 237, 234 ]
-  let g:airline#themes#jellybeans#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+  let g:airline#themes#jellybeans#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 endfunction
 
 call s:generate()
diff --git a/autoload/airline/themes/laederon.vim b/autoload/airline/themes/laederon.vim
index 18d72ef5..d0131e1e 100644
--- a/autoload/airline/themes/laederon.vim
+++ b/autoload/airline/themes/laederon.vim
@@ -28,28 +28,30 @@ let s:file = [ '#ef393d' , '' , 196 , '' , '' ]
 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 = {
+let g:airline#themes#laederon#palette = {}
+
+let g:airline#themes#laederon#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#laederon#palette.normal_modified = {
       \ 'airline_a' : [ 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] , '' ] }
 
 
-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 = {
+let g:airline#themes#laederon#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#laederon#palette.insert_modified = {
       \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
-let g:airline#themes#laederon#insert_paste = {
+let g:airline#themes#laederon#palette.insert_paste = {
       \ 'airline_a' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] }
 
 
-let g:airline#themes#laederon#replace = copy(airline#themes#laederon#insert)
-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_modified = g:airline#themes#laederon#insert_modified
+let g:airline#themes#laederon#palette.replace = copy(airline#themes#laederon#palette.insert)
+let g:airline#themes#laederon#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#laederon#palette.replace_modified = g:airline#themes#laederon#palette.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 = {
+let g:airline#themes#laederon#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#laederon#palette.visual_modified = {
       \ 'airline_c' : [ 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)
+let g:airline#themes#laederon#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 
diff --git a/autoload/airline/themes/light.vim b/autoload/airline/themes/light.vim
index a1e7e985..c1aab40c 100644
--- a/autoload/airline/themes/light.vim
+++ b/autoload/airline/themes/light.vim
@@ -1,9 +1,11 @@
+let g:airline#themes#light#palette = {}
+
 let s:file = [ '#df0000' , '' , 160 , '' ]
 let s:N1 = [ '#ffffff' , '#005fff' , 255 , 27  ]
 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 = {
+let g:airline#themes#light#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#light#palette.normal_modified = {
       \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
       \ }
 
@@ -11,29 +13,29 @@ let g:airline#themes#light#normal_modified = {
 let s:I1 = [ '#ffffff' , '#00875f' , 255 , 29  ]
 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 = {
+let g:airline#themes#light#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#light#palette.insert_modified = {
       \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
       \ }
-let g:airline#themes#light#insert_paste = {
+let g:airline#themes#light#palette.insert_paste = {
       \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
       \ }
 
 
-let g:airline#themes#light#replace = copy(g:airline#themes#light#insert)
-let g:airline#themes#light#replace.airline_a = [ s:I2[0]   , '#ff0000' , s:I1[2] , 196     , ''     ]
-let g:airline#themes#light#replace_modified = g:airline#themes#light#insert_modified
+let g:airline#themes#light#palette.replace = copy(g:airline#themes#light#palette.insert)
+let g:airline#themes#light#palette.replace.airline_a = [ s:I2[0]   , '#ff0000' , s:I1[2] , 196     , ''     ]
+let g:airline#themes#light#palette.replace_modified = g:airline#themes#light#palette.insert_modified
 
 
 let s:V1 = [ '#ffffff' , '#ff5f00' , 255 , 202 ]
 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 = {
+let g:airline#themes#light#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#light#palette.visual_modified = {
       \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
       \ }
 
 
 let s:IA = [ '#9e9e9e' , '#ffffff' , 247 , 255 , '' ]
-let g:airline#themes#light#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#light#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 
diff --git a/autoload/airline/themes/luna.vim b/autoload/airline/themes/luna.vim
index a945d1a2..eb00e539 100644
--- a/autoload/airline/themes/luna.vim
+++ b/autoload/airline/themes/luna.vim
@@ -1,13 +1,15 @@
 " vim-airline companion theme of Luna
 " (https://github.com/Pychimp/vim-luna)
 
+let g:airline#themes#luna#palette = {}
 let s:file = [ '#ffffff' , '#002b2b' , 231 , 23 , '' ]
+
+
 let s:N1 = [ '#ffffff' , '#005252' , 231  , 36 ] 
 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 = {
+let g:airline#themes#luna#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#luna#palette.normal_modified = {
       \ 'airline_c': [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
       \ }
 
@@ -15,33 +17,33 @@ let g:airline#themes#luna#normal_modified = {
 let s:I1 = [ '#ffffff' , '#789f00' , 231  , 106  ] 
 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 = {
+let g:airline#themes#luna#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#luna#palette.insert_modified = {
       \ 'airline_c': [ '#ffffff' , '#005e5e' , 255     , 52      , ''     ] ,
       \ }
-let g:airline#themes#luna#insert_paste = {
+let g:airline#themes#luna#palette.insert_paste = {
       \ 'airline_a': [ s:I1[0]   , '#789f00' , s:I1[2] , 106     , ''     ] ,
       \ }
 
 
-let g:airline#themes#luna#replace = copy(g:airline#themes#luna#insert)
-let g:airline#themes#luna#replace.airline_a = [ s:I2[0]   , '#920000' , s:I2[2] , 88     , ''     ]
-let g:airline#themes#luna#replace_modified = g:airline#themes#luna#insert_modified
+let g:airline#themes#luna#palette.replace = copy(g:airline#themes#luna#palette.insert)
+let g:airline#themes#luna#palette.replace.airline_a = [ s:I2[0]   , '#920000' , s:I2[2] , 88     , ''     ]
+let g:airline#themes#luna#palette.replace_modified = g:airline#themes#luna#palette.insert_modified
 
 let s:V1 = [ '#ffff9a' , '#ff8036' , 222 , 208 ]
 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 = {
+let g:airline#themes#luna#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#luna#palette.visual_modified = {
       \ 'airline_c': [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
       \ }
 
 let s:IA = [ '#4e4e4e' , '#002b2b' , 59 , 23 , '' ]
-let g:airline#themes#luna#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#luna#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 
 
 if get(g:, 'loaded_ctrlp', 0)
-  let g:airline#themes#luna#ctrlp = airline#extensions#ctrlp#generate_color_map(
+  let g:airline#themes#luna#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
     \ [ '#ffffff' , '#002b2b' , 231 , 23 , ''     ] ,
     \ [ '#ffffff' , '#005252' , 231 , 36 , ''     ] ,
     \ [ '#ffffff' , '#973d45' , 231 , 95 , ''     ] )
diff --git a/autoload/airline/themes/molokai.vim b/autoload/airline/themes/molokai.vim
index 1fd480eb..02890acd 100644
--- a/autoload/airline/themes/molokai.vim
+++ b/autoload/airline/themes/molokai.vim
@@ -1,3 +1,6 @@
+let g:airline#themes#molokai#palette = {}
+
+
 let s:file = [ '#66d9ef' , '#465457' , 81 , 67 , 'bold' ]
 
 " Normal mode
@@ -5,8 +8,8 @@ let s:N1 = [ '#080808' , '#e6db74' , 232 , 144 ] " mode
 let s:N2 = [ '#f8f8f0' , '#232526' , 253 , 16  ] " info
 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 = {
+let g:airline#themes#molokai#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#molokai#palette.normal_modified = {
       \ 'airline_c': [ '#080808' , '#e6db74' , 232 , 144 , '' ] ,
       \ }
 
@@ -16,16 +19,16 @@ let s:I1 = [ '#080808' , '#66d9ef' , 232 , 81 ]
 let s:I2 = [ '#f8f8f0' , '#232526' , 253 , 16 ]
 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 = {
+let g:airline#themes#molokai#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#molokai#palette.insert_modified = {
       \ 'airline_c': [ '#080808' , '#66d9ef' , 232 , 81 , '' ] ,
       \ }
 
 
 " Replace mode
-let g:airline#themes#molokai#replace = copy(g:airline#themes#molokai#insert)
-let g:airline#themes#molokai#replace.airline_a = [ s:I1[0]   , '#ef5939' , s:I1[2] , 166     , ''     ]
-let g:airline#themes#molokai#replace_modified = {
+let g:airline#themes#molokai#palette.replace = copy(g:airline#themes#molokai#palette.insert)
+let g:airline#themes#molokai#palette.replace.airline_a = [ s:I1[0]   , '#ef5939' , s:I1[2] , 166     , ''     ]
+let g:airline#themes#molokai#palette.replace_modified = {
       \ 'airline_c': [ '#080808' , '#ef5939' , 232 , 166 , '' ] ,
       \ }
 
@@ -35,20 +38,20 @@ let s:V1 = [ '#080808' , '#fd971f' , 232 , 208 ]
 let s:V2 = [ '#f8f8f0' , '#232526' , 253 , 16  ]
 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 = {
+let g:airline#themes#molokai#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#molokai#palette.visual_modified = {
       \ 'airline_c': [ '#080808' , '#fd971f' , 232 , 208 , '' ] ,
       \ }
 
 
 " Inactive
 let s:IA = [ '#1b1d1e' , '#465457' , 233 , 67 , '' ]
-let g:airline#themes#molokai#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#molokai#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 
 
 " CtrlP
 if get(g:, 'loaded_ctrlp', 0)
-  let g:airline#themes#molokai#ctrlp = airline#extensions#ctrlp#generate_color_map(
+  let g:airline#themes#molokai#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
         \ [ '#f8f8f0' , '#465457' , 253 , 67  , ''     ] ,
         \ [ '#f8f8f0' , '#232526' , 253 , 16  , ''     ] ,
         \ [ '#080808' , '#e6db74' , 232 , 144 , 'bold' ] )
diff --git a/autoload/airline/themes/powerlineish.vim b/autoload/airline/themes/powerlineish.vim
index dcfc0a7c..de9d89f8 100644
--- a/autoload/airline/themes/powerlineish.vim
+++ b/autoload/airline/themes/powerlineish.vim
@@ -28,19 +28,21 @@ let s:RE = [ '#ffffff' , '#d70000' , 231 , 160 ] " white          & brightred
 
 let s:file = copy(s:N3)
 
-let g:airline#themes#powerlineish#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#powerlineish#palette = {}
 
-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 = {
+let g:airline#themes#powerlineish#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+
+let g:airline#themes#powerlineish#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#powerlineish#palette.insert_replace = {
       \ 'airline_a': [ s:RE[0]   , s:I1[1]   , s:RE[1]   , s:I1[3]   , ''     ] }
 
-let g:airline#themes#powerlineish#visual = {
+let g:airline#themes#powerlineish#palette.visual = {
       \ 'airline_a': [ s:V1[0]   , s:V1[1]   , s:V1[2]   , s:V1[3]   , ''     ] }
 
-let g:airline#themes#powerlineish#replace = copy(airline#themes#powerlineish#normal)
-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#palette.replace = copy(airline#themes#powerlineish#palette.normal)
+let g:airline#themes#powerlineish#palette.replace.airline_a = [ s:RE[0] , s:RE[1] , s:RE[2] , s:RE[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)
+let g:airline#themes#powerlineish#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 
diff --git a/autoload/airline/themes/simple.vim b/autoload/airline/themes/simple.vim
index 555b4c4a..0234d192 100644
--- a/autoload/airline/themes/simple.vim
+++ b/autoload/airline/themes/simple.vim
@@ -1,3 +1,5 @@
+let g:airline#themes#simple#palette = {}
+
 let s:guibg = '#080808'
 let s:guibg2 = '#1c1c1c'
 let s:termbg = 232
@@ -7,8 +9,8 @@ let s:file = [ '#ff0000' , '' , 160 , '' , '' ]
 let s:N1 = [ s:guibg , '#00dfff' , s:termbg , 45 ]
 let s:N2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
 let s:N3 = [ '#767676' , s:guibg, 243 , s:termbg]
-let g:airline#themes#simple#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
-let g:airline#themes#simple#normal_modified = {
+let g:airline#themes#simple#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#simple#palette.normal_modified = {
       \ 'airline_c': [ '#df0000' , s:guibg, 160     , s:termbg    , ''     ] ,
       \ }
 
@@ -16,26 +18,26 @@ let g:airline#themes#simple#normal_modified = {
 let s:I1 = [ s:guibg, '#5fff00' , s:termbg , 82 ]
 let s:I2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
 let s:I3 = [ '#767676' , s:guibg, 243 , s:termbg ]
-let g:airline#themes#simple#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
-let g:airline#themes#simple#insert_modified = copy(g:airline#themes#simple#normal_modified)
-let g:airline#themes#simple#insert_paste = {
+let g:airline#themes#simple#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#simple#palette.insert_modified = copy(g:airline#themes#simple#palette.normal_modified)
+let g:airline#themes#simple#palette.insert_paste = {
       \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
       \ }
 
 
-let g:airline#themes#simple#replace = {
+let g:airline#themes#simple#palette.replace = {
       \ 'airline_a': [ s:I1[0]   , '#af0000' , s:I1[2] , 124     , ''     ] ,
       \ }
-let g:airline#themes#simple#replace_modified = copy(g:airline#themes#simple#normal_modified)
+let g:airline#themes#simple#palette.replace_modified = copy(g:airline#themes#simple#palette.normal_modified)
 
 
 let s:V1 = [ s:guibg, '#dfdf00' , s:termbg , 184 ]
 let s:V2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
 let s:V3 = [ '#767676' , s:guibg, 243 , s:termbg ]
-let g:airline#themes#simple#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
-let g:airline#themes#simple#visual_modified = copy(g:airline#themes#simple#normal_modified)
+let g:airline#themes#simple#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#simple#palette.visual_modified = copy(g:airline#themes#simple#palette.normal_modified)
 
 
 let s:IA = [ '#4e4e4e' , s:guibg , 239 , s:termbg , '' ]
-let g:airline#themes#simple#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#simple#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 
diff --git a/autoload/airline/themes/solarized.vim b/autoload/airline/themes/solarized.vim
index ca331c02..8fae45a2 100644
--- a/autoload/airline/themes/solarized.vim
+++ b/autoload/airline/themes/solarized.vim
@@ -1,3 +1,5 @@
+let g:airline#themes#solarized#palette = {}
+
 function! s:generate()
   """"""""""""""""""""""""""""""""""""""""""""""""
   " Options
@@ -101,39 +103,39 @@ function! s:generate()
   let s:IFa = [s:IF[0].g, s:IF[1].g, s:IF[0].t, s:IF[1].t, s:IF[2]]
   let s:VFa = [s:VF[0].g, s:VF[1].g, s:VF[0].t, s:VF[1].t, s:VF[2]]
 
-  let g:airline#themes#solarized#inactive = airline#themes#generate_color_map(
+  let g:airline#themes#solarized#palette.inactive = airline#themes#generate_color_map(
         \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]],
         \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]],
         \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]],
         \ s:NFa)
 
-  let g:airline#themes#solarized#normal = airline#themes#generate_color_map(
+  let g:airline#themes#solarized#palette.normal = airline#themes#generate_color_map(
         \ [s:N1[0].g, s:N1[1].g, s:N1[0].t, s:N1[1].t, s:N1[2]],
         \ [s:N2[0].g, s:N2[1].g, s:N2[0].t, s:N2[1].t, s:N2[2]],
         \ [s:N3[0].g, s:N3[1].g, s:N3[0].t, s:N3[1].t, s:N3[2]],
         \ s:NFa)
 
-  let g:airline#themes#solarized#normal_modified = {
+  let g:airline#themes#solarized#palette.normal_modified = {
         \ 'airline_c': [s:NM[0].g, s:NM[1].g,
         \ s:NM[0].t, s:NM[1].t, s:NM[2]]}
 
-  let g:airline#themes#solarized#insert = airline#themes#generate_color_map(
+  let g:airline#themes#solarized#palette.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]],
         \ [s:I2[0].g, s:I2[1].g, s:I2[0].t, s:I2[1].t, s:I2[2]],
         \ [s:I3[0].g, s:I3[1].g, s:I3[0].t, s:I3[1].t, s:I3[2]],
         \ s:IFa)
 
-  let g:airline#themes#solarized#insert_modified = {
+  let g:airline#themes#solarized#palette.insert_modified = {
         \ 'airline_c': [s:IM[0].g, s:IM[1].g,
         \ s:IM[0].t, s:IM[1].t, s:IM[2]]}
 
-  let g:airline#themes#solarized#visual = airline#themes#generate_color_map(
+  let g:airline#themes#solarized#palette.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]],
         \ [s:V2[0].g, s:V2[1].g, s:V2[0].t, s:V2[1].t, s:V2[2]],
         \ [s:V3[0].g, s:V3[1].g, s:V3[0].t, s:V3[1].t, s:V3[2]],
         \ s:VFa)
 
-  let g:airline#themes#solarized#visual_modified = {
+  let g:airline#themes#solarized#palette.visual_modified = {
         \ 'airline_c': [s:VM[0].g, s:VM[1].g,
         \ s:VM[0].t, s:VM[1].t, s:VM[2]]}
 endfunction
diff --git a/autoload/airline/themes/tomorrow.vim b/autoload/airline/themes/tomorrow.vim
index 88c38383..c36478e3 100644
--- a/autoload/airline/themes/tomorrow.vim
+++ b/autoload/airline/themes/tomorrow.vim
@@ -1,3 +1,5 @@
+let g:airline#themes#tomorrow#palette = {}
+
 function! s:generate()
   let s:file = airline#themes#get_highlight('Constant')
   " clear out backgrounds so generate_color_map will fill them in
@@ -7,33 +9,33 @@ function! s:generate()
   let s:N1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Directory', 'fg'], 'bold')
   let s:N2 = airline#themes#get_highlight('Pmenu')
   let s:N3 = airline#themes#get_highlight('CursorLine')
-  let g:airline#themes#tomorrow#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+  let g:airline#themes#tomorrow#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
 
   let group = airline#themes#get_highlight('vimCommand')
-  let g:airline#themes#tomorrow#normal_modified = {
+  let g:airline#themes#tomorrow#palette.normal_modified = {
         \ 'airline_c': [ group[0], '', group[2], '', '' ]
         \ }
 
   let s:I1 = airline#themes#get_highlight2(['Normal', 'bg'], ['MoreMsg', 'fg'], 'bold')
   let s:I2 = airline#themes#get_highlight2(['MoreMsg', 'fg'], ['Normal', 'bg'])
   let s:I3 = s:N3
-  let g:airline#themes#tomorrow#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
-  let g:airline#themes#tomorrow#insert_modified = g:airline#themes#tomorrow#normal_modified
+  let g:airline#themes#tomorrow#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+  let g:airline#themes#tomorrow#palette.insert_modified = g:airline#themes#tomorrow#palette.normal_modified
 
   let s:R1 = airline#themes#get_highlight('Error', 'bold')
   let s:R2 = s:N2
   let s:R3 = s:N3
-  let g:airline#themes#tomorrow#replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3, s:file)
-  let g:airline#themes#tomorrow#replace_modified = g:airline#themes#tomorrow#normal_modified
+  let g:airline#themes#tomorrow#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3, s:file)
+  let g:airline#themes#tomorrow#palette.replace_modified = g:airline#themes#tomorrow#palette.normal_modified
 
   let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Constant', 'fg'], 'bold')
   let s:V2 = airline#themes#get_highlight2(['Constant', 'fg'], ['Normal', 'bg'])
   let s:V3 = s:N3
-  let g:airline#themes#tomorrow#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
-  let g:airline#themes#tomorrow#visual_modified = g:airline#themes#tomorrow#normal_modified
+  let g:airline#themes#tomorrow#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+  let g:airline#themes#tomorrow#palette.visual_modified = g:airline#themes#tomorrow#palette.normal_modified
 
   let s:IA = airline#themes#get_highlight2(['NonText', 'fg'], ['CursorLine', 'bg'])
-  let g:airline#themes#tomorrow#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+  let g:airline#themes#tomorrow#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 endfunction
 
 call s:generate()
diff --git a/autoload/airline/themes/ubaryd.vim b/autoload/airline/themes/ubaryd.vim
index 8b305532..4cc5dca9 100644
--- a/autoload/airline/themes/ubaryd.vim
+++ b/autoload/airline/themes/ubaryd.vim
@@ -27,30 +27,32 @@ 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 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 = {
-      \ 'airline_a' : [ 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] , '' ] }
-let g:airline#themes#ubaryd#inactive = {
+let g:airline#themes#ubaryd#palette = {}
+let g:airline#themes#ubaryd#palette.inactive = {
       \ '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 = {
+let g:airline#themes#ubaryd#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#ubaryd#palette.normal_modified = {
+      \ 'airline_a' : [ 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] , '' ] }
+
+
+let g:airline#themes#ubaryd#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#ubaryd#palette.insert_modified = {
       \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
-let g:airline#themes#ubaryd#insert_paste = {
+let g:airline#themes#ubaryd#palette.insert_paste = {
       \ 'airline_a' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] }
 
 
-let g:airline#themes#ubaryd#replace = copy(airline#themes#ubaryd#insert)
-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_modified = g:airline#themes#ubaryd#insert_modified
+let g:airline#themes#ubaryd#palette.replace = copy(airline#themes#ubaryd#palette.insert)
+let g:airline#themes#ubaryd#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#ubaryd#palette.replace_modified = g:airline#themes#ubaryd#palette.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 = {
+let g:airline#themes#ubaryd#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#ubaryd#palette.visual_modified = {
       \ 'airline_c' : [ 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)
+let g:airline#themes#ubaryd#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 
diff --git a/autoload/airline/themes/wombat.vim b/autoload/airline/themes/wombat.vim
index 14365c34..8565f2e7 100644
--- a/autoload/airline/themes/wombat.vim
+++ b/autoload/airline/themes/wombat.vim
@@ -39,45 +39,48 @@ let s:file = [ '#E5786D' , '' , 203 , '' , '' ]
 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 = {
+let g:airline#themes#wombat#palette = {}
+
+
+let g:airline#themes#wombat#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#wombat#palette.normal_modified = {
     \ 'airline_a': [ s:N1[0] , s:N4[0] , s:N1[2] , s:N4[1] , ''     ] ,
     \ 'airline_b': [ 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] , ''     ] }
 
 
-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 = {
+let g:airline#themes#wombat#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#wombat#palette.insert_modified = {
     \ 'airline_a': [ s:I1[0] , s:I4[0] , s:I1[2] , s:I4[1] , ''     ] ,
     \ 'airline_b': [ 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] , ''     ] }
 
 
-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 = {
+let g:airline#themes#wombat#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#wombat#palette.visual_modified = {
     \ 'airline_a': [ s:V1[0] , s:V4[0] , s:V1[2] , s:V4[1] , ''     ] ,
     \ 'airline_b': [ 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] , ''     ] }
 
 
-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 = {
+let g:airline#themes#wombat#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3, s:file)
+let g:airline#themes#wombat#palette.replace_modified = {
     \ 'airline_a': [ s:R1[0] , s:R4[0] , s:R1[2] , s:R4[1] , ''     ] ,
     \ 'airline_b': [ 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] , ''     ] }
 
 
-let g:airline#themes#wombat#insert_paste = {
+let g:airline#themes#wombat#palette.insert_paste = {
     \ 'airline_a': [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , ''     ] ,
     \ 'airline_b': [ 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] , ''     ] }
 
 
-let g:airline#themes#wombat#inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#wombat#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
 
 
 if get(g:, 'loaded_ctrlp', 0)
-  let g:airline#themes#wombat#ctrlp = airline#extensions#ctrlp#generate_color_map(
+  let g:airline#themes#wombat#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
         \ [ '#DADADA' , '#242424' , 253 , 234 , ''     ] ,
         \ [ '#DADADA' , '#40403C' , 253 , 238 , ''     ] ,
         \ [ '#141413' , '#DADADA' , 232 , 253 , 'bold' ] )