diff --git a/colors/solarized8_dark_flat.vim b/colors/solarized8_dark_flat.vim
index f741b7a..7191cfc 100644
--- a/colors/solarized8_dark_flat.vim
+++ b/colors/solarized8_dark_flat.vim
@@ -85,10 +85,10 @@ hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE cte
 hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#6c71c4
 hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#2aa198
 hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#b58900
-hi! Pmenu ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
+hi! Pmenu ctermfg=0 guifg=#073642 ctermbg=12 guibg=#839496 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSel ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
-hi! PmenuSbar ctermfg=7 guifg=#eee8d5 ctermbg=12 guibg=#839496 cterm=NONE,reverse gui=NONE,reverse
-hi! PmenuThumb ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse
+hi! PmenuSbar ctermfg=0 guifg=#073642 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse
+hi! PmenuThumb ctermfg=11 guifg=#657b83 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse
 hi! TabLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#839496 cterm=NONE gui=NONE
 hi! TabLineFill ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#839496 cterm=NONE gui=NONE
 hi! TabLineSel ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 guisp=#839496 cterm=NONE,reverse gui=NONE,reverse
diff --git a/colors/solarized8_light_flat.vim b/colors/solarized8_light_flat.vim
index b0a128c..04c8cae 100644
--- a/colors/solarized8_light_flat.vim
+++ b/colors/solarized8_light_flat.vim
@@ -85,10 +85,10 @@ hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE cte
 hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#6c71c4
 hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#2aa198
 hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#b58900
-hi! Pmenu ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
+hi! Pmenu ctermfg=7 guifg=#eee8d5 ctermbg=11 guibg=#657b83 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSel ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
-hi! PmenuSbar ctermfg=0 guifg=#073642 ctermbg=11 guibg=#657b83 cterm=NONE,reverse gui=NONE,reverse
-hi! PmenuThumb ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
+hi! PmenuSbar ctermfg=7 guifg=#eee8d5 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
+hi! PmenuThumb ctermfg=12 guifg=#839496 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
 hi! TabLine ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#657b83 cterm=NONE gui=NONE
 hi! TabLineFill ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#657b83 cterm=NONE gui=NONE
 hi! TabLineSel ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 guisp=#657b83 cterm=NONE,reverse gui=NONE,reverse
diff --git a/src/solarized8.vim b/src/solarized8.vim
index 4ae22e3..1225482 100644
--- a/src/solarized8.vim
+++ b/src/solarized8.vim
@@ -343,10 +343,17 @@ for s:solarized_background in ["dark", "light"]
     call s:put("hi! SpellCap"       .s:fmt_curl   .s:fg_none   .s:bg_none    .s:sp_violet)
     call s:put("hi! SpellRare"      .s:fmt_curl   .s:fg_none   .s:bg_none    .s:sp_cyan)
     call s:put("hi! SpellLocal"     .s:fmt_curl   .s:fg_none   .s:bg_none    .s:sp_yellow)
-    call s:put("hi! Pmenu"          .s:fg_base0  .s:bg_base02  .s:fmt_revbb)
-    call s:put("hi! PmenuSel"       .s:fg_base01 .s:bg_base2   .s:fmt_revbb)
-    call s:put("hi! PmenuSbar"      .s:fg_base2  .s:bg_base0   .s:fmt_revbb)
-    call s:put("hi! PmenuThumb"     .s:fg_base0  .s:bg_base03  .s:fmt_revbb)
+    if s:solarized_contrast == "flat"
+      call s:put("hi! Pmenu"          .s:fg_base02 .s:bg_base0   .s:fmt_revbb)
+      call s:put("hi! PmenuSel"       .s:fg_base01 .s:bg_base2   .s:fmt_revbb)
+      call s:put("hi! PmenuSbar"      .s:fg_base02 .s:bg_base01  .s:fmt_revbb)
+      call s:put("hi! PmenuThumb"     .s:fg_base00 .s:bg_base03  .s:fmt_revbb)
+    else
+      call s:put("hi! Pmenu"          .s:fg_base0  .s:bg_base02  .s:fmt_revbb)
+      call s:put("hi! PmenuSel"       .s:fg_base01 .s:bg_base2   .s:fmt_revbb)
+      call s:put("hi! PmenuSbar"      .s:fg_base2  .s:bg_base0   .s:fmt_revbb)
+      call s:put("hi! PmenuThumb"     .s:fg_base0  .s:bg_base03  .s:fmt_revbb)
+    endif
     call s:put("hi! TabLine"        .s:fg_base0  .s:bg_base02  .s:sp_base0 .s:fmt_none)
     call s:put("hi! TabLineFill"    .s:fg_base0  .s:bg_base02  .s:sp_base0 .s:fmt_none)
     call s:put("hi! TabLineSel"     .s:fg_base01 .s:bg_base2   .s:sp_base0  .s:fmt_revbbu)