diff --git a/autoload/airline/themes/base16_tomorrow.vim b/autoload/airline/themes/base16_tomorrow.vim
index f8128bc..c35a450 100644
--- a/autoload/airline/themes/base16_tomorrow.vim
+++ b/autoload/airline/themes/base16_tomorrow.vim
@@ -19,21 +19,30 @@ let s:gui0E = "#b294bb"
 let s:gui0F = "#a3685a"
 
 let s:cterm00 = 0
-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:cterm03 = 8
+let s:cterm05 = 7
 let s:cterm07 = 15
-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:cterm08 = 1
+let s:cterm0A = 3
+let s:cterm0B = 2
+let s:cterm0C = 6
+let s:cterm0D = 4
+let s:cterm0E = 5
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = 18
+  let s:cterm02 = 19
+  let s:cterm04 = 20
+  let s:cterm06 = 21
+  let s:cterm09 = 16
+  let s:cterm0F = 17
+else
+  let s:cterm01 = 10
+  let s:cterm02 = 11
+  let s:cterm04 = 12
+  let s:cterm06 = 13
+  let s:cterm09 = 9
+  let s:cterm0F = 14
+endif
 
 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/doc/airline-themes.txt b/doc/airline-themes.txt
index 2215dc4..4379171 100644
--- a/doc/airline-themes.txt
+++ b/doc/airline-themes.txt
@@ -64,7 +64,7 @@ Currently this repository contains the following themes:
     * base16_mocha
     * base16_monokai
     * base16_ocean
-    * base16_oceanicnext
+    * base16_oceanicnext (|airline-theme-base16-oceanicnext|)
     * base16_paraiso
     * base16_pop
     * base16_railscasts
@@ -73,7 +73,7 @@ Currently this repository contains the following themes:
     * base16_solarized
     * base16_spacemacs
     * base16_summerfruit
-    * base16_tomorrow
+    * base16_tomorrow (|airline-theme-base16_tomorrow|)
     * base16_twilight
     * base16color
     * behelit
@@ -201,19 +201,22 @@ colors in the terminal: (https://github.com/chriskempson/base16-shell). The
 colors used in this theme are within the 21 term colors set by Base16 Shell.
 The theme supports 2 options described below.
 
-*g:airline_base16_oceanicnext*
-
-Allow 256 color use of the base16_oceanicnext theme. Without this setting
-base16_oceanicnext may look incorrect in 256 color mode. To enable it: >
-
-    let base16colorspace = 256
-
 *g:airline_base16_solarized*
 
 Adjusts the colors to match base16_solarized shell theme. You may also try to
 use it with other Base16 Shell themes. To enable it: >
 
     let g:airline_base16_solarized = 1
+<
+                                                 *airline-theme-base16-tomorrow*
+                                                *airline-theme-base16-oceanicnext*
+
+base16 theme for vim-airline matches your active Base16 colorscheme.
+
+Allow 256 color use of the base16 theme. Without this setting
+the theme may look incorrect in 256 color mode. To enable it: >
+
+    let base16colorspace = 256
 <
                                                        *airline-theme-onedark*