diff --git a/lua/rose-pine/init.lua b/lua/rose-pine/init.lua
index af5bae4..364952c 100644
--- a/lua/rose-pine/init.lua
+++ b/lua/rose-pine/init.lua
@@ -103,6 +103,8 @@ local config = {
 	disable_italics = false,
 
 	groups = {
+		background = 'base',
+		panel = 'surface',
 		border = 'highlight_med',
 		comment = 'muted',
 		link = 'iris',
diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 33df757..d0da065 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -10,10 +10,10 @@ function M.get(config)
 	local styles = {
 		italic = (config.disable_italics and p.none) or 'italic',
 		vert_split = (config.bold_vert_split and groups.border) or p.none,
-		background = (config.disable_background and p.none) or p.base,
-		float_background = (config.disable_float_background and p.none) or p.surface,
+		background = (config.disable_background and p.none) or groups.background,
+		float_background = (config.disable_float_background and p.none) or groups.panel,
 	}
-	styles.nc_background = (config.dim_nc_background and p.surface) or styles.background
+	styles.nc_background = (config.dim_nc_background and groups.panel) or styles.background
 
 	theme = {
 		ColorColumn = { bg = p.highlight_high },
@@ -23,12 +23,12 @@ function M.get(config)
 		-- CursorIM = {},
 		CursorLine = { bg = p.highlight_low },
 		CursorLineNr = { fg = p.text },
-		DarkenedPanel = { bg = p.surface },
-		DarkenedStatusline = { bg = p.surface },
-		DiffAdd = { bg = blend(groups.git_add, p.base, 0.5) },
+		DarkenedPanel = { bg = groups.panel },
+		DarkenedStatusline = { bg = groups.panel },
+		DiffAdd = { bg = blend(groups.git_add, groups.background, 0.5) },
 		DiffChange = { bg = p.overlay },
-		DiffDelete = { bg = blend(groups.git_delete, p.base, 0.5) },
-		DiffText = { bg = blend(groups.git_text, p.base, 0.5) },
+		DiffDelete = { bg = blend(groups.git_delete, groups.background, 0.5) },
+		DiffText = { bg = blend(groups.git_text, groups.background, 0.5) },
 		diffAdded = { link = 'DiffAdd' },
 		diffChanged = { link = 'DiffChange' },
 		diffRemoved = { link = 'DiffDelete' },
@@ -37,7 +37,7 @@ function M.get(config)
 		ErrorMsg = { fg = p.love, style = 'bold' },
 		FloatBorder = { fg = groups.border },
 		FoldColumn = { fg = p.muted },
-		Folded = { fg = p.text, bg = p.surface },
+		Folded = { fg = p.text, bg = groups.panel },
 		IncSearch = { fg = p.base, bg = p.rose },
 		LineNr = { fg = p.muted },
 		MatchParen = { fg = p.text, bg = p.highlight_med },
@@ -175,10 +175,10 @@ function M.get(config)
 		DiagnosticSignHint = { fg = groups.hint },
 		DiagnosticSignInfo = { fg = groups.info },
 		DiagnosticSignWarn = { fg = groups.warn },
-		DiagnosticStatusLineError = { fg = groups.error, bg = p.surface },
-		DiagnosticStatusLineHint = { fg = groups.hint, bg = p.surface },
-		DiagnosticStatusLineInfo = { fg = groups.info, bg = p.surface },
-		DiagnosticStatusLineWarn = { fg = groups.warn, bg = p.surface },
+		DiagnosticStatusLineError = { fg = groups.error, bg = groups.panel },
+		DiagnosticStatusLineHint = { fg = groups.hint, bg = groups.panel },
+		DiagnosticStatusLineInfo = { fg = groups.info, bg = groups.panel },
+		DiagnosticStatusLineWarn = { fg = groups.warn, bg = groups.panel },
 		DiagnosticUnderlineError = { sp = groups.error, style = 'undercurl' },
 		DiagnosticUnderlineHint = { sp = groups.hint, style = 'undercurl' },
 		DiagnosticUnderlineInfo = { sp = groups.info, style = 'undercurl' },
@@ -251,7 +251,7 @@ function M.get(config)
 		BufferInactiveMod = { fg = p.foam },
 		BufferInactiveSign = { fg = p.muted },
 		BufferInactiveTarget = { fg = p.gold },
-		BufferTabpageFill = { fg = p.base, bg = p.base },
+		BufferTabpageFill = { fg = groups.background, bg = groups.background },
 		BufferVisible = { fg = p.subtle },
 		BufferVisibleIndex = { fg = p.subtle },
 		BufferVisibleMod = { fg = p.foam },
@@ -295,14 +295,14 @@ function M.get(config)
 		NvimTreeOpenedFolderName = { fg = p.foam },
 		NvimTreeRootFolder = { fg = p.iris },
 		NvimTreeSpecialFile = { link = 'NvimTreeNormal' },
-		NvimTreeWindowPicker = { fg = p.base, bg = p.iris },
+		NvimTreeWindowPicker = { fg = groups.background, bg = p.iris },
 
 		-- folke/which-key.nvim
 		WhichKey = { fg = p.iris },
 		WhichKeyGroup = { fg = p.foam },
 		WhichKeySeparator = { fg = p.subtle },
 		WhichKeyDesc = { fg = p.gold },
-		WhichKeyFloat = { bg = p.surface },
+		WhichKeyFloat = { bg = groups.panel },
 		WhichKeyValue = { fg = p.rose },
 
 		-- luka-reineke/indent-blankline.nvim
@@ -361,7 +361,7 @@ function M.get(config)
 		DefinitionIcon = { fg = p.rose },
 		DefintionPreviewTitle = { fg = p.rose, style = 'bold' },
 		LspFloatWinBorder = { fg = groups.border },
-		LspFloatWinNormal = { bg = p.base },
+		LspFloatWinNormal = { bg = groups.background },
 		LspSagaAutoPreview = { fg = p.subtle },
 		LspSagaCodeActionBorder = { fg = groups.border },
 		LspSagaCodeActionContent = { fg = p.foam },