diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 236bfdf..49de162 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -50,7 +50,7 @@ function M._load(options)
 	h('NormalFloat', { fg = p.text, bg = maybe.surface })
 	h('NormalNC', { fg = p.text, bg = maybe.dim_nc_background })
 	h('NvimInternalError', { fg = '#ffffff', bg = p.love })
-	h('Pmenu', { fg = p.subtle, bg = maybe.surface })
+	h('Pmenu', { fg = p.subtle, bg = p.surface })
 	h('PmenuSbar', { bg = p.highlight_low })
 	h('PmenuSel', { fg = p.text, bg = p.overlay })
 	h('PmenuThumb', { bg = p.highlight_med })
@@ -67,12 +67,12 @@ function M._load(options)
 	h('SpellLocal', { sp = p.subtle, undercurl = true })
 	h('SpellRare', { sp = p.subtle, undercurl = true })
 	h('SignColumn', { fg = p.text, bg = maybe.base })
-	h('StatusLine', { fg = p.subtle, bg = maybe.surface })
+	h('StatusLine', { fg = p.subtle, bg = p.surface })
 	h('StatusLineNC', { fg = p.muted, bg = maybe.base })
 	h('StatusLineTerm', { link = 'StatusLine' })
 	h('StatusLineTermNC', { link = 'StatusLineNC' })
-	h('TabLine', { fg = p.subtle, bg = maybe.surface })
-	h('TabLineFill', { bg = maybe.surface })
+	h('TabLine', { fg = p.subtle, bg = p.surface })
+	h('TabLineFill', { bg = p.surface })
 	h('TabLineSel', { fg = p.text, bg = p.overlay })
 	h('Title', { fg = p.text })
 	h('VertSplit', { fg = groups.border, bg = maybe.bold_vert_split })
@@ -177,10 +177,10 @@ function M._load(options)
 	h('DiagnosticSignHint', { fg = groups.hint })
 	h('DiagnosticSignInfo', { fg = groups.info })
 	h('DiagnosticSignWarn', { fg = groups.warn })
-	h('DiagnosticStatusLineError', { fg = groups.error, bg = maybe.surface })
-	h('DiagnosticStatusLineHint', { fg = groups.hint, bg = maybe.surface })
-	h('DiagnosticStatusLineInfo', { fg = groups.info, bg = maybe.surface })
-	h('DiagnosticStatusLineWarn', { fg = groups.warn, bg = maybe.surface })
+	h('DiagnosticStatusLineError', { fg = groups.error, bg = p.surface })
+	h('DiagnosticStatusLineHint', { fg = groups.hint, bg = p.surface })
+	h('DiagnosticStatusLineInfo', { fg = groups.info, bg = p.surface })
+	h('DiagnosticStatusLineWarn', { fg = groups.warn, bg = p.surface })
 	h('DiagnosticUnderlineError', { sp = groups.error, undercurl = true })
 	h('DiagnosticUnderlineHint', { sp = groups.hint, undercurl = true })
 	h('DiagnosticUnderlineInfo', { sp = groups.info, undercurl = true })