From 73c5046bf3dab3353490fbb9796342a75157f72e Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Mon, 7 Feb 2022 12:12:17 -0600
Subject: [PATCH 001/190] docs: update tag

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index bd14ad4..c9f8619 100644
--- a/readme.md
+++ b/readme.md
@@ -17,7 +17,7 @@
 use({
     'rose-pine/neovim',
     as = 'rose-pine',
-    -- tag = '...',
+    tag = '0.5.0',
     config = function()
         vim.cmd('colorscheme rose-pine')
     end

From acee7a0b0936b93c72d861239ab66f6f3604a44b Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Tue, 8 Feb 2022 08:58:53 -0600
Subject: [PATCH 002/190] reduce contrast of cursorline and cursorcolumn

closes #65
---
 lua/rose-pine/theme.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 0c9e423..36d393a 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -33,9 +33,9 @@ local theme = {
 	ColorColumn = { bg = palette.highlight_high },
 	Conceal = { bg = palette.none },
 	-- Cursor = {},
-	CursorColumn = { bg = palette.overlay },
+	CursorColumn = { bg = palette.highlight_low },
 	-- CursorIM = {},
-	CursorLine = { bg = palette.overlay },
+	CursorLine = { bg = palette.highlight_low },
 	CursorLineNr = { fg = palette.text },
 	DarkenedPanel = { bg = palette.surface },
 	DarkenedStatusline = { bg = palette.surface },

From 0e23ee652d7b5430e06c288faae3cc16d3b36d06 Mon Sep 17 00:00:00 2001
From: Daniel Mathiot <d.danymat@gmail.com>
Date: Tue, 8 Feb 2022 19:47:47 +0100
Subject: [PATCH 003/190] feat: Add nvim-notify highlights (#66)

---
 lua/rose-pine/theme.lua | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 36d393a..4a2aafa 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -438,6 +438,23 @@ local theme = {
 	TelescopeSelection = { fg = palette.text, bg = palette.overlay },
 	TelescopeSelectionCaret = { fg = palette.rose, bg = palette.overlay },
 	TelescopeTitle = { fg = palette.subtle },
+
+	-- rcarriga/nvim-notify
+	NotifyINFOBorder = { fg = palette.foam },
+	NotifyINFOTitle = { link = 'NotifyINFOBorder' },
+	NotifyINFOIcon = { link = 'NotifyINFOBorder' },
+	NotifyWARNBorder = { fg = palette.gold },
+	NotifyWARNTitle = { link = 'NotifyWARNBorder' },
+	NotifyWARNIcon = { link = 'NotifyWARNBorder' },
+	NotifyDEBUGBorder = { fg = palette.muted },
+	NotifyDEBUGTitle = { link = 'NotifyDEBUGBorder' },
+	NotifyDEBUGIcon = { link = 'NotifyDEBUGBorder' },
+	NotifyTRACEBorder = { fg = palette.iris },
+	NotifyTRACETitle = { link = 'NotifyTRACEBorder' },
+	NotifyTRACEIcon = { link = 'NotifyTRACEBorder' },
+	NotifyERRORBorder = { fg = palette.love },
+	NotifyERRORTitle = { link = 'NotifyERRORBorder' },
+	NotifyERRORIcon = { link = 'NotifyERRORBorder' },
 }
 
 vim.g.terminal_color_0 = palette.overlay -- black

From 6cbc72a75dd8a50382ac63fe8fb0734772d92cee Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Thu, 10 Feb 2022 10:31:12 -0600
Subject: [PATCH 004/190] Update readme.md

---
 readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readme.md b/readme.md
index c9f8619..9de2413 100644
--- a/readme.md
+++ b/readme.md
@@ -41,6 +41,7 @@ use({
 - [lspsaga.nvim](https://github.com/tami5/lspsaga.nvim)
 - [pounce.nvim](https://github.com/rlane/pounce.nvim)
 - [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim)
+- [nvim-notify](https://github.com/rcarriga/nvim-notify)
 - [lualine.nvim](https://github.com/nvim-lualine/lualine.nvim)
 
 ```lua

From c207a62f52f7af096aa3fe00a751ed5869ed6a62 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Thu, 10 Feb 2022 16:04:33 -0600
Subject: [PATCH 005/190] Update readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 9de2413..db9452a 100644
--- a/readme.md
+++ b/readme.md
@@ -17,7 +17,7 @@
 use({
     'rose-pine/neovim',
     as = 'rose-pine',
-    tag = '0.5.0',
+    tag = 'v0.*',
     config = function()
         vim.cmd('colorscheme rose-pine')
     end

From 317a7c8473c16ced00a876c3742635975a71a1c9 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sun, 13 Feb 2022 16:06:19 -0600
Subject: [PATCH 006/190] breaking: move to lua config (#64)

Co-authored-by: fvrests <fvrests@icloud.com>
---
 colors/rose-pine.vim               |   3 -
 lua/rose-pine/bufferline/init.lua  |  23 -
 lua/rose-pine/config.lua           |  74 ---
 lua/rose-pine/galaxyline/theme.lua |  22 +-
 lua/rose-pine/init.lua             | 204 +++++--
 lua/rose-pine/palette.lua          |   8 +-
 lua/rose-pine/theme.lua            | 896 ++++++++++++++---------------
 readme.md                          |  91 ++-
 8 files changed, 643 insertions(+), 678 deletions(-)
 delete mode 100644 lua/rose-pine/bufferline/init.lua
 delete mode 100644 lua/rose-pine/config.lua

diff --git a/colors/rose-pine.vim b/colors/rose-pine.vim
index af1ddba..0df6221 100644
--- a/colors/rose-pine.vim
+++ b/colors/rose-pine.vim
@@ -1,6 +1,3 @@
-lua package.loaded['rose-pine'] = nil
-lua package.loaded['rose-pine.config'] = nil
 lua package.loaded['rose-pine.palette'] = nil
-lua package.loaded['rose-pine.theme'] = nil
 
 lua require('rose-pine').colorscheme()
diff --git a/lua/rose-pine/bufferline/init.lua b/lua/rose-pine/bufferline/init.lua
deleted file mode 100644
index 3ae77b4..0000000
--- a/lua/rose-pine/bufferline/init.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-local p = require('rose-pine.palette')
-
--- TODO: Someone who uses bufferline.nvim is free to PR with this addition
---       `:h bufferline-highlights`
---
---       The intended use would be (or any better solution):
---
---       ```
---       local highlights = require('rose-pine.bufferline')
---       require('bufferline').setup({
---         highlights = highlights
---       })
---       ```
-return {
-	fill = {
-		guifg = p.text,
-		guibg = p.base,
-	},
-	background = {
-		guifg = p.text,
-		guibg = p.base,
-	},
-}
diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
deleted file mode 100644
index 6b3ac12..0000000
--- a/lua/rose-pine/config.lua
+++ /dev/null
@@ -1,74 +0,0 @@
-local palette = require('rose-pine.palette')
-
-local function opt(key, default)
-	key = 'rose_pine_' .. key
-
-	if vim.g[key] == nil then
-		return default
-	end
-
-	if vim.g[key] == 0 or vim.g[key] == false then
-		return false
-	end
-
-	return vim.g[key]
-end
-
-local config = {
-	variant = opt('variant', 'main'),
-
-	bold_vertical_split_line = opt('bold_vertical_split_line', false),
-	disable_italics = opt('disable_italics', false),
-	disable_background = opt('disable_background', false),
-	disable_float_background = opt('disable_float_background', false),
-	inactive_background = opt('inactive_background', false),
-
-	colors = {
-		border = palette.highlight_med,
-		comment = palette.muted,
-		link = palette.iris,
-		punctuation = palette.subtle,
-
-		error = palette.love,
-		hint = palette.iris,
-		info = palette.foam,
-		warn = palette.gold,
-
-		git_add = palette.foam,
-		git_change = palette.rose,
-		git_delete = palette.love,
-		git_dirty = palette.rose,
-		git_ignore = palette.muted,
-		git_merge = palette.iris,
-		git_rename = palette.pine,
-		git_stage = palette.iris,
-		git_text = palette.rose,
-
-		---@type string|table<string, string>
-		headings = {
-			h1 = palette.iris,
-			h2 = palette.foam,
-			h3 = palette.rose,
-			h4 = palette.gold,
-			h5 = palette.pine,
-			h6 = palette.foam,
-		},
-	},
-}
-
-local colors = vim.g.rose_pine_colors or {}
-
-if type(colors.headings) == 'string' then
-	colors.headings = {
-		h1 = colors.headings,
-		h2 = colors.headings,
-		h3 = colors.headings,
-		h4 = colors.headings,
-		h5 = colors.headings,
-		h6 = colors.headings,
-	}
-end
-
-config.colors = vim.tbl_deep_extend('force', config.colors, colors)
-
-return config
diff --git a/lua/rose-pine/galaxyline/theme.lua b/lua/rose-pine/galaxyline/theme.lua
index 5142949..1183aa9 100644
--- a/lua/rose-pine/galaxyline/theme.lua
+++ b/lua/rose-pine/galaxyline/theme.lua
@@ -3,17 +3,17 @@ if not present then
 	return
 end
 
-local palette = require('rose-pine.palette')
+local p = require('rose-pine.palette')
 
 galaxyline_colors['rose-pine'] = {
-	bg = palette.overlay,
-	fg = palette.text,
-	fg_alt = palette.subtle,
-	blue = palette.foam,
-	cyan = palette.foam,
-	green = palette.muted,
-	magenta = palette.iris,
-	orange = palette.rose,
-	red = palette.love,
-	yellow = palette.gold,
+	bg = p.overlay,
+	fg = p.text,
+	fg_alt = p.subtle,
+	blue = p.foam,
+	cyan = p.foam,
+	green = p.muted,
+	magenta = p.iris,
+	orange = p.rose,
+	red = p.love,
+	yellow = p.gold,
 }
diff --git a/lua/rose-pine/init.lua b/lua/rose-pine/init.lua
index f872457..4e10311 100644
--- a/lua/rose-pine/init.lua
+++ b/lua/rose-pine/init.lua
@@ -1,4 +1,156 @@
 local M = {}
+local show_init_messages = true
+
+local function check_for_deprecated_opts()
+	local alerts = {}
+	local should_alert = false
+
+	-- Deprecated options
+	if vim.g.rose_pine_bold_vertical_split_line ~= nil then
+		should_alert = true
+		table.insert(alerts, 'vim.g.rose_pine_bold_vertical_split_line renamed to bold_vert_split')
+	end
+
+	if vim.g.rose_pine_inactive_background ~= nil then
+		should_alert = true
+		table.insert(alerts, 'vim.g.rose_pine_inactive_background renamed to dim_nc_background')
+	end
+
+	if vim.g.rose_pine_disable_background ~= nil then
+		should_alert = true
+		table.insert(alerts, 'vim.g.rose_pine_disable_background renamed to disable_background')
+	end
+
+	if vim.g.rose_pine_disable_float_background ~= nil then
+		should_alert = true
+		table.insert(
+			alerts,
+			'vim.g.rose_pine_disable_float_background renamed to disable_float_background'
+		)
+	end
+
+	if vim.g.rose_pine_disable_italics ~= nil then
+		should_alert = true
+		table.insert(alerts, 'vim.g.rose_pine_disable_italics renamed to disable_italics')
+	end
+
+	if vim.g.rose_pine_colors ~= nil then
+		should_alert = true
+		table.insert(alerts, 'vim.g.rose_pine_colors renamed to groups')
+	end
+
+	if should_alert then
+		local prefix = '   '
+		print('Rosé Pine – https://github.com/rose-pine/neovim')
+		print(prefix .. 'vim.g.rose_pine_<option> moved to lua setup:')
+		print(prefix .. "   require('rose-pine').setup({ ... })")
+		for _, message in ipairs(alerts) do
+			print(prefix .. message)
+		end
+		should_alert = false
+	end
+end
+
+---@class RosePineConfig
+---@field bold_vert_split boolean
+---@field dark_variant 'main'|'moon'
+---@field dim_nc_background boolean
+---@field disable_background boolean
+---@field disable_float_background boolean
+---@field disable_italics boolean
+---@field groups RosePineGroups
+
+---@class RosePineGroups
+---@field border string
+---@field comment string
+---@field link string
+---@field punctuation string
+---@field error string
+---@field hint string
+---@field info string
+---@field warn string
+---@field git RosePineGit
+---@field headings string|RosePineHeadings
+
+---@class RosePineGit
+---@field add string
+---@field change string
+---@field delete string
+---@field dirty string
+---@field ignore string
+---@field merge string
+---@field rename string
+---@field stage string
+---@field text string
+
+---@class RosePineHeadings
+---@field h1 string
+---@field h2 string
+---@field h3 string
+---@field h4 string
+---@field h5 string
+---@field h6 string
+
+---@type RosePineConfig
+local config = {
+	bold_vert_split = false,
+	dark_variant = 'main',
+	dim_nc_background = false,
+	disable_background = false,
+	disable_float_background = false,
+	disable_italics = false,
+
+	groups = {
+		border = 'highlight_med',
+		comment = 'muted',
+		link = 'iris',
+		punctuation = 'subtle',
+
+		error = 'love',
+		hint = 'iris',
+		info = 'foam',
+		warn = 'gold',
+
+		git_add = 'foam',
+		git_change = 'rose',
+		git_delete = 'love',
+		git_dirty = 'rose',
+		git_ignore = 'muted',
+		git_merge = 'iris',
+		git_rename = 'pine',
+		git_stage = 'iris',
+		git_text = 'rose',
+
+		headings = {
+			h1 = 'iris',
+			h2 = 'foam',
+			h3 = 'rose',
+			h4 = 'gold',
+			h5 = 'pine',
+			h6 = 'foam',
+		},
+	},
+}
+
+---@param opts RosePineConfig
+function M.setup(opts)
+	opts = opts or {}
+	vim.g.rose_pine_variant = opts.dark_variant or 'main'
+
+	if opts.groups and type(opts.groups.headings) == 'string' then
+		opts.groups.headings = {
+			h1 = opts.groups.headings,
+			h2 = opts.groups.headings,
+			h3 = opts.groups.headings,
+			h4 = opts.groups.headings,
+			h5 = opts.groups.headings,
+			h6 = opts.groups.headings,
+		}
+	end
+
+	config.user_variant = opts.dark_variant or nil
+	config = vim.tbl_deep_extend('force', config, opts)
+end
 
 function M.colorscheme()
 	if vim.g.colors_name then
@@ -8,20 +160,29 @@ function M.colorscheme()
 	vim.opt.termguicolors = true
 	vim.g.colors_name = 'rose-pine'
 
-	-- Match terminal theme if no variant is set
-	if vim.g.rose_pine_variant == nil and vim.o.background == 'light' then
-		vim.g.rose_pine_variant = 'dawn'
-	elseif vim.g.rose_pine_variant == 'dawn' then
-		vim.o.background = 'light'
+	if show_init_messages then
+		check_for_deprecated_opts()
+		show_init_messages = false
+	end
+
+	---@param color string
+	local function get_palette_color(color)
+		local p = require('rose-pine.palette')
+
+		if color and not color:find('#') then
+			return p[color:lower()]
+		end
+
+		return color:lower()
 	end
 
 	---@param group string
 	---@param color table<string, string>
 	local function highlight(group, color)
 		local style = color.style and 'gui=' .. color.style or 'gui=NONE'
-		local fg = color.fg and 'guifg=' .. color.fg or 'guifg=NONE'
-		local bg = color.bg and 'guibg=' .. color.bg or 'guibg=NONE'
-		local sp = color.sp and 'guisp=' .. color.sp or ''
+		local fg = color.fg and 'guifg=' .. get_palette_color(color.fg) or 'guifg=NONE'
+		local bg = color.bg and 'guibg=' .. get_palette_color(color.bg) or 'guibg=NONE'
+		local sp = color.sp and 'guisp=' .. get_palette_color(color.sp) or ''
 
 		local hl = 'highlight ' .. group .. ' ' .. style .. ' ' .. fg .. ' ' .. bg .. ' ' .. sp
 
@@ -31,33 +192,12 @@ function M.colorscheme()
 		end
 	end
 
-	for group, colors in pairs(require('rose-pine.theme')) do
-		highlight(group, colors)
+	local theme = require('rose-pine.theme').get(config)
+	for group, color in pairs(theme) do
+		highlight(group, color)
 	end
 
 	require('rose-pine.galaxyline.theme')
 end
 
-function M.set(variant)
-	vim.g.rose_pine_variant = variant
-	vim.cmd('colorscheme rose-pine')
-end
-
-function M.toggle(variants)
-	variants = variants or { 'main', 'moon', 'dawn' }
-
-	local index = {}
-	for k, v in pairs(variants) do
-		index[v] = k
-	end
-
-	if vim.g.rose_pine_current_variant == nil then
-		vim.g.rose_pine_current_variant = index[vim.g.rose_pine_variant] or 0
-	end
-
-	vim.g.rose_pine_current_variant = (vim.g.rose_pine_current_variant % #variants) + 1
-
-	M.set(variants[vim.g.rose_pine_current_variant])
-end
-
 return M
diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index 1b27e8b..ccb8b1c 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -55,12 +55,12 @@ local variants = {
 	},
 }
 
-local palette = variants.main
+local palette = {}
 
-if string.match(vim.g.rose_pine_variant or '', 'moon') then
-	palette = variants.moon
-elseif string.match(vim.g.rose_pine_variant or '', 'dawn') then
+if vim.o.background == 'light' then
 	palette = variants.dawn
+else
+	palette = variants[(vim.g.rose_pine_variant == 'moon' and 'moon') or 'main']
 end
 
 vim.tbl_deep_extend('force', palette, { none = 'NONE' })
diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 4a2aafa..35b256a 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -1,477 +1,427 @@
-local palette = require('rose-pine.palette')
-local config = require('rose-pine.config')
-local util = require('rose-pine.util')
+local blend = require('rose-pine.util').blend
 
-local group = config.colors
+local M = {}
 
-local maybe_italic = 'italic'
-if config.disable_italics == true then
-	maybe_italic = nil
+function M.get(config)
+	local p = require('rose-pine.palette')
+
+	local theme = {}
+	local groups = config.groups or {}
+	local styles = {
+		italic = (config.disable_italics and 'NONE') or 'italic',
+		vert_split = (config.bold_vert_split and p.surface) 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,
+		nc_background = (config.dim_nc_background and p.surface) or p.base,
+	}
+
+	theme = {
+		ColorColumn = { bg = p.highlight_high },
+		Conceal = { bg = p.none },
+		-- Cursor = {},
+		CursorColumn = { bg = p.highlight_low },
+		-- 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) },
+		DiffChange = { bg = p.overlay },
+		DiffDelete = { bg = blend(groups.git_delete, p.base, 0.5) },
+		DiffText = { bg = blend(groups.git_text, p.base, 0.5) },
+		diffAdded = { link = 'DiffAdd' },
+		diffChanged = { link = 'DiffChange' },
+		diffRemoved = { link = 'DiffDelete' },
+		Directory = { fg = p.foam, bg = p.none },
+		-- EndOfBuffer = {},
+		ErrorMsg = { fg = p.love, style = 'bold' },
+		FloatBorder = { fg = groups.border },
+		FoldColumn = { fg = p.muted },
+		Folded = { fg = p.text, bg = p.surface },
+		IncSearch = { fg = p.base, bg = p.rose },
+		LineNr = { fg = p.muted },
+		MatchParen = { fg = p.text, bg = p.highlight_med },
+		ModeMsg = { fg = p.subtle },
+		MoreMsg = { fg = p.iris },
+		NonText = { fg = p.muted },
+		Normal = { fg = p.text, bg = styles.background },
+		NormalFloat = { fg = p.text, bg = styles.float_background },
+		NormalNC = { fg = p.text, bg = styles.nc_background },
+		NvimInternalError = { fg = '#ffffff', bg = p.love },
+		Pmenu = { fg = p.subtle, bg = styles.float_background },
+		PmenuSbar = { bg = p.highlight_low },
+		PmenuSel = { fg = p.text, bg = p.overlay },
+		PmenuThumb = { bg = p.highlight_med },
+		Question = { fg = p.gold },
+		-- QuickFixLine = {},
+		-- RedrawDebugNormal = {}
+		RedrawDebugClear = { fg = '#ffffff', bg = p.gold },
+		RedrawDebugComposed = { fg = '#ffffff', bg = p.pine },
+		RedrawDebugRecompose = { fg = '#ffffff', bg = p.love },
+		Search = { bg = p.highlight_med },
+		SpecialKey = { fg = p.foam },
+		SpellBad = { sp = p.love, style = 'undercurl' },
+		SpellCap = { sp = p.subtle, style = 'undercurl' },
+		SpellLocal = { sp = p.subtle, style = 'undercurl' },
+		SpellRare = { sp = p.subtle, style = 'undercurl' },
+		SignColumn = { fg = p.text, bg = styles.background },
+		StatusLine = { fg = p.subtle, bg = p.surface },
+		StatusLineNC = { fg = p.muted, bg = p.base },
+		StatusLineTerm = { link = 'StatusLine' },
+		StatusLineTermNC = { link = 'StatusLineNC' },
+		TabLine = { fg = p.subtle, bg = p.surface },
+		TabLineFill = { bg = p.surface },
+		TabLineSel = { fg = p.text, bg = p.overlay },
+		Title = { fg = p.text },
+		VertSplit = { fg = p.overlay, bg = styles.vert_split },
+		Visual = { bg = p.highlight_med },
+		-- VisualNOS = {},
+		WarningMsg = { fg = p.gold },
+		-- Whitespace = {},
+		-- WildMenu = {},
+
+		Boolean = { fg = p.rose },
+		Character = { fg = p.gold },
+		Comment = { fg = groups.comment, style = styles.italic },
+		Conditional = { fg = p.pine },
+		Constant = { fg = p.gold },
+		Debug = { fg = p.rose },
+		Define = { fg = p.iris },
+		Delimiter = { fg = p.subtle },
+		Error = { fg = p.love },
+		Exception = { fg = p.pine },
+		Float = { fg = p.gold },
+		Function = { fg = p.rose },
+		Identifier = { fg = p.rose },
+		-- Ignore = {},
+		Include = { fg = p.iris },
+		Keyword = { fg = p.pine },
+		Label = { fg = p.foam },
+		Macro = { fg = p.iris },
+		Number = { fg = p.gold },
+		Operator = { fg = p.subtle },
+		PreCondit = { fg = p.iris },
+		PreProc = { fg = p.iris },
+		Repeat = { fg = p.pine },
+		Special = { fg = p.rose },
+		SpecialChar = { fg = p.rose },
+		SpecialComment = { fg = p.iris },
+		Statement = { fg = p.pine },
+		StorageClass = { fg = p.foam },
+		String = { fg = p.gold },
+		Structure = { fg = p.foam },
+		Tag = { fg = p.rose },
+		Todo = { fg = p.iris },
+		Type = { fg = p.foam },
+		Typedef = { fg = p.foam },
+		Underlined = { style = 'underline' },
+
+		htmlArg = { fg = p.iris },
+		htmlBold = { style = 'bold' },
+		htmlEndTag = { fg = p.subtle },
+		htmlH1 = { fg = groups.headings.h1, style = 'bold' },
+		htmlH2 = { fg = groups.headings.h2, style = 'bold' },
+		htmlH3 = { fg = groups.headings.h3, style = 'bold' },
+		htmlH4 = { fg = groups.headings.h4, style = 'bold' },
+		htmlH5 = { fg = groups.headings.h5, style = 'bold' },
+		htmlItalic = { style = styles.italic },
+		htmlLink = { fg = groups.link },
+		htmlTag = { fg = p.subtle },
+		htmlTagN = { fg = p.text },
+		htmlTagName = { fg = p.foam },
+
+		markdownDelimiter = { fg = p.subtle },
+		markdownH1 = { fg = groups.headings.h1, style = 'bold' },
+		markdownH1Delimiter = { link = 'markdownH1' },
+		markdownH2 = { fg = groups.headings.h2, style = 'bold' },
+		markdownH2Delimiter = { link = 'markdownH2' },
+		markdownH3 = { fg = groups.headings.h3, style = 'bold' },
+		markdownH3Delimiter = { link = 'markdownH3' },
+		markdownH4 = { fg = groups.headings.h4, style = 'bold' },
+		markdownH4Delimiter = { link = 'markdownH4' },
+		markdownH5 = { fg = groups.headings.h5, style = 'bold' },
+		markdownH5Delimiter = { link = 'markdownH5' },
+		markdownH6 = { fg = groups.headings.h6, style = 'bold' },
+		markdownH6Delimiter = { link = 'markdownH6' },
+		markdownLinkText = { fg = groups.link, style = 'underline' },
+		markdownUrl = { link = 'markdownLinkText' },
+
+		mkdCode = { fg = p.foam, style = styles.italic },
+		mkdCodeDelimiter = { fg = p.rose },
+		mkdCodeEnd = { fg = p.foam },
+		mkdCodeStart = { fg = p.foam },
+		mkdFootnotes = { fg = p.foam },
+		mkdID = { fg = p.foam, style = 'underline' },
+		mkdInlineURL = { fg = groups.link, style = 'underline' },
+		mkdLink = { link = 'mkdInlineURL' },
+		mkdLinkDef = { link = 'mkdInlineURL' },
+		mkdListItemLine = { fg = p.text },
+		mkdRule = { fg = p.subtle },
+		mkdURL = { link = 'mkdInlineURL' },
+
+		DiagnosticError = { fg = groups.error },
+		DiagnosticHint = { fg = groups.hint },
+		DiagnosticInfo = { fg = groups.info },
+		DiagnosticWarn = { fg = groups.warn },
+		DiagnosticDefaultError = { fg = groups.error },
+		DiagnosticDefaultHint = { fg = groups.hint },
+		DiagnosticDefaultInfo = { fg = groups.info },
+		DiagnosticDefaultWarn = { fg = groups.warn },
+		DiagnosticFloatingError = { fg = groups.error },
+		DiagnosticFloatingHint = { fg = groups.hint },
+		DiagnosticFloatingInfo = { fg = groups.info },
+		DiagnosticFloatingWarn = { fg = groups.warn },
+		DiagnosticSignError = { fg = groups.error },
+		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 },
+		DiagnosticUnderlineError = { sp = groups.error, style = 'undercurl' },
+		DiagnosticUnderlineHint = { sp = groups.hint, style = 'undercurl' },
+		DiagnosticUnderlineInfo = { sp = groups.info, style = 'undercurl' },
+		DiagnosticUnderlineWarn = { sp = groups.warn, style = 'undercurl' },
+		DiagnosticVirtualTextError = { fg = groups.error },
+		DiagnosticVirtualTextHint = { fg = groups.hint },
+		DiagnosticVirtualTextInfo = { fg = groups.info },
+		DiagnosticVirtualTextWarn = { fg = groups.warn },
+
+		-- TSAttribute = {},
+		TSBoolean = { link = 'Boolean' },
+		TSCharacter = { link = 'Character' },
+		TSComment = { link = 'Comment' },
+		TSConditional = { link = 'Conditional' },
+		TSConstBuiltin = { fg = p.love },
+		-- TSConstMacro = {},
+		TSConstant = { fg = p.foam },
+		TSConstructor = { fg = p.foam },
+		-- TSEmphasis = {},
+		-- TSError = {},
+		-- TSException = {},
+		TSField = { fg = p.foam },
+		-- TSFloat = {},
+		TSFuncBuiltin = { fg = p.love },
+		-- TSFuncMacro = {},
+		TSFunction = { fg = p.rose },
+		TSInclude = { fg = p.pine },
+		TSKeyword = { fg = p.pine },
+		-- TSKeywordFunction = {},
+		TSKeywordOperator = { fg = p.subtle },
+		TSLabel = { fg = p.foam },
+		-- TSLiteral = {},
+		-- TSMethod = {},
+		-- TSNamespace = {},
+		-- TSNone = {},
+		TSNumber = { link = 'Number' },
+		TSOperator = { fg = p.subtle },
+		TSParameter = { fg = p.iris, style = styles.italic },
+		-- TSParameterReference = {},
+		TSProperty = { fg = p.iris, style = styles.italic },
+		TSPunctBracket = { fg = groups.punctuation },
+		TSPunctDelimiter = { fg = groups.punctuation },
+		TSPunctSpecial = { fg = groups.punctuation },
+		-- TSRepeat = {},
+		-- TSStrike = {},
+		TSString = { link = 'String' },
+		TSStringEscape = { fg = p.pine },
+		-- TSStringRegex = {},
+		TSStringSpecial = { link = 'TSString' },
+		-- TSSymbol = {},
+		TSTag = { fg = p.foam },
+		TSTagDelimiter = { fg = p.subtle },
+		TSText = { fg = p.text },
+		TSTitle = { fg = groups.headings.h1, style = 'bold' },
+		TSType = { link = 'Type' },
+		-- TSTypeBuiltin = {},
+		TSURI = { fg = groups.link },
+		-- TSUnderline = {},
+		TSVariable = { fg = p.text, style = styles.italic },
+		TSVariableBuiltin = { fg = p.love },
+
+		-- romgrk/barbar.nvim
+		BufferCurrent = { fg = p.text, bg = p.overlay },
+		BufferCurrentIndex = { fg = p.text, bg = p.overlay },
+		BufferCurrentMod = { fg = p.foam, bg = p.overlay },
+		BufferCurrentSign = { fg = p.subtle, bg = p.overlay },
+		BufferCurrentTarget = { fg = p.gold, bg = p.overlay },
+		BufferInactive = { fg = p.subtle },
+		BufferInactiveIndex = { fg = p.subtle },
+		BufferInactiveMod = { fg = p.foam },
+		BufferInactiveSign = { fg = p.muted },
+		BufferInactiveTarget = { fg = p.gold },
+		BufferTabpageFill = { fg = p.base, bg = p.base },
+		BufferVisible = { fg = p.subtle },
+		BufferVisibleIndex = { fg = p.subtle },
+		BufferVisibleMod = { fg = p.foam },
+		BufferVisibleSign = { fg = p.muted },
+		BufferVisibleTarget = { fg = p.gold },
+
+		-- lewis6991/gitsigns.nvim
+		GitSignsAdd = { fg = groups.git_add },
+		GitSignsChange = { fg = groups.git_change },
+		GitSignsDelete = { fg = groups.git_delete },
+		SignAdd = { link = 'GitSignsAdd' },
+		SignChange = { link = 'GitSignsChange' },
+		SignDelete = { link = 'GitSignsDelete' },
+
+		-- mvllow/modes.nvim
+		ModesCopy = { bg = p.gold },
+		ModesDelete = { bg = p.love },
+		ModesInsert = { bg = p.foam },
+		ModesVisual = { bg = p.iris },
+
+		-- kyazdani42/nvim-tree.lua
+		NvimTreeEmptyFolderName = { fg = p.muted },
+		NvimTreeFileDeleted = { fg = p.love },
+		NvimTreeFileDirty = { fg = p.rose },
+		NvimTreeFileMerge = { fg = p.iris },
+		NvimTreeFileNew = { fg = p.foam },
+		NvimTreeFileRenamed = { fg = p.pine },
+		NvimTreeFileStaged = { fg = p.iris },
+		NvimTreeFolderIcon = { fg = p.subtle },
+		NvimTreeFolderName = { fg = p.foam },
+		NvimTreeGitDeleted = { fg = groups.git_delete },
+		NvimTreeGitDirty = { fg = groups.git_dirty },
+		NvimTreeGitIgnored = { fg = groups.git_ignore },
+		NvimTreeGitMerge = { fg = groups.git_merge },
+		NvimTreeGitNew = { fg = groups.git_add },
+		NvimTreeGitRenamed = { fg = groups.git_rename },
+		NvimTreeGitStaged = { fg = groups.git_stage },
+		NvimTreeImageFile = { fg = p.text },
+		NvimTreeNormal = { fg = p.text },
+		NvimTreeOpenedFile = { fg = p.text, bg = p.highlight_med },
+		NvimTreeOpenedFolderName = { fg = p.foam },
+		NvimTreeRootFolder = { fg = p.iris },
+		NvimTreeSpecialFile = { link = 'NvimTreeNormal' },
+		NvimTreeWindowPicker = { fg = p.base, 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 },
+		WhichKeyValue = { fg = p.rose },
+
+		-- luka-reineke/indent-blankline.nvim
+		IndentBlanklineChar = { fg = p.muted },
+
+		-- hrsh7th/nvim-cmp
+		CmpItemAbbr = { fg = p.subtle },
+		CmpItemAbbrDeprecated = { fg = p.subtle, style = 'strikethrough' },
+		CmpItemAbbrMatch = { fg = p.text, style = 'bold' },
+		CmpItemAbbrMatchFuzzy = { fg = p.text, style = 'bold' },
+		CmpItemKind = { fg = p.iris },
+		CmpItemKindClass = { fg = p.gold },
+		CmpItemKindFunction = { fg = p.iris },
+		CmpItemKindInterface = { fg = p.gold },
+		CmpItemKindMethod = { fg = p.iris },
+		CmpItemKindSnippet = { fg = p.iris },
+		CmpItemKindVariable = { fg = p.foam },
+
+		-- TimUntersberger/neogit
+		NeogitDiffAddHighlight = { fg = p.foam, bg = p.highlight_med },
+		NeogitDiffContextHighlight = { bg = p.highlight_low },
+		NeogitDiffDeleteHighlight = { fg = p.love, bg = p.highlight_med },
+		NeogitHunkHeader = { bg = p.highlight_low },
+		NeogitHunkHeaderHighlight = { bg = p.highlight_low },
+
+		-- vimwiki/vimwiki
+		VimwikiHR = { fg = p.subtle },
+		VimwikiHeader1 = { fg = groups.headings.h1, style = 'bold' },
+		VimwikiHeader2 = { fg = groups.headings.h2, style = 'bold' },
+		VimwikiHeader3 = { fg = groups.headings.h3, style = 'bold' },
+		VimwikiHeader4 = { fg = groups.headings.h4, style = 'bold' },
+		VimwikiHeader5 = { fg = groups.headings.h5, style = 'bold' },
+		VimwikiHeader6 = { fg = groups.headings.h6, style = 'bold' },
+		VimwikiHeaderChar = { fg = p.pine },
+		VimwikiLink = { fg = groups.link, style = 'underline' },
+		VimwikiList = { fg = p.iris },
+		VimwikiNoExistsLink = { fg = p.love },
+
+		-- nvim-neorg/neorg
+		NeorgHeading1Prefix = { fg = groups.headings.h1, style = 'bold' },
+		NeorgHeading1Title = { link = 'NeorgHeading1Prefix' },
+		NeorgHeading2Prefix = { fg = groups.headings.h2, style = 'bold' },
+		NeorgHeading2Title = { link = 'NeorgHeading2Prefix' },
+		NeorgHeading3Prefix = { fg = groups.headings.h3, style = 'bold' },
+		NeorgHeading3Title = { link = 'NeorgHeading3Prefix' },
+		NeorgHeading4Prefix = { fg = groups.headings.h4, style = 'bold' },
+		NeorgHeading4Title = { link = 'NeorgHeading4Prefix' },
+		NeorgHeading5Prefix = { fg = groups.headings.h5, style = 'bold' },
+		NeorgHeading5Title = { link = 'NeorgHeading5Prefix' },
+		NeorgHeading6Prefix = { fg = groups.headings.h6, style = 'bold' },
+		NeorgHeading6Title = { link = 'NeorgHeading6Prefix' },
+		NeorgMarkerTitle = { fg = p.text, style = 'bold' },
+
+		-- tami5/lspsaga.nvim (fork of glepnir/lspsaga.nvim)
+		DefinitionCount = { fg = p.rose },
+		DefinitionIcon = { fg = p.rose },
+		DefintionPreviewTitle = { fg = p.rose, style = 'bold' },
+		LspFloatWinBorder = { fg = groups.border },
+		LspFloatWinNormal = { bg = p.base },
+		LspSagaAutoPreview = { fg = p.subtle },
+		LspSagaCodeActionBorder = { fg = groups.border },
+		LspSagaCodeActionContent = { fg = p.foam },
+		LspSagaCodeActionTitle = { fg = p.gold, style = 'bold' },
+		LspSagaCodeActionTruncateLine = { link = 'LspSagaCodeActionBorder' },
+		LspSagaDefPreviewBorder = { fg = groups.border },
+		LspSagaDiagnosticBorder = { fg = groups.border },
+		LspSagaDiagnosticHeader = { fg = p.gold, style = 'bold' },
+		LspSagaDiagnosticTruncateLine = { link = 'LspSagaDiagnosticBorder' },
+		LspSagaDocTruncateLine = { link = 'LspSagaHoverBorder' },
+		LspSagaFinderSelection = { fg = p.gold },
+		LspSagaHoverBorder = { fg = groups.border },
+		LspSagaLspFinderBorder = { fg = groups.border },
+		LspSagaRenameBorder = { fg = p.pine },
+		LspSagaRenamePromptPrefix = { fg = p.love },
+		LspSagaShTruncateLine = { link = 'LspSagaSignatureHelpBorder' },
+		LspSagaSignatureHelpBorder = { fg = p.pine },
+		ReferencesCount = { fg = p.rose },
+		ReferencesIcon = { fg = p.rose },
+		SagaShadow = { bg = p.overlay },
+		TargetWord = { fg = p.iris },
+
+		-- ray-x/lsp_signature.nvim
+		LspSignatureActiveParameter = { bg = p.overlay },
+
+		-- rlane/pounce.nvim
+		PounceAccept = { fg = p.love, bg = p.highlight_high },
+		PounceAcceptBest = { fg = p.base, bg = p.gold },
+		PounceGap = { link = 'Search' },
+		PounceMatch = { link = 'Search' },
+
+		-- nvim-telescope/telescope.nvim
+		TelescopeBorder = { fg = groups.border },
+		TelescopeMatching = { fg = p.rose },
+		TelescopeNormal = { fg = p.subtle },
+		TelescopePromptNormal = { fg = p.text },
+		TelescopePromptPrefix = { fg = p.subtle },
+		TelescopeSelection = { fg = p.text, bg = p.overlay },
+		TelescopeSelectionCaret = { fg = p.rose, bg = p.overlay },
+		TelescopeTitle = { fg = p.subtle },
+	}
+
+	vim.g.terminal_color_0 = p.overlay -- black
+	vim.g.terminal_color_8 = p.subtle -- bright black
+	vim.g.terminal_color_1 = p.love -- red
+	vim.g.terminal_color_9 = p.love -- bright red
+	vim.g.terminal_color_2 = p.pine -- green
+	vim.g.terminal_color_10 = p.pine -- bright green
+	vim.g.terminal_color_3 = p.gold -- yellow
+	vim.g.terminal_color_11 = p.gold -- bright yellow
+	vim.g.terminal_color_4 = p.foam -- blue
+	vim.g.terminal_color_12 = p.foam -- bright blue
+	vim.g.terminal_color_5 = p.iris -- magenta
+	vim.g.terminal_color_13 = p.iris -- bright magenta
+	vim.g.terminal_color_6 = p.rose -- cyan
+	vim.g.terminal_color_14 = p.rose -- bright cyan
+	vim.g.terminal_color_7 = p.text -- white
+	vim.g.terminal_color_15 = p.text -- bright white
+
+	return theme
 end
 
-local background = palette.base
-if config.disable_background then
-	background = palette.none
-end
-
-local float_background = palette.surface
-if config.disable_float_background then
-	float_background = palette.none
-end
-
-local inactive_background = palette.none
-if config.inactive_background then
-	inactive_background = util.blend('#000000', palette.base, palette.opacity)
-end
-
-local vert_split_background = palette.none
-if config.bold_vertical_split_line then
-	vert_split_background = palette.overlay
-end
-
-local theme = {
-	ColorColumn = { bg = palette.highlight_high },
-	Conceal = { bg = palette.none },
-	-- Cursor = {},
-	CursorColumn = { bg = palette.highlight_low },
-	-- CursorIM = {},
-	CursorLine = { bg = palette.highlight_low },
-	CursorLineNr = { fg = palette.text },
-	DarkenedPanel = { bg = palette.surface },
-	DarkenedStatusline = { bg = palette.surface },
-	DiffAdd = { bg = util.blend(group.git_add, palette.base, 0.5) },
-	DiffChange = { bg = palette.overlay },
-	DiffDelete = { bg = util.blend(group.git_delete, palette.base, 0.5) },
-	DiffText = { bg = util.blend(group.git_text, palette.base, 0.5) },
-	diffAdded = { link = 'DiffAdd' },
-	diffChanged = { link = 'DiffChange' },
-	diffRemoved = { link = 'DiffDelete' },
-	Directory = { fg = palette.foam, bg = palette.none },
-	-- EndOfBuffer = {},
-	ErrorMsg = { fg = palette.love, style = 'bold' },
-	FloatBorder = { fg = group.border },
-	FoldColumn = { fg = palette.muted },
-	Folded = { fg = palette.text, bg = palette.surface },
-	IncSearch = { fg = palette.base, bg = palette.rose },
-	LineNr = { fg = palette.muted },
-	MatchParen = { fg = palette.text, bg = palette.highlight_med },
-	ModeMsg = { fg = palette.subtle },
-	MoreMsg = { fg = palette.iris },
-	NonText = { fg = palette.muted },
-	Normal = { fg = palette.text, bg = background },
-	NormalFloat = { fg = palette.text, bg = float_background },
-	NormalNC = { fg = palette.text, bg = inactive_background },
-	NvimInternalError = { fg = '#ffffff', bg = palette.love },
-	Pmenu = { fg = palette.subtle, bg = float_background },
-	PmenuSbar = { bg = palette.highlight_low },
-	PmenuSel = { fg = palette.text, bg = palette.overlay },
-	PmenuThumb = { bg = palette.highlight_med },
-	Question = { fg = palette.gold },
-	-- QuickFixLine = {},
-	-- RedrawDebugNormal = {}
-	RedrawDebugClear = { fg = '#ffffff', bg = palette.gold },
-	RedrawDebugComposed = { fg = '#ffffff', bg = palette.pine },
-	RedrawDebugRecompose = { fg = '#ffffff', bg = palette.love },
-	Search = { bg = palette.highlight_med },
-	SpecialKey = { fg = palette.foam },
-	SpellBad = { sp = palette.love, style = 'undercurl' },
-	SpellCap = { sp = palette.subtle, style = 'undercurl' },
-	SpellLocal = { sp = palette.subtle, style = 'undercurl' },
-	SpellRare = { sp = palette.subtle, style = 'undercurl' },
-	SignColumn = { fg = palette.text, bg = background },
-	StatusLine = { fg = palette.subtle, bg = palette.surface },
-	StatusLineNC = { fg = palette.muted, bg = palette.base },
-	StatusLineTerm = { link = 'StatusLine' },
-	StatusLineTermNC = { link = 'StatusLineNC' },
-	TabLine = { fg = palette.subtle, bg = palette.surface },
-	TabLineFill = { bg = palette.surface },
-	TabLineSel = { fg = palette.text, bg = palette.overlay },
-	Title = { fg = palette.text },
-	VertSplit = { fg = palette.overlay, bg = vert_split_background },
-	Visual = { bg = palette.highlight_med },
-	-- VisualNOS = {},
-	WarningMsg = { fg = palette.gold },
-	-- Whitespace = {},
-	-- WildMenu = {},
-
-	Boolean = { fg = palette.rose },
-	Character = { fg = palette.gold },
-	Comment = { fg = group.comment, style = maybe_italic },
-	Conditional = { fg = palette.pine },
-	Constant = { fg = palette.gold },
-	Debug = { fg = palette.rose },
-	Define = { fg = palette.iris },
-	Delimiter = { fg = palette.subtle },
-	Error = { fg = palette.love },
-	Exception = { fg = palette.pine },
-	Float = { fg = palette.gold },
-	Function = { fg = palette.rose },
-	Identifier = { fg = palette.rose },
-	-- Ignore = {},
-	Include = { fg = palette.iris },
-	Keyword = { fg = palette.pine },
-	Label = { fg = palette.foam },
-	Macro = { fg = palette.iris },
-	Number = { fg = palette.gold },
-	Operator = { fg = palette.subtle },
-	PreCondit = { fg = palette.iris },
-	PreProc = { fg = palette.iris },
-	Repeat = { fg = palette.pine },
-	Special = { fg = palette.rose },
-	SpecialChar = { fg = palette.rose },
-	SpecialComment = { fg = palette.iris },
-	Statement = { fg = palette.pine },
-	StorageClass = { fg = palette.foam },
-	String = { fg = palette.gold },
-	Structure = { fg = palette.foam },
-	Tag = { fg = palette.rose },
-	Todo = { fg = palette.iris },
-	Type = { fg = palette.foam },
-	Typedef = { fg = palette.foam },
-	Underlined = { style = 'underline' },
-
-	htmlArg = { fg = palette.iris },
-	htmlBold = { style = 'bold' },
-	htmlEndTag = { fg = palette.subtle },
-	htmlH1 = { fg = group.headings.h1, style = 'bold' },
-	htmlH2 = { fg = group.headings.h2, style = 'bold' },
-	htmlH3 = { fg = group.headings.h3, style = 'bold' },
-	htmlH4 = { fg = group.headings.h4, style = 'bold' },
-	htmlH5 = { fg = group.headings.h5, style = 'bold' },
-	htmlItalic = { style = maybe_italic },
-	htmlLink = { fg = group.link },
-	htmlTag = { fg = palette.subtle },
-	htmlTagN = { fg = palette.text },
-	htmlTagName = { fg = palette.foam },
-
-	markdownDelimiter = { fg = palette.subtle },
-	markdownH1 = { fg = group.headings.h1, style = 'bold' },
-	markdownH1Delimiter = { link = 'markdownH1' },
-	markdownH2 = { fg = group.headings.h2, style = 'bold' },
-	markdownH2Delimiter = { link = 'markdownH2' },
-	markdownH3 = { fg = group.headings.h3, style = 'bold' },
-	markdownH3Delimiter = { link = 'markdownH3' },
-	markdownH4 = { fg = group.headings.h4, style = 'bold' },
-	markdownH4Delimiter = { link = 'markdownH4' },
-	markdownH5 = { fg = group.headings.h5, style = 'bold' },
-	markdownH5Delimiter = { link = 'markdownH5' },
-	markdownH6 = { fg = group.headings.h6, style = 'bold' },
-	markdownH6Delimiter = { link = 'markdownH6' },
-	markdownLinkText = { fg = group.link, style = 'underline' },
-	markdownUrl = { link = 'markdownLinkText' },
-
-	mkdCode = { fg = palette.foam, style = maybe_italic },
-	mkdCodeDelimiter = { fg = palette.rose },
-	mkdCodeEnd = { fg = palette.foam },
-	mkdCodeStart = { fg = palette.foam },
-	mkdFootnotes = { fg = palette.foam },
-	mkdID = { fg = palette.foam, style = 'underline' },
-	mkdInlineURL = { fg = group.link, style = 'underline' },
-	mkdLink = { link = 'mkdInlineURL' },
-	mkdLinkDef = { link = 'mkdInlineURL' },
-	mkdListItemLine = { fg = palette.text },
-	mkdRule = { fg = palette.subtle },
-	mkdURL = { link = 'mkdInlineURL' },
-
-	DiagnosticError = { fg = group.error },
-	DiagnosticHint = { fg = group.hint },
-	DiagnosticInfo = { fg = group.info },
-	DiagnosticWarn = { fg = group.warn },
-	DiagnosticDefaultError = { fg = group.error },
-	DiagnosticDefaultHint = { fg = group.hint },
-	DiagnosticDefaultInfo = { fg = group.info },
-	DiagnosticDefaultWarn = { fg = group.warn },
-	DiagnosticFloatingError = { fg = group.error },
-	DiagnosticFloatingHint = { fg = group.hint },
-	DiagnosticFloatingInfo = { fg = group.info },
-	DiagnosticFloatingWarn = { fg = group.warn },
-	DiagnosticSignError = { fg = group.error },
-	DiagnosticSignHint = { fg = group.hint },
-	DiagnosticSignInfo = { fg = group.info },
-	DiagnosticSignWarn = { fg = group.warn },
-	DiagnosticUnderlineError = { sp = group.error, style = 'undercurl' },
-	DiagnosticUnderlineHint = { sp = group.hint, style = 'undercurl' },
-	DiagnosticUnderlineInfo = { sp = group.info, style = 'undercurl' },
-	DiagnosticUnderlineWarn = { sp = group.warn, style = 'undercurl' },
-	DiagnosticVirtualTextError = { fg = group.error },
-	DiagnosticVirtualTextHint = { fg = group.hint },
-	DiagnosticVirtualTextInfo = { fg = group.info },
-	DiagnosticVirtualTextWarn = { fg = group.warn },
-
-	LspReferenceText = { fg = palette.rose, bg = palette.highlight_med },
-	LspReferenceRead = { fg = palette.rose, bg = palette.highlight_med },
-	LspReferenceWrite = { fg = palette.rose, bg = palette.highlight_med },
-
-	-- TODO: Deprecate in favour of 0.6.0 groups
-	LspDiagnosticsSignWarning = { link = 'DiagnosticSignWarn' },
-	LspDiagnosticsDefaultWarning = { link = 'DiagnosticDefaultWarn' },
-	LspDiagnosticsFloatingWarning = { link = 'DiagnosticFloatingWarn' },
-	LspDiagnosticsVirtualTextWarning = { link = 'DiagnosticVirtualTextWarn' },
-	LspDiagnosticsUnderlineWarning = { link = 'DiagnosticUnderlineWarn' },
-	LspDiagnosticsSignHint = { link = 'DiagnosticSignHint' },
-	LspDiagnosticsDefaultHint = { link = 'DiagnosticDefaultHint' },
-	LspDiagnosticsVirtualTextHint = { link = 'DiagnosticFloatingHint' },
-	LspDiagnosticsFloatingHint = { link = 'DiagnosticVirtualTextHint' },
-	LspDiagnosticsUnderlineHint = { link = 'DiagnosticUnderlineHint' },
-	LspDiagnosticsSignError = { link = 'DiagnosticSignError' },
-	LspDiagnosticsDefaultError = { link = 'DiagnosticDefaultError' },
-	LspDiagnosticsFloatingError = { link = 'DiagnosticFloatingError' },
-	LspDiagnosticsVirtualTextError = { link = 'DiagnosticVirtualTextError' },
-	LspDiagnosticsUnderlineError = { link = 'DiagnosticUnderlineError' },
-	LspDiagnosticsSignInformation = { link = 'DiagnosticSignInfo' },
-	LspDiagnosticsDefaultInformation = { link = 'DiagnosticDefaultInfo' },
-	LspDiagnosticsFloatingInformation = { link = 'DiagnosticFloatingInfo' },
-	LspDiagnosticsVirtualTextInformation = { link = 'DiagnosticVirtualTextInfo' },
-	LspDiagnosticsUnderlineInformation = { link = 'DiagnosticUnderlineInfo' },
-
-	-- TSAttribute = {},
-	TSBoolean = { link = 'Boolean' },
-	TSCharacter = { link = 'Character' },
-	TSComment = { link = 'Comment' },
-	TSConditional = { link = 'Conditional' },
-	TSConstBuiltin = { fg = palette.love },
-	-- TSConstMacro = {},
-	TSConstant = { fg = palette.foam },
-	TSConstructor = { fg = palette.foam },
-	-- TSEmphasis = {},
-	-- TSError = {},
-	-- TSException = {},
-	TSField = { fg = palette.foam },
-	-- TSFloat = {},
-	TSFuncBuiltin = { fg = palette.love },
-	-- TSFuncMacro = {},
-	TSFunction = { fg = palette.rose },
-	TSInclude = { fg = palette.pine },
-	TSKeyword = { fg = palette.pine },
-	-- TSKeywordFunction = {},
-	TSKeywordOperator = { fg = palette.subtle },
-	TSLabel = { fg = palette.foam },
-	-- TSLiteral = {},
-	-- TSMethod = {},
-	-- TSNamespace = {},
-	-- TSNone = {},
-	TSNumber = { link = 'Number' },
-	TSOperator = { fg = palette.subtle },
-	TSParameter = { fg = palette.iris, style = maybe_italic },
-	-- TSParameterReference = {},
-	TSProperty = { fg = palette.iris, style = maybe_italic },
-	TSPunctBracket = { fg = group.punctuation },
-	TSPunctDelimiter = { fg = group.punctuation },
-	TSPunctSpecial = { fg = group.punctuation },
-	-- TSRepeat = {},
-	-- TSStrike = {},
-	TSString = { link = 'String' },
-	TSStringEscape = { fg = palette.pine },
-	-- TSStringRegex = {},
-	TSStringSpecial = { link = 'TSString' },
-	-- TSSymbol = {},
-	TSTag = { fg = palette.foam },
-	TSTagDelimiter = { fg = palette.subtle },
-	TSText = { fg = palette.text },
-	TSTitle = { fg = group.headings.h1, style = 'bold' },
-	TSType = { link = 'Type' },
-	-- TSTypeBuiltin = {},
-	TSURI = { fg = group.link },
-	-- TSUnderline = {},
-	TSVariable = { fg = palette.text, style = maybe_italic },
-	TSVariableBuiltin = { fg = palette.love },
-
-	-- romgrk/barbar.nvim
-	BufferCurrent = { fg = palette.text, bg = palette.overlay },
-	BufferCurrentIndex = { fg = palette.text, bg = palette.overlay },
-	BufferCurrentMod = { fg = palette.foam, bg = palette.overlay },
-	BufferCurrentSign = { fg = palette.subtle, bg = palette.overlay },
-	BufferCurrentTarget = { fg = palette.gold, bg = palette.overlay },
-	BufferInactive = { fg = palette.subtle },
-	BufferInactiveIndex = { fg = palette.subtle },
-	BufferInactiveMod = { fg = palette.foam },
-	BufferInactiveSign = { fg = palette.muted },
-	BufferInactiveTarget = { fg = palette.gold },
-	BufferTabpageFill = { fg = palette.base, bg = palette.base },
-	BufferVisible = { fg = palette.subtle },
-	BufferVisibleIndex = { fg = palette.subtle },
-	BufferVisibleMod = { fg = palette.foam },
-	BufferVisibleSign = { fg = palette.muted },
-	BufferVisibleTarget = { fg = palette.gold },
-
-	-- lewis6991/gitsigns.nvim
-	GitSignsAdd = { fg = group.git_add },
-	GitSignsChange = { fg = group.git_change },
-	GitSignsDelete = { fg = group.git_delete },
-	SignAdd = { link = 'GitSignsAdd' },
-	SignChange = { link = 'GitSignsChange' },
-	SignDelete = { link = 'GitSignsDelete' },
-
-	-- mvllow/modes.nvim
-	ModesCopy = { bg = palette.gold },
-	ModesDelete = { bg = palette.love },
-	ModesInsert = { bg = palette.foam },
-	ModesVisual = { bg = palette.iris },
-
-	-- kyazdani42/nvim-tree.lua
-	NvimTreeEmptyFolderName = { fg = palette.muted },
-	NvimTreeFileDeleted = { fg = palette.love },
-	NvimTreeFileDirty = { fg = palette.rose },
-	NvimTreeFileMerge = { fg = palette.iris },
-	NvimTreeFileNew = { fg = palette.foam },
-	NvimTreeFileRenamed = { fg = palette.pine },
-	NvimTreeFileStaged = { fg = palette.iris },
-	NvimTreeFolderIcon = { fg = palette.subtle },
-	NvimTreeFolderName = { fg = palette.foam },
-	NvimTreeGitDeleted = { fg = group.git_delete },
-	NvimTreeGitDirty = { fg = group.git_dirty },
-	NvimTreeGitIgnored = { fg = group.git_ignore },
-	NvimTreeGitMerge = { fg = group.git_merge },
-	NvimTreeGitNew = { fg = group.git_add },
-	NvimTreeGitRenamed = { fg = group.git_rename },
-	NvimTreeGitStaged = { fg = group.git_stage },
-	NvimTreeImageFile = { fg = palette.text },
-	NvimTreeNormal = { fg = palette.text },
-	NvimTreeOpenedFile = { fg = palette.text, bg = palette.highlight_med },
-	NvimTreeOpenedFolderName = { fg = palette.foam },
-	NvimTreeRootFolder = { fg = palette.iris },
-	NvimTreeSpecialFile = { link = 'NvimTreeNormal' },
-	NvimTreeWindowPicker = { fg = palette.base, bg = palette.iris },
-
-	-- folke/which-key.nvim
-	WhichKey = { fg = palette.iris },
-	WhichKeyGroup = { fg = palette.foam },
-	WhichKeySeparator = { fg = palette.subtle },
-	WhichKeyDesc = { fg = palette.gold },
-	WhichKeyFloat = { bg = palette.surface },
-	WhichKeyValue = { fg = palette.rose },
-
-	-- luka-reineke/indent-blankline.nvim
-	IndentBlanklineChar = { fg = palette.muted },
-
-	-- hrsh7th/nvim-cmp
-	CmpItemAbbr = { fg = palette.subtle },
-	CmpItemAbbrDeprecated = { fg = palette.subtle, style = 'strikethrough' },
-	CmpItemAbbrMatch = { fg = palette.text, style = 'bold' },
-	CmpItemAbbrMatchFuzzy = { fg = palette.text, style = 'bold' },
-	CmpItemKind = { fg = palette.iris },
-	CmpItemKindClass = { fg = palette.gold },
-	CmpItemKindFunction = { fg = palette.iris },
-	CmpItemKindInterface = { fg = palette.gold },
-	CmpItemKindMethod = { fg = palette.iris },
-	CmpItemKindSnippet = { fg = palette.iris },
-	CmpItemKindVariable = { fg = palette.foam },
-
-	-- TimUntersberger/neogit
-	NeogitDiffAddHighlight = { fg = palette.foam, bg = palette.highlight_med },
-	NeogitDiffContextHighlight = { bg = palette.highlight_low },
-	NeogitDiffDeleteHighlight = { fg = palette.love, bg = palette.highlight_med },
-	NeogitHunkHeader = { bg = palette.highlight_low },
-	NeogitHunkHeaderHighlight = { bg = palette.highlight_low },
-
-	-- vimwiki/vimwiki
-	VimwikiHR = { fg = palette.subtle },
-	VimwikiHeader1 = { fg = group.headings.h1, style = 'bold' },
-	VimwikiHeader2 = { fg = group.headings.h2, style = 'bold' },
-	VimwikiHeader3 = { fg = group.headings.h3, style = 'bold' },
-	VimwikiHeader4 = { fg = group.headings.h4, style = 'bold' },
-	VimwikiHeader5 = { fg = group.headings.h5, style = 'bold' },
-	VimwikiHeader6 = { fg = group.headings.h6, style = 'bold' },
-	VimwikiHeaderChar = { fg = palette.pine },
-	VimwikiLink = { fg = group.link, style = 'underline' },
-	VimwikiList = { fg = palette.iris },
-	VimwikiNoExistsLink = { fg = palette.love },
-
-	-- nvim-neorg/neorg
-	NeorgHeading1Prefix = { fg = group.headings.h1, style = 'bold' },
-	NeorgHeading1Title = { link = 'NeorgHeading1Prefix' },
-	NeorgHeading2Prefix = { fg = group.headings.h2, style = 'bold' },
-	NeorgHeading2Title = { link = 'NeorgHeading2Prefix' },
-	NeorgHeading3Prefix = { fg = group.headings.h3, style = 'bold' },
-	NeorgHeading3Title = { link = 'NeorgHeading3Prefix' },
-	NeorgHeading4Prefix = { fg = group.headings.h4, style = 'bold' },
-	NeorgHeading4Title = { link = 'NeorgHeading4Prefix' },
-	NeorgHeading5Prefix = { fg = group.headings.h5, style = 'bold' },
-	NeorgHeading5Title = { link = 'NeorgHeading5Prefix' },
-	NeorgHeading6Prefix = { fg = group.headings.h6, style = 'bold' },
-	NeorgHeading6Title = { link = 'NeorgHeading6Prefix' },
-	NeorgMarkerTitle = { fg = palette.text, style = 'bold' },
-
-	-- tami5/lspsaga.nvim (fork of glepnir/lspsaga.nvim)
-	DefinitionCount = { fg = palette.rose },
-	DefinitionIcon = { fg = palette.rose },
-	DefintionPreviewTitle = { fg = palette.rose, style = 'bold' },
-	LspFloatWinBorder = { fg = group.border },
-	LspFloatWinNormal = { bg = palette.base },
-	LspSagaAutoPreview = { fg = palette.subtle },
-	LspSagaCodeActionBorder = { fg = group.border },
-	LspSagaCodeActionContent = { fg = palette.foam },
-	LspSagaCodeActionTitle = { fg = palette.gold, style = 'bold' },
-	LspSagaCodeActionTruncateLine = { link = 'LspSagaCodeActionBorder' },
-	LspSagaDefPreviewBorder = { fg = group.border },
-	LspSagaDiagnosticBorder = { fg = group.border },
-	LspSagaDiagnosticHeader = { fg = palette.gold, style = 'bold' },
-	LspSagaDiagnosticTruncateLine = { link = 'LspSagaDiagnosticBorder' },
-	LspSagaDocTruncateLine = { link = 'LspSagaHoverBorder' },
-	LspSagaFinderSelection = { fg = palette.gold },
-	LspSagaHoverBorder = { fg = group.border },
-	LspSagaLspFinderBorder = { fg = group.border },
-	LspSagaRenameBorder = { fg = palette.pine },
-	LspSagaRenamePromptPrefix = { fg = palette.love },
-	LspSagaShTruncateLine = { link = 'LspSagaSignatureHelpBorder' },
-	LspSagaSignatureHelpBorder = { fg = palette.pine },
-	ReferencesCount = { fg = palette.rose },
-	ReferencesIcon = { fg = palette.rose },
-	SagaShadow = { bg = palette.overlay },
-	TargetWord = { fg = palette.iris },
-
-	-- ray-x/lsp_signature.nvim
-	LspSignatureActiveParameter = { bg = palette.overlay },
-
-	-- rlane/pounce.nvim
-	PounceAccept = { fg = palette.love, bg = palette.highlight_high },
-	PounceAcceptBest = { fg = palette.base, bg = palette.gold },
-	PounceGap = { link = 'Search' },
-	PounceMatch = { link = 'Search' },
-
-	-- nvim-telescope/telescope.nvim
-	TelescopeBorder = { fg = group.border },
-	TelescopeMatching = { fg = palette.rose },
-	TelescopeNormal = { fg = palette.subtle },
-	TelescopePromptNormal = { fg = palette.text },
-	TelescopePromptPrefix = { fg = palette.subtle },
-	TelescopeSelection = { fg = palette.text, bg = palette.overlay },
-	TelescopeSelectionCaret = { fg = palette.rose, bg = palette.overlay },
-	TelescopeTitle = { fg = palette.subtle },
-
-	-- rcarriga/nvim-notify
-	NotifyINFOBorder = { fg = palette.foam },
-	NotifyINFOTitle = { link = 'NotifyINFOBorder' },
-	NotifyINFOIcon = { link = 'NotifyINFOBorder' },
-	NotifyWARNBorder = { fg = palette.gold },
-	NotifyWARNTitle = { link = 'NotifyWARNBorder' },
-	NotifyWARNIcon = { link = 'NotifyWARNBorder' },
-	NotifyDEBUGBorder = { fg = palette.muted },
-	NotifyDEBUGTitle = { link = 'NotifyDEBUGBorder' },
-	NotifyDEBUGIcon = { link = 'NotifyDEBUGBorder' },
-	NotifyTRACEBorder = { fg = palette.iris },
-	NotifyTRACETitle = { link = 'NotifyTRACEBorder' },
-	NotifyTRACEIcon = { link = 'NotifyTRACEBorder' },
-	NotifyERRORBorder = { fg = palette.love },
-	NotifyERRORTitle = { link = 'NotifyERRORBorder' },
-	NotifyERRORIcon = { link = 'NotifyERRORBorder' },
-}
-
-vim.g.terminal_color_0 = palette.overlay -- black
-vim.g.terminal_color_8 = palette.subtle -- bright black
-vim.g.terminal_color_1 = palette.love -- red
-vim.g.terminal_color_9 = palette.love -- bright red
-vim.g.terminal_color_2 = palette.pine -- green
-vim.g.terminal_color_10 = palette.pine -- bright green
-vim.g.terminal_color_3 = palette.gold -- yellow
-vim.g.terminal_color_11 = palette.gold -- bright yellow
-vim.g.terminal_color_4 = palette.foam -- blue
-vim.g.terminal_color_12 = palette.foam -- bright blue
-vim.g.terminal_color_5 = palette.iris -- magenta
-vim.g.terminal_color_13 = palette.iris -- bright magenta
-vim.g.terminal_color_6 = palette.rose -- cyan
-vim.g.terminal_color_14 = palette.rose -- bright cyan
-vim.g.terminal_color_7 = palette.text -- white
-vim.g.terminal_color_15 = palette.text -- bright white
-
-return theme
+return M
diff --git a/readme.md b/readme.md
index db9452a..0e6f85d 100644
--- a/readme.md
+++ b/readme.md
@@ -17,7 +17,7 @@
 use({
     'rose-pine/neovim',
     as = 'rose-pine',
-    tag = 'v0.*',
+    tag = 'v1.*',
     config = function()
         vim.cmd('colorscheme rose-pine')
     end
@@ -47,7 +47,7 @@ use({
 ```lua
 use({
 	'nvim-lualine/lualine.nvim',
-	-- Fix mismatch palette between variants
+	-- fix mismatch palette between variants
 	event = 'ColorScheme',
 	config = function()
 		require('lualine').setup({
@@ -85,68 +85,43 @@ local colors = require("galaxyline.themes.colors")["rose-pine"]
 > Options should be set **before** colorscheme
 
 ```lua
--- set theme variant, matching terminal theme if unset
--- @usage 'main' | 'moon' | 'dawn'
-vim.g.rose_pine_variant = ''
+require('rose-pine').setup({
+	---@usage 'main'|'moon'
+	dark_variant = 'main',
+	bold_vert_split = false,
+	dim_nc_background = false,
+	disable_background = false,
+	disable_float_background = false,
+	disable_italics = false,
+	---@usage string hex value or named color from rosepinetheme.com/palette
+	groups = {
+		border = 'highlight_med',
+		comment = 'muted',
+		link = 'iris',
+		punctuation = 'subtle',
 
-vim.g.rose_pine_bold_vertical_split_line = false
-vim.g.rose_pine_disable_background = false
-vim.g.rose_pine_disable_float_background = false
-vim.g.rose_pine_disable_italics = false
-vim.g.rose_pine_inactive_background = false
+		error = 'love',
+		hint = 'iris',
+		info = 'foam',
+		warn = 'gold',
 
-local palette = require('rose-pine.palette')
-vim.g.rose_pine_colors = {
-	border = palette.highlight_med,
-	comment = palette.muted,
-	link = palette.iris,
-	punctuation = palette.subtle,
+		headings = {
+			h1 = 'iris',
+			h2 = 'foam',
+			h3 = 'rose',
+			h4 = 'gold',
+			h5 = 'pine',
+			h6 = 'foam',
+		}
+		-- or set all headings at once
+		-- headings = 'subtle'
+	}
+})
 
-	error = palette.love,
-	hint = palette.iris,
-	info = palette.foam,
-	warn = palette.gold,
-
-	git_add = palette.foam,
-	git_change = palette.rose,
-	git_delete = palette.love,
-	git_dirty = palette.rose,
-	git_ignore = palette.muted,
-	git_merge = palette.iris,
-	git_rename = palette.pine,
-	git_stage = palette.iris,
-	git_text = palette.rose,
-
-	-- or set all headings to one colour: `headings = palette.text`
-	headings = {
-		h1 = palette.iris,
-		h2 = palette.foam,
-		h3 = palette.rose,
-		h4 = palette.gold,
-		h5 = palette.pine,
-		h6 = palette.foam,
-	},
-}
-
--- Set colorscheme after options
+-- set colorscheme after options
 vim.cmd('colorscheme rose-pine')
 ```
 
-## Suggested keymaps
-
-```lua
--- toggle between all variants
-vim.keymap.set('n', '<leader>tt', require('rose-pine').toggle)
-
--- or toggle between some variants
-vim.keymap.set('n', '<leader>tt', function() return require('rose-pine').toggle({'moon', 'dawn'}) end)
-
--- set variant
-vim.keymap.set('n', '<leader>t1', function() return require('rose-pine').set('main') end)
-vim.keymap.set('n', '<leader>t2', function() return require('rose-pine').set('moon') end)
-vim.keymap.set('n', '<leader>t3', function() return require('rose-pine').set('dawn') end)
-```
-
 ## Contributing
 
 We welcome and appreciate any help in creating a lovely experience for all.

From 64c5952bc734802f7507beb18e853798c08341f0 Mon Sep 17 00:00:00 2001
From: Brian Di Palma <1597820+briandipalma@users.noreply.github.com>
Date: Mon, 14 Feb 2022 13:36:36 +0000
Subject: [PATCH 007/190] Update readme.md (#68)

---
 readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/readme.md b/readme.md
index 0e6f85d..7e72926 100644
--- a/readme.md
+++ b/readme.md
@@ -84,6 +84,8 @@ local colors = require("galaxyline.themes.colors")["rose-pine"]
 
 > Options should be set **before** colorscheme
 
+Variant now respects `vim.o.background`, using dawn when light (`vim.cmd("set background=light")`) and dark_variant when dark
+
 ```lua
 require('rose-pine').setup({
 	---@usage 'main'|'moon'

From 7c398c943c0621e2456b484ff19a8a98f6be6ff5 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Mon, 14 Feb 2022 09:43:34 -0600
Subject: [PATCH 008/190] Update readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 7e72926..7b374bb 100644
--- a/readme.md
+++ b/readme.md
@@ -32,7 +32,7 @@ use({
 - [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter)
 - [barbar.nvim](https://github.com/romgrk/barbar.nvim)
 - [gitsigns.nvim](https://github.com/lewis6991/gitsigns.nvim)
-- [mode.nvim](https://github.com/mvllow/modes.nvim)
+- [modes.nvim](https://github.com/mvllow/modes.nvim)
 - [nvim-tree.lua](https://github.com/kyazdani42/nvim-tree.lua)
 - [which-key.nvim](https://github.com/folke/which-key.nvim)
 - [indent-blankline.nvim](https://github.com/lukas-reineke/indent-blankline.nvim)

From 64986b857df14c75d31f62b91c57554a4e8bf797 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Mon, 14 Feb 2022 15:20:28 -0600
Subject: [PATCH 009/190] fix user options not being applied

closes #69
---
 lua/rose-pine/init.lua    |  7 ++++---
 lua/rose-pine/palette.lua |  5 +++--
 lua/rose-pine/theme.lua   | 16 ++++++++--------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lua/rose-pine/init.lua b/lua/rose-pine/init.lua
index 4e10311..3aee931 100644
--- a/lua/rose-pine/init.lua
+++ b/lua/rose-pine/init.lua
@@ -167,13 +167,14 @@ function M.colorscheme()
 
 	---@param color string
 	local function get_palette_color(color)
+		color = color:lower()
 		local p = require('rose-pine.palette')
 
-		if color and not color:find('#') then
-			return p[color:lower()]
+		if color and not color:find('#') and color ~= 'none' then
+			return p[color]
 		end
 
-		return color:lower()
+		return color
 	end
 
 	---@param group string
diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index ccb8b1c..03981f4 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -16,6 +16,7 @@ local variants = {
 		highlight_med = '#403d52',
 		highlight_high = '#524f67',
 		opacity = 0.1,
+		none = 'NONE',
 	},
 	moon = {
 		base = '#232136',
@@ -34,6 +35,7 @@ local variants = {
 		highlight_med = '#44415a',
 		highlight_high = '#56526e',
 		opacity = 0.1,
+		none = 'NONE',
 	},
 	dawn = {
 		base = '#faf4ed',
@@ -52,6 +54,7 @@ local variants = {
 		highlight_med = '#dfdad9',
 		highlight_high = '#cecacd',
 		opacity = 0.05,
+		none = 'NONE',
 	},
 }
 
@@ -63,6 +66,4 @@ else
 	palette = variants[(vim.g.rose_pine_variant == 'moon' and 'moon') or 'main']
 end
 
-vim.tbl_deep_extend('force', palette, { none = 'NONE' })
-
 return palette
diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 35b256a..d34c95b 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -8,12 +8,12 @@ function M.get(config)
 	local theme = {}
 	local groups = config.groups or {}
 	local styles = {
-		italic = (config.disable_italics and 'NONE') or 'italic',
-		vert_split = (config.bold_vert_split and p.surface) or p.none,
+		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,
-		nc_background = (config.dim_nc_background and p.surface) or p.base,
 	}
+	styles.nc_background = (config.dim_nc_background and p.surface) or styles.background
 
 	theme = {
 		ColorColumn = { bg = p.highlight_high },
@@ -65,15 +65,15 @@ function M.get(config)
 		SpellLocal = { sp = p.subtle, style = 'undercurl' },
 		SpellRare = { sp = p.subtle, style = 'undercurl' },
 		SignColumn = { fg = p.text, bg = styles.background },
-		StatusLine = { fg = p.subtle, bg = p.surface },
-		StatusLineNC = { fg = p.muted, bg = p.base },
+		StatusLine = { fg = p.subtle, bg = styles.float_background },
+		StatusLineNC = { fg = p.muted, bg = styles.background },
 		StatusLineTerm = { link = 'StatusLine' },
 		StatusLineTermNC = { link = 'StatusLineNC' },
-		TabLine = { fg = p.subtle, bg = p.surface },
-		TabLineFill = { bg = p.surface },
+		TabLine = { fg = p.subtle, bg = styles.float_background },
+		TabLineFill = { bg = styles.float_background },
 		TabLineSel = { fg = p.text, bg = p.overlay },
 		Title = { fg = p.text },
-		VertSplit = { fg = p.overlay, bg = styles.vert_split },
+		VertSplit = { fg = groups.border, bg = styles.vert_split },
 		Visual = { bg = p.highlight_med },
 		-- VisualNOS = {},
 		WarningMsg = { fg = p.gold },

From f3c534e4be0c8ce3515942df693a5d4aeb3c2bdf Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Tue, 15 Feb 2022 22:37:52 -0600
Subject: [PATCH 010/190] update punctuation colour

---
 lua/rose-pine/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine/init.lua b/lua/rose-pine/init.lua
index 3aee931..634254a 100644
--- a/lua/rose-pine/init.lua
+++ b/lua/rose-pine/init.lua
@@ -104,7 +104,7 @@ local config = {
 		border = 'highlight_med',
 		comment = 'muted',
 		link = 'iris',
-		punctuation = 'subtle',
+		punctuation = 'muted',
 
 		error = 'love',
 		hint = 'iris',

From 3fb07a770fc240fa929f87206cffed64fdb3ffdc Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Fri, 18 Feb 2022 11:13:00 -0600
Subject: [PATCH 011/190] fix named blend styles

ref #70
---
 lua/rose-pine/init.lua | 32 +++-----------------------------
 lua/rose-pine/util.lua | 42 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/lua/rose-pine/init.lua b/lua/rose-pine/init.lua
index 634254a..af5bae4 100644
--- a/lua/rose-pine/init.lua
+++ b/lua/rose-pine/init.lua
@@ -1,3 +1,5 @@
+local util = require('rose-pine.util')
+
 local M = {}
 local show_init_messages = true
 
@@ -165,37 +167,9 @@ function M.colorscheme()
 		show_init_messages = false
 	end
 
-	---@param color string
-	local function get_palette_color(color)
-		color = color:lower()
-		local p = require('rose-pine.palette')
-
-		if color and not color:find('#') and color ~= 'none' then
-			return p[color]
-		end
-
-		return color
-	end
-
-	---@param group string
-	---@param color table<string, string>
-	local function highlight(group, color)
-		local style = color.style and 'gui=' .. color.style or 'gui=NONE'
-		local fg = color.fg and 'guifg=' .. get_palette_color(color.fg) or 'guifg=NONE'
-		local bg = color.bg and 'guibg=' .. get_palette_color(color.bg) or 'guibg=NONE'
-		local sp = color.sp and 'guisp=' .. get_palette_color(color.sp) or ''
-
-		local hl = 'highlight ' .. group .. ' ' .. style .. ' ' .. fg .. ' ' .. bg .. ' ' .. sp
-
-		vim.cmd(hl)
-		if color.link then
-			vim.cmd('highlight! link ' .. group .. ' ' .. color.link)
-		end
-	end
-
 	local theme = require('rose-pine.theme').get(config)
 	for group, color in pairs(theme) do
-		highlight(group, color)
+		util.highlight(group, color)
 	end
 
 	require('rose-pine.galaxyline.theme')
diff --git a/lua/rose-pine/util.lua b/lua/rose-pine/util.lua
index 67b5e08..113d673 100644
--- a/lua/rose-pine/util.lua
+++ b/lua/rose-pine/util.lua
@@ -1,25 +1,39 @@
 local util = {}
 
-local function get_byte(value, offset)
+local function byte(value, offset)
 	return bit.band(bit.rshift(value, offset), 0xFF)
 end
 
-local function get_color(color)
+local function rgb(color)
 	color = vim.api.nvim_get_color_by_name(color)
 
 	if color == -1 then
 		color = vim.opt.background:get() == 'dark' and 000 or 255255255
 	end
 
-	return { get_byte(color, 16), get_byte(color, 8), get_byte(color, 0) }
+	return { byte(color, 16), byte(color, 8), byte(color, 0) }
+end
+
+local function parse_color(color)
+	if color == nil then
+		return print('invalid color')
+	end
+
+	color = color:lower()
+
+	if not color:find('#') and color ~= 'none' then
+		color = require('rose-pine.palette')[color] or vim.api.nvim_get_color_by_name(color)
+	end
+
+	return color
 end
 
 ---@param fg string foreground color
 ---@param bg string background color
 ---@param alpha number number between 0 (background) and 1 (foreground)
-function util.blend(fg, bg, alpha)
-	bg = get_color(bg)
-	fg = get_color(fg)
+util.blend = function(fg, bg, alpha)
+	fg = rgb(parse_color(fg))
+	bg = rgb(parse_color(bg))
 
 	local function blend_channel(i)
 		local ret = (alpha * fg[i] + ((1 - alpha) * bg[i]))
@@ -29,4 +43,20 @@ function util.blend(fg, bg, alpha)
 	return string.format('#%02X%02X%02X', blend_channel(1), blend_channel(2), blend_channel(3))
 end
 
+---@param group string
+---@param color table<string, string>
+util.highlight = function(group, color)
+	local style = color.style and 'gui=' .. color.style or 'gui=NONE'
+	local fg = color.fg and 'guifg=' .. parse_color(color.fg) or 'guifg=NONE'
+	local bg = color.bg and 'guibg=' .. parse_color(color.bg) or 'guibg=NONE'
+	local sp = color.sp and 'guisp=' .. parse_color(color.sp) or ''
+
+	vim.cmd(string.format('highlight %s %s %s %s %s', group, style, fg, bg, sp))
+
+	if color.link then
+		vim.cmd(string.format('highlight! link %s %s', group, color.link))
+		-- vim.cmd('highlight! link ' .. group .. ' ' .. color.link)
+	end
+end
+
 return util

From 2dea84a91f6ee4d9212002ab296a137cc2d87581 Mon Sep 17 00:00:00 2001
From: Will Leinweber <will@users.noreply.github.com>
Date: Wed, 9 Mar 2022 19:21:17 -0800
Subject: [PATCH 012/190] fix: Re-add nvim-notify highlights (#72) (#72)

---
 lua/rose-pine/theme.lua | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index d34c95b..33df757 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -402,6 +402,23 @@ function M.get(config)
 		TelescopeSelection = { fg = p.text, bg = p.overlay },
 		TelescopeSelectionCaret = { fg = p.rose, bg = p.overlay },
 		TelescopeTitle = { fg = p.subtle },
+
+		-- rcarriga/nvim-notify
+		NotifyINFOBorder = { fg = p.foam },
+		NotifyINFOTitle = { link = 'NotifyINFOBorder' },
+		NotifyINFOIcon = { link = 'NotifyINFOBorder' },
+		NotifyWARNBorder = { fg = p.gold },
+		NotifyWARNTitle = { link = 'NotifyWARNBorder' },
+		NotifyWARNIcon = { link = 'NotifyWARNBorder' },
+		NotifyDEBUGBorder = { fg = p.muted },
+		NotifyDEBUGTitle = { link = 'NotifyDEBUGBorder' },
+		NotifyDEBUGIcon = { link = 'NotifyDEBUGBorder' },
+		NotifyTRACEBorder = { fg = p.iris },
+		NotifyTRACETitle = { link = 'NotifyTRACEBorder' },
+		NotifyTRACEIcon = { link = 'NotifyTRACEBorder' },
+		NotifyERRORBorder = { fg = p.love },
+		NotifyERRORTitle = { link = 'NotifyERRORBorder' },
+		NotifyERRORIcon = { link = 'NotifyERRORBorder' },
 	}
 
 	vim.g.terminal_color_0 = p.overlay -- black

From 1346db5bde790358c49d85a3ecd65a6bbf58312a Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Thu, 17 Mar 2022 13:41:33 -0400
Subject: [PATCH 013/190] add `groups.background` and `groups.panel`

closes #73
---
 lua/rose-pine/init.lua  |  2 ++
 lua/rose-pine/theme.lua | 34 +++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

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 },

From 2f7d4584141a3c9dbaf0f33cc061dd61730920a7 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Thu, 17 Mar 2022 13:42:41 -0400
Subject: [PATCH 014/190] docs: add `groups.background` and `groups.panel`

---
 readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/readme.md b/readme.md
index 7b374bb..d7769a6 100644
--- a/readme.md
+++ b/readme.md
@@ -97,6 +97,8 @@ require('rose-pine').setup({
 	disable_italics = false,
 	---@usage string hex value or named color from rosepinetheme.com/palette
 	groups = {
+		background = 'base',
+		panel = 'surface',
 		border = 'highlight_med',
 		comment = 'muted',
 		link = 'iris',

From e153a6b7eb90965014b42cd8455ff33d17f6b425 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Fri, 1 Apr 2022 11:28:34 -0500
Subject: [PATCH 015/190] add highlight groups (#74)

---
 lua/rose-pine/init.lua | 7 ++++++-
 readme.md              | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lua/rose-pine/init.lua b/lua/rose-pine/init.lua
index 364952c..8b3a2c1 100644
--- a/lua/rose-pine/init.lua
+++ b/lua/rose-pine/init.lua
@@ -134,6 +134,7 @@ local config = {
 			h6 = 'foam',
 		},
 	},
+	highlight_groups = {},
 }
 
 ---@param opts RosePineConfig
@@ -171,7 +172,11 @@ function M.colorscheme()
 
 	local theme = require('rose-pine.theme').get(config)
 	for group, color in pairs(theme) do
-		util.highlight(group, color)
+		if config.highlight_groups[group] ~= nil then
+			util.highlight(group, config.highlight_groups[group])
+		else
+			util.highlight(group, color)
+		end
 	end
 
 	require('rose-pine.galaxyline.theme')
diff --git a/readme.md b/readme.md
index d7769a6..d850687 100644
--- a/readme.md
+++ b/readme.md
@@ -119,6 +119,10 @@ require('rose-pine').setup({
 		}
 		-- or set all headings at once
 		-- headings = 'subtle'
+	},
+	-- Change specific vim highlight groups
+	highlight_groups = {
+		ColorColumn = { bg = 'rose' }
 	}
 })
 

From 49647d12b48dc4052512897e06828ef63201096d Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sat, 9 Apr 2022 16:27:39 -0400
Subject: [PATCH 016/190] docs: update readme

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index d850687..cbffaa3 100644
--- a/readme.md
+++ b/readme.md
@@ -84,7 +84,7 @@ local colors = require("galaxyline.themes.colors")["rose-pine"]
 
 > Options should be set **before** colorscheme
 
-Variant now respects `vim.o.background`, using dawn when light (`vim.cmd("set background=light")`) and dark_variant when dark
+Variant respects `vim.o.background`, using dawn when light and `dark_variant` when dark
 
 ```lua
 require('rose-pine').setup({

From b10a5c3432f4d2507bb6f205b66962e94e2e0e08 Mon Sep 17 00:00:00 2001
From: Fitrah Muhammad <55179750+fitrh@users.noreply.github.com>
Date: Mon, 11 Apr 2022 22:19:35 +0800
Subject: [PATCH 017/190] add `LspReferenceXXX` highlight group (#75)

---
 lua/rose-pine/theme.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index d0da065..b798bb6 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -240,6 +240,11 @@ function M.get(config)
 		TSVariable = { fg = p.text, style = styles.italic },
 		TSVariableBuiltin = { fg = p.love },
 
+		-- vim.lsp.buf.document_highlight()
+		LspReferenceText = { bg = p.highlight_med },
+		LspReferenceRead = { bg = p.highlight_med },
+		LspReferenceWrite = { bg = p.highlight_med },
+
 		-- romgrk/barbar.nvim
 		BufferCurrent = { fg = p.text, bg = p.overlay },
 		BufferCurrentIndex = { fg = p.text, bg = p.overlay },

From c38b23c02226fe0d8bae64f991dca8e610794803 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Fri, 15 Apr 2022 09:16:03 -0400
Subject: [PATCH 018/190] add toggleterm highlights and initial bufferline
 highlights (#77)

---
 lua/rose-pine/plugins/bufferline.lua | 212 +++++++++++++++++++++++++++
 lua/rose-pine/plugins/toggleterm.lua |  14 ++
 readme.md                            |  29 ++++
 3 files changed, 255 insertions(+)
 create mode 100644 lua/rose-pine/plugins/bufferline.lua
 create mode 100644 lua/rose-pine/plugins/toggleterm.lua

diff --git a/lua/rose-pine/plugins/bufferline.lua b/lua/rose-pine/plugins/bufferline.lua
new file mode 100644
index 0000000..c95bc92
--- /dev/null
+++ b/lua/rose-pine/plugins/bufferline.lua
@@ -0,0 +1,212 @@
+---Rosé Pine
+---@plugin akinsho/bufferline.nvim
+---@usage
+---	local highlights = require('rose-pine.plugins.bufferline')
+---	require('bufferline').setup({ highlights = highlights })
+
+local p = require('rose-pine.palette')
+
+return {
+	-- fill = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- background = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- tab = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- tab_selected = {
+	-- 	guifg = tabline_sel_bg,
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- tab_close = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- close_button = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- close_button_visible = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- close_button_selected = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	buffer_visible = {
+		guifg = p.subtle,
+		guibg = p.base,
+	},
+	buffer_selected = {
+		guifg = p.text,
+		guibg = p.surface,
+		gui = 'bold,italic',
+	},
+	-- diagnostic = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- diagnostic_visible = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- diagnostic_selected = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- 	gui = 'bold,italic',
+	-- },
+	-- info = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guisp = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- info_visible = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- info_selected = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- 	gui = 'bold,italic',
+	-- 	guisp = '<color-value-here>',
+	-- },
+	-- info_diagnostic = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guisp = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- info_diagnostic_visible = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- info_diagnostic_selected = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- 	gui = 'bold,italic',
+	-- 	guisp = '<color-value-here>',
+	-- },
+	-- warning = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guisp = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- warning_visible = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- warning_selected = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- 	gui = 'bold,italic',
+	-- 	guisp = '<color-value-here>',
+	-- },
+	-- warning_diagnostic = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guisp = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- warning_diagnostic_visible = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- warning_diagnostic_selected = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- 	gui = 'bold,italic',
+	-- 	guisp = warning_diagnostic_fg,
+	-- },
+	-- error = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- 	guisp = '<color-value-here>',
+	-- },
+	-- error_visible = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- error_selected = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- 	gui = 'bold,italic',
+	-- 	guisp = '<color-value-here>',
+	-- },
+	-- error_diagnostic = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- 	guisp = '<color-value-here>',
+	-- },
+	-- error_diagnostic_visible = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- error_diagnostic_selected = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- 	gui = 'bold,italic',
+	-- 	guisp = '<color-value-here>',
+	-- },
+	-- modified = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- modified_visible = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- modified_selected = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- duplicate_selected = {
+	-- 	guifg = '<color-value-here>',
+	-- 	gui = 'italic',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- duplicate_visible = {
+	-- 	guifg = '<color-value-here>',
+	-- 	gui = 'italic',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- duplicate = {
+	-- 	guifg = '<color-value-here>',
+	-- 	gui = 'italic',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- separator_selected = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- separator_visible = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- separator = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- indicator_selected = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- },
+	-- pick_selected = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- 	gui = 'bold,italic',
+	-- },
+	-- pick_visible = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- 	gui = 'bold,italic',
+	-- },
+	-- pick = {
+	-- 	guifg = '<color-value-here>',
+	-- 	guibg = '<color-value-here>',
+	-- 	gui = 'bold,italic',
+	-- },
+}
diff --git a/lua/rose-pine/plugins/toggleterm.lua b/lua/rose-pine/plugins/toggleterm.lua
new file mode 100644
index 0000000..d73bd18
--- /dev/null
+++ b/lua/rose-pine/plugins/toggleterm.lua
@@ -0,0 +1,14 @@
+---Rosé Pine
+---@plugin akinsho/toggleterm.nvim
+---@usage
+---	local highlights = require('rose-pine.plugins.toggleterm')
+---	require('toggleterm').setup({ highlights = highlights })
+
+return {
+	Normal = { link = 'Normal' },
+	NormalFloat = { link = 'Normal' },
+	FloatBorder = { link = 'FloatBorder' },
+	SignColumn = { link = 'SignColumn' },
+	StatusLine = { link = 'StatusLine' },
+	StatusLineNC = { link = 'StatusLineNC' },
+}
diff --git a/readme.md b/readme.md
index cbffaa3..ec02bf1 100644
--- a/readme.md
+++ b/readme.md
@@ -66,6 +66,35 @@ use({
 local colors = require("galaxyline.themes.colors")["rose-pine"]
 ```
 
+- [bufferline.nvim](https://github.com/akinsho/bufferline.nvim)
+
+> PR's welcome to improve support
+
+```lua
+use({
+	'akinsho/bufferline.nvim',
+	event = 'ColorScheme',
+	config = function()
+		local highlights = require('rose-pine.plugins.bufferline')
+		require('bufferline').setup({ highlights = highlights })
+	end
+})
+```
+
+- [toggleterm.nvim](https://github.com/akinsho/toggleterm.nvim)
+
+```lua
+require('toggleterm').setup({ highlights = highlights })
+use({
+	'akinsho/toggleterm.nvim',
+	event = 'ColorScheme',
+	config = function()
+		local highlights = require('rose-pine.plugins.toggleterm')
+		require('toggleterm').setup({ highlights = highlights })
+	end
+})
+```
+
 ## Gallery
 
 **Rosé Pine**

From 853112468d7ed32dd8cf0f2a501233443a499d2c Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Fri, 15 Apr 2022 13:02:57 -0400
Subject: [PATCH 019/190] docs: remove duplicated usage

---
 readme.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/readme.md b/readme.md
index ec02bf1..f301faa 100644
--- a/readme.md
+++ b/readme.md
@@ -84,7 +84,6 @@ use({
 - [toggleterm.nvim](https://github.com/akinsho/toggleterm.nvim)
 
 ```lua
-require('toggleterm').setup({ highlights = highlights })
 use({
 	'akinsho/toggleterm.nvim',
 	event = 'ColorScheme',

From de2a00774d8d551cace9b4671206b34360a145d6 Mon Sep 17 00:00:00 2001
From: Will Leinweber <will@users.noreply.github.com>
Date: Tue, 19 Apr 2022 07:07:45 -0700
Subject: [PATCH 020/190] chore: move image to github cdn (#78)

---
 readme.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/readme.md b/readme.md
index f301faa..70c6d57 100644
--- a/readme.md
+++ b/readme.md
@@ -26,7 +26,7 @@ use({
 
 ## Plugins
 
-> PR's are more than welcome if your favourite plugin is missing
+> PRs are more than welcome if your favourite plugin is missing
 
 - [neovim diagnostics](https://neovim.io/doc/user/lsp.html)
 - [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter)
@@ -98,15 +98,15 @@ use({
 
 **Rosé Pine**
 
-![Rosé Pine with Neovim](assets/rose-pine.png)
+![Rosé Pine with Neovim](https://user-images.githubusercontent.com/1973/163921570-0f577baf-3199-4f09-9779-a7eb9238151a.png)
 
 **Rosé Pine Moon**
 
-![Rosé Pine Moon with Neovim](assets/rose-pine-moon.png)
+![Rosé Pine Moon with Neovim](https://user-images.githubusercontent.com/1973/163921620-d3acd0d2-d227-4d28-a5e8-97ff22e56c6d.png)
 
 **Rosé Pine Dawn**
 
-![Rosé Pine Dawn with Neovim](assets/rose-pine-dawn.png)
+![Rosé Pine Dawn with Neovim](https://user-images.githubusercontent.com/1973/163921656-644a2db3-c55c-4e89-9bdd-39cdd7a2681b.png)
 
 ## Options
 

From c68bfa077bc871c364a8595309a602bcd5f52e2e Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Tue, 19 Apr 2022 09:09:57 -0500
Subject: [PATCH 021/190] Update readme.md

---
 readme.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/readme.md b/readme.md
index 70c6d57..3769c6d 100644
--- a/readme.md
+++ b/readme.md
@@ -68,8 +68,6 @@ local colors = require("galaxyline.themes.colors")["rose-pine"]
 
 - [bufferline.nvim](https://github.com/akinsho/bufferline.nvim)
 
-> PR's welcome to improve support
-
 ```lua
 use({
 	'akinsho/bufferline.nvim',

From 1ef267ddccc67b7bd4e98701943367d606e51fa2 Mon Sep 17 00:00:00 2001
From: Fitrah Muhammad <55179750+fitrh@users.noreply.github.com>
Date: Tue, 26 Apr 2022 04:32:28 +0800
Subject: [PATCH 022/190] add `LspCodelensXXX` highlight group (#80)

---
 lua/rose-pine/theme.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index b798bb6..4d0e9c5 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -245,6 +245,10 @@ function M.get(config)
 		LspReferenceRead = { bg = p.highlight_med },
 		LspReferenceWrite = { bg = p.highlight_med },
 
+		-- lsp-highlight-codelens
+		LspCodeLens = { fg = p.subtle }, -- virtual text of code lens
+		LspCodeLensSeparator = { fg = p.highlight_high }, -- separator between two or more code lens
+
 		-- romgrk/barbar.nvim
 		BufferCurrent = { fg = p.text, bg = p.overlay },
 		BufferCurrentIndex = { fg = p.text, bg = p.overlay },

From 15894e3f213928ff97ba8d120172ffa4504a311c Mon Sep 17 00:00:00 2001
From: Will Leinweber <will@users.noreply.github.com>
Date: Fri, 6 May 2022 11:34:05 -0500
Subject: [PATCH 023/190] Add `CurSearch` highlight group (#81)

---
 lua/rose-pine/theme.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 4d0e9c5..ae2b729 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -18,6 +18,7 @@ function M.get(config)
 	theme = {
 		ColorColumn = { bg = p.highlight_high },
 		Conceal = { bg = p.none },
+		CurSearch = { link = 'IncSearch' },
 		-- Cursor = {},
 		CursorColumn = { bg = p.highlight_low },
 		-- CursorIM = {},

From aeec916cbaebe3387af60b96ccf053049720262d Mon Sep 17 00:00:00 2001
From: fvrests <fvrests@icloud.com>
Date: Sat, 14 May 2022 11:58:12 -0400
Subject: [PATCH 024/190] link to packer.nvim

---
 readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/readme.md b/readme.md
index 3769c6d..a65216d 100644
--- a/readme.md
+++ b/readme.md
@@ -13,6 +13,8 @@
 
 ## Usage
 
+> With [packer.nvim](https://github.com/wbthomason/packer.nvim)
+
 ```lua
 use({
     'rose-pine/neovim',

From 23685a0a2e011fbc6a046f88869bda48a95c2cae Mon Sep 17 00:00:00 2001
From: crows <nanozuki.crows@gmail.com>
Date: Thu, 2 Jun 2022 23:07:52 +0800
Subject: [PATCH 025/190] feat: improve contrast of the `FloatTitle` (#83)

---
 lua/rose-pine/theme.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index ae2b729..1a029d1 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -37,6 +37,7 @@ function M.get(config)
 		-- EndOfBuffer = {},
 		ErrorMsg = { fg = p.love, style = 'bold' },
 		FloatBorder = { fg = groups.border },
+		FloatTitle = { fg = p.muted },
 		FoldColumn = { fg = p.muted },
 		Folded = { fg = p.text, bg = groups.panel },
 		IncSearch = { fg = p.base, bg = p.rose },

From a60b0e6581b51758a9b7007eb3481bb9d58d914b Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Tue, 14 Jun 2022 11:34:50 -0400
Subject: [PATCH 026/190] feat: support `WildMenu`

---
 lua/rose-pine/theme.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 1a029d1..b9bff01 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -80,7 +80,7 @@ function M.get(config)
 		-- VisualNOS = {},
 		WarningMsg = { fg = p.gold },
 		-- Whitespace = {},
-		-- WildMenu = {},
+		WildMenu = { link = 'IncSearch' },
 
 		Boolean = { fg = p.rose },
 		Character = { fg = p.gold },

From bc07e549245e0c4ea844a839381693b9c55c9e8a Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Tue, 14 Jun 2022 11:59:22 -0400
Subject: [PATCH 027/190] chore: reduce contrast of `ColorColumn`

To override highlights: https://github.com/rose-pine/neovim#options
---
 lua/rose-pine/theme.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index b9bff01..faf258d 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -16,7 +16,7 @@ function M.get(config)
 	styles.nc_background = (config.dim_nc_background and groups.panel) or styles.background
 
 	theme = {
-		ColorColumn = { bg = p.highlight_high },
+		ColorColumn = { bg = p.overlay },
 		Conceal = { bg = p.none },
 		CurSearch = { link = 'IncSearch' },
 		-- Cursor = {},

From 4a3b4512fce47b0acc5932eab95f538e6d9f5340 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Thu, 16 Jun 2022 00:38:30 -0400
Subject: [PATCH 028/190] refactor: format and remove unused values

- update format rules
- update plugin file headers
- remove unused opacity from palette
---
 .editorconfig                        | 12 ++++++++++++
 .stylua.toml                         |  4 +---
 lua/rose-pine/palette.lua            |  3 ---
 lua/rose-pine/plugins/bufferline.lua | 13 +++++++------
 lua/rose-pine/plugins/toggleterm.lua | 11 ++++++-----
 lua/rose-pine/theme.lua              |  9 ++++++---
 lua/rose-pine/util.lua               | 11 ++++++++---
 7 files changed, 40 insertions(+), 23 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..7fc8038
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.lua]
+indent_size = 3
+indent_style = tab
diff --git a/.stylua.toml b/.stylua.toml
index 48e35ae..9d5f247 100644
--- a/.stylua.toml
+++ b/.stylua.toml
@@ -1,6 +1,4 @@
-column_width = 100
+column_width = 80
 indent_type = "Tabs"
-indent_width = 3
 line_endings = "Unix"
 quote_style = "AutoPreferSingle"
-
diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index 03981f4..d98eaec 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -15,7 +15,6 @@ local variants = {
 		highlight_low = '#21202e',
 		highlight_med = '#403d52',
 		highlight_high = '#524f67',
-		opacity = 0.1,
 		none = 'NONE',
 	},
 	moon = {
@@ -34,7 +33,6 @@ local variants = {
 		highlight_low = '#2a283e',
 		highlight_med = '#44415a',
 		highlight_high = '#56526e',
-		opacity = 0.1,
 		none = 'NONE',
 	},
 	dawn = {
@@ -53,7 +51,6 @@ local variants = {
 		highlight_low = '#f4ede8',
 		highlight_med = '#dfdad9',
 		highlight_high = '#cecacd',
-		opacity = 0.05,
 		none = 'NONE',
 	},
 }
diff --git a/lua/rose-pine/plugins/bufferline.lua b/lua/rose-pine/plugins/bufferline.lua
index c95bc92..118b871 100644
--- a/lua/rose-pine/plugins/bufferline.lua
+++ b/lua/rose-pine/plugins/bufferline.lua
@@ -1,8 +1,9 @@
----Rosé Pine
----@plugin akinsho/bufferline.nvim
----@usage
----	local highlights = require('rose-pine.plugins.bufferline')
----	require('bufferline').setup({ highlights = highlights })
+--- Rosé Pine for bufferline
+--- https://github.com/akinsho/bufferline.nvim
+---
+--- @usage
+--- local highlights = require('rose-pine.plugins.bufferline')
+--- require('bufferline').setup({ highlights = highlights })
 
 local p = require('rose-pine.palette')
 
@@ -20,7 +21,7 @@ return {
 	-- 	guibg = '<color-value-here>',
 	-- },
 	-- tab_selected = {
-	-- 	guifg = tabline_sel_bg,
+	-- 	guifg = '<color-value-here>',
 	-- 	guibg = '<color-value-here>',
 	-- },
 	-- tab_close = {
diff --git a/lua/rose-pine/plugins/toggleterm.lua b/lua/rose-pine/plugins/toggleterm.lua
index d73bd18..38924f9 100644
--- a/lua/rose-pine/plugins/toggleterm.lua
+++ b/lua/rose-pine/plugins/toggleterm.lua
@@ -1,8 +1,9 @@
----Rosé Pine
----@plugin akinsho/toggleterm.nvim
----@usage
----	local highlights = require('rose-pine.plugins.toggleterm')
----	require('toggleterm').setup({ highlights = highlights })
+--- Rosé Pine for toggleterm
+--- https://github.com/akinsho/toggleterm.nvim
+---
+--- @usage
+--- local highlights = require('rose-pine.plugins.toggleterm')
+--- require('toggleterm').setup({ highlights = highlights })
 
 return {
 	Normal = { link = 'Normal' },
diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index faf258d..16a8c3c 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -10,10 +10,13 @@ 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 groups.background,
-		float_background = (config.disable_float_background and p.none) or groups.panel,
+		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 groups.panel) or styles.background
+	styles.nc_background = (config.dim_nc_background and groups.panel)
+		or styles.background
 
 	theme = {
 		ColorColumn = { bg = p.overlay },
diff --git a/lua/rose-pine/util.lua b/lua/rose-pine/util.lua
index 113d673..2bfdf85 100644
--- a/lua/rose-pine/util.lua
+++ b/lua/rose-pine/util.lua
@@ -22,7 +22,8 @@ local function parse_color(color)
 	color = color:lower()
 
 	if not color:find('#') and color ~= 'none' then
-		color = require('rose-pine.palette')[color] or vim.api.nvim_get_color_by_name(color)
+		color = require('rose-pine.palette')[color]
+			or vim.api.nvim_get_color_by_name(color)
 	end
 
 	return color
@@ -40,7 +41,12 @@ util.blend = function(fg, bg, alpha)
 		return math.floor(math.min(math.max(0, ret), 255) + 0.5)
 	end
 
-	return string.format('#%02X%02X%02X', blend_channel(1), blend_channel(2), blend_channel(3))
+	return string.format(
+		'#%02X%02X%02X',
+		blend_channel(1),
+		blend_channel(2),
+		blend_channel(3)
+	)
 end
 
 ---@param group string
@@ -55,7 +61,6 @@ util.highlight = function(group, color)
 
 	if color.link then
 		vim.cmd(string.format('highlight! link %s %s', group, color.link))
-		-- vim.cmd('highlight! link ' .. group .. ' ' .. color.link)
 	end
 end
 

From c3762c935ea442153acde8a691a805c45e0d597f Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Thu, 16 Jun 2022 00:39:24 -0400
Subject: [PATCH 029/190] refactor!: move galaxyline theme to
 `rose-pine.plugins.galaxyline`

---
 lua/rose-pine/galaxyline/theme.lua   | 19 -------------------
 lua/rose-pine/plugins/galaxyline.lua | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 19 deletions(-)
 delete mode 100644 lua/rose-pine/galaxyline/theme.lua
 create mode 100644 lua/rose-pine/plugins/galaxyline.lua

diff --git a/lua/rose-pine/galaxyline/theme.lua b/lua/rose-pine/galaxyline/theme.lua
deleted file mode 100644
index 1183aa9..0000000
--- a/lua/rose-pine/galaxyline/theme.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-local present, galaxyline_colors = pcall(require, 'galaxyline.themes.colors')
-if not present then
-	return
-end
-
-local p = require('rose-pine.palette')
-
-galaxyline_colors['rose-pine'] = {
-	bg = p.overlay,
-	fg = p.text,
-	fg_alt = p.subtle,
-	blue = p.foam,
-	cyan = p.foam,
-	green = p.muted,
-	magenta = p.iris,
-	orange = p.rose,
-	red = p.love,
-	yellow = p.gold,
-}
diff --git a/lua/rose-pine/plugins/galaxyline.lua b/lua/rose-pine/plugins/galaxyline.lua
new file mode 100644
index 0000000..348559a
--- /dev/null
+++ b/lua/rose-pine/plugins/galaxyline.lua
@@ -0,0 +1,20 @@
+--- Rosé Pine for galaxyline fork
+--- https://github.com/NTBBloodbath/galaxyline.nvim
+---
+--- @usage
+--- local highlights = require('rose-pine.plugins.galaxyline')
+
+local p = require('rose-pine.palette')
+
+return {
+	bg = p.surface,
+	fg = p.text,
+	fg_alt = p.subtle,
+	yellow = p.gold,
+	cyan = p.rose,
+	green = p.pine,
+	orange = p.muted,
+	magenta = p.iris,
+	blue = p.foam,
+	red = p.love,
+}

From c253ca25860a36f35f71d1b492a6a1071df4f1ce Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Thu, 16 Jun 2022 00:40:54 -0400
Subject: [PATCH 030/190] docs: move supported plugins to the wiki

---
 readme.md | 74 ++++---------------------------------------------------
 1 file changed, 5 insertions(+), 69 deletions(-)

diff --git a/readme.md b/readme.md
index a65216d..a896d02 100644
--- a/readme.md
+++ b/readme.md
@@ -26,73 +26,7 @@ use({
 })
 ```
 
-## Plugins
-
-> PRs are more than welcome if your favourite plugin is missing
-
-- [neovim diagnostics](https://neovim.io/doc/user/lsp.html)
-- [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter)
-- [barbar.nvim](https://github.com/romgrk/barbar.nvim)
-- [gitsigns.nvim](https://github.com/lewis6991/gitsigns.nvim)
-- [modes.nvim](https://github.com/mvllow/modes.nvim)
-- [nvim-tree.lua](https://github.com/kyazdani42/nvim-tree.lua)
-- [which-key.nvim](https://github.com/folke/which-key.nvim)
-- [indent-blankline.nvim](https://github.com/lukas-reineke/indent-blankline.nvim)
-- [neogit](https://github.com/TimUntersberger/neogit)
-- [neorg](https://github.com/nvim-neorg/neorg)
-- [lspsaga.nvim](https://github.com/tami5/lspsaga.nvim)
-- [pounce.nvim](https://github.com/rlane/pounce.nvim)
-- [telescope.nvim](https://github.com/nvim-telescope/telescope.nvim)
-- [nvim-notify](https://github.com/rcarriga/nvim-notify)
-- [lualine.nvim](https://github.com/nvim-lualine/lualine.nvim)
-
-```lua
-use({
-	'nvim-lualine/lualine.nvim',
-	-- fix mismatch palette between variants
-	event = 'ColorScheme',
-	config = function()
-		require('lualine').setup({
-			options = {
-				---@usage 'rose-pine' | 'rose-pine-alt'
-				theme = 'rose-pine'
-			}
-		})
-	end
-})
-```
-
-- [galaxyline.nvim fork](https://github.com/NTBBloodbath/galaxyline.nvim)
-
-```lua
-local colors = require("galaxyline.themes.colors")["rose-pine"]
-```
-
-- [bufferline.nvim](https://github.com/akinsho/bufferline.nvim)
-
-```lua
-use({
-	'akinsho/bufferline.nvim',
-	event = 'ColorScheme',
-	config = function()
-		local highlights = require('rose-pine.plugins.bufferline')
-		require('bufferline').setup({ highlights = highlights })
-	end
-})
-```
-
-- [toggleterm.nvim](https://github.com/akinsho/toggleterm.nvim)
-
-```lua
-use({
-	'akinsho/toggleterm.nvim',
-	event = 'ColorScheme',
-	config = function()
-		local highlights = require('rose-pine.plugins.toggleterm')
-		require('toggleterm').setup({ highlights = highlights })
-	end
-})
-```
+_Supported plugins are listed in the [wiki](https://github.com/rose-pine/neovim/wiki#supported-plugins)_
 
 ## Gallery
 
@@ -116,14 +50,15 @@ Variant respects `vim.o.background`, using dawn when light and `dark_variant` wh
 
 ```lua
 require('rose-pine').setup({
-	---@usage 'main'|'moon'
+	--- @usage 'main' | 'moon'
 	dark_variant = 'main',
 	bold_vert_split = false,
 	dim_nc_background = false,
 	disable_background = false,
 	disable_float_background = false,
 	disable_italics = false,
-	---@usage string hex value or named color from rosepinetheme.com/palette
+
+	--- @usage string hex value or named color from rosepinetheme.com/palette
 	groups = {
 		background = 'base',
 		panel = 'surface',
@@ -148,6 +83,7 @@ require('rose-pine').setup({
 		-- or set all headings at once
 		-- headings = 'subtle'
 	},
+
 	-- Change specific vim highlight groups
 	highlight_groups = {
 		ColorColumn = { bg = 'rose' }

From b0724442eb17bab87789a6ddedfdf45126250e60 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Thu, 16 Jun 2022 00:43:46 -0400
Subject: [PATCH 031/190] refactor: remove deprecation messages

---
 lua/rose-pine.lua      |  85 +++++++++++++++++++
 lua/rose-pine/init.lua | 185 -----------------------------------------
 2 files changed, 85 insertions(+), 185 deletions(-)
 create mode 100644 lua/rose-pine.lua
 delete mode 100644 lua/rose-pine/init.lua

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
new file mode 100644
index 0000000..0fa9c0a
--- /dev/null
+++ b/lua/rose-pine.lua
@@ -0,0 +1,85 @@
+local util = require('rose-pine.util')
+
+local M = {}
+
+local config = {
+	bold_vert_split = false,
+	dark_variant = 'main',
+	dim_nc_background = false,
+	disable_background = false,
+	disable_float_background = false,
+	disable_italics = false,
+
+	groups = {
+		background = 'base',
+		panel = 'surface',
+		border = 'highlight_med',
+		comment = 'muted',
+		link = 'iris',
+		punctuation = 'muted',
+
+		error = 'love',
+		hint = 'iris',
+		info = 'foam',
+		warn = 'gold',
+
+		git_add = 'foam',
+		git_change = 'rose',
+		git_delete = 'love',
+		git_dirty = 'rose',
+		git_ignore = 'muted',
+		git_merge = 'iris',
+		git_rename = 'pine',
+		git_stage = 'iris',
+		git_text = 'rose',
+
+		headings = {
+			h1 = 'iris',
+			h2 = 'foam',
+			h3 = 'rose',
+			h4 = 'gold',
+			h5 = 'pine',
+			h6 = 'foam',
+		},
+	},
+	highlight_groups = {},
+}
+
+function M.setup(opts)
+	opts = opts or {}
+	vim.g.rose_pine_variant = opts.dark_variant or 'main'
+
+	if opts.groups and type(opts.groups.headings) == 'string' then
+		opts.groups.headings = {
+			h1 = opts.groups.headings,
+			h2 = opts.groups.headings,
+			h3 = opts.groups.headings,
+			h4 = opts.groups.headings,
+			h5 = opts.groups.headings,
+			h6 = opts.groups.headings,
+		}
+	end
+
+	config.user_variant = opts.dark_variant or nil
+	config = vim.tbl_deep_extend('force', config, opts)
+end
+
+function M.colorscheme()
+	if vim.g.colors_name then
+		vim.cmd('hi clear')
+	end
+
+	vim.opt.termguicolors = true
+	vim.g.colors_name = 'rose-pine'
+
+	local theme = require('rose-pine.theme').get(config)
+	for group, color in pairs(theme) do
+		if config.highlight_groups[group] ~= nil then
+			util.highlight(group, config.highlight_groups[group])
+		else
+			util.highlight(group, color)
+		end
+	end
+end
+
+return M
diff --git a/lua/rose-pine/init.lua b/lua/rose-pine/init.lua
deleted file mode 100644
index 8b3a2c1..0000000
--- a/lua/rose-pine/init.lua
+++ /dev/null
@@ -1,185 +0,0 @@
-local util = require('rose-pine.util')
-
-local M = {}
-local show_init_messages = true
-
-local function check_for_deprecated_opts()
-	local alerts = {}
-	local should_alert = false
-
-	-- Deprecated options
-	if vim.g.rose_pine_bold_vertical_split_line ~= nil then
-		should_alert = true
-		table.insert(alerts, 'vim.g.rose_pine_bold_vertical_split_line renamed to bold_vert_split')
-	end
-
-	if vim.g.rose_pine_inactive_background ~= nil then
-		should_alert = true
-		table.insert(alerts, 'vim.g.rose_pine_inactive_background renamed to dim_nc_background')
-	end
-
-	if vim.g.rose_pine_disable_background ~= nil then
-		should_alert = true
-		table.insert(alerts, 'vim.g.rose_pine_disable_background renamed to disable_background')
-	end
-
-	if vim.g.rose_pine_disable_float_background ~= nil then
-		should_alert = true
-		table.insert(
-			alerts,
-			'vim.g.rose_pine_disable_float_background renamed to disable_float_background'
-		)
-	end
-
-	if vim.g.rose_pine_disable_italics ~= nil then
-		should_alert = true
-		table.insert(alerts, 'vim.g.rose_pine_disable_italics renamed to disable_italics')
-	end
-
-	if vim.g.rose_pine_colors ~= nil then
-		should_alert = true
-		table.insert(alerts, 'vim.g.rose_pine_colors renamed to groups')
-	end
-
-	if should_alert then
-		local prefix = '   '
-		print('Rosé Pine – https://github.com/rose-pine/neovim')
-		print(prefix .. 'vim.g.rose_pine_<option> moved to lua setup:')
-		print(prefix .. "   require('rose-pine').setup({ ... })")
-		for _, message in ipairs(alerts) do
-			print(prefix .. message)
-		end
-		should_alert = false
-	end
-end
-
----@class RosePineConfig
----@field bold_vert_split boolean
----@field dark_variant 'main'|'moon'
----@field dim_nc_background boolean
----@field disable_background boolean
----@field disable_float_background boolean
----@field disable_italics boolean
----@field groups RosePineGroups
-
----@class RosePineGroups
----@field border string
----@field comment string
----@field link string
----@field punctuation string
----@field error string
----@field hint string
----@field info string
----@field warn string
----@field git RosePineGit
----@field headings string|RosePineHeadings
-
----@class RosePineGit
----@field add string
----@field change string
----@field delete string
----@field dirty string
----@field ignore string
----@field merge string
----@field rename string
----@field stage string
----@field text string
-
----@class RosePineHeadings
----@field h1 string
----@field h2 string
----@field h3 string
----@field h4 string
----@field h5 string
----@field h6 string
-
----@type RosePineConfig
-local config = {
-	bold_vert_split = false,
-	dark_variant = 'main',
-	dim_nc_background = false,
-	disable_background = false,
-	disable_float_background = false,
-	disable_italics = false,
-
-	groups = {
-		background = 'base',
-		panel = 'surface',
-		border = 'highlight_med',
-		comment = 'muted',
-		link = 'iris',
-		punctuation = 'muted',
-
-		error = 'love',
-		hint = 'iris',
-		info = 'foam',
-		warn = 'gold',
-
-		git_add = 'foam',
-		git_change = 'rose',
-		git_delete = 'love',
-		git_dirty = 'rose',
-		git_ignore = 'muted',
-		git_merge = 'iris',
-		git_rename = 'pine',
-		git_stage = 'iris',
-		git_text = 'rose',
-
-		headings = {
-			h1 = 'iris',
-			h2 = 'foam',
-			h3 = 'rose',
-			h4 = 'gold',
-			h5 = 'pine',
-			h6 = 'foam',
-		},
-	},
-	highlight_groups = {},
-}
-
----@param opts RosePineConfig
-function M.setup(opts)
-	opts = opts or {}
-	vim.g.rose_pine_variant = opts.dark_variant or 'main'
-
-	if opts.groups and type(opts.groups.headings) == 'string' then
-		opts.groups.headings = {
-			h1 = opts.groups.headings,
-			h2 = opts.groups.headings,
-			h3 = opts.groups.headings,
-			h4 = opts.groups.headings,
-			h5 = opts.groups.headings,
-			h6 = opts.groups.headings,
-		}
-	end
-
-	config.user_variant = opts.dark_variant or nil
-	config = vim.tbl_deep_extend('force', config, opts)
-end
-
-function M.colorscheme()
-	if vim.g.colors_name then
-		vim.cmd('hi clear')
-	end
-
-	vim.opt.termguicolors = true
-	vim.g.colors_name = 'rose-pine'
-
-	if show_init_messages then
-		check_for_deprecated_opts()
-		show_init_messages = false
-	end
-
-	local theme = require('rose-pine.theme').get(config)
-	for group, color in pairs(theme) do
-		if config.highlight_groups[group] ~= nil then
-			util.highlight(group, config.highlight_groups[group])
-		else
-			util.highlight(group, color)
-		end
-	end
-
-	require('rose-pine.galaxyline.theme')
-end
-
-return M

From 28edf050363908c672777321b4eb8b9fe77ef512 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Thu, 16 Jun 2022 00:46:30 -0400
Subject: [PATCH 032/190] feat: allow overriding unset highlight groups

---
 lua/rose-pine.lua | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 0fa9c0a..ca82387 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -73,13 +73,19 @@ function M.colorscheme()
 	vim.g.colors_name = 'rose-pine'
 
 	local theme = require('rose-pine.theme').get(config)
+
+	-- Set theme highlights
 	for group, color in pairs(theme) do
-		if config.highlight_groups[group] ~= nil then
-			util.highlight(group, config.highlight_groups[group])
-		else
+		-- Skip highlight group if user overrides
+		if config.highlight_groups[group] == nil then
 			util.highlight(group, color)
 		end
 	end
+
+	-- Set user highlights
+	for group, color in pairs(config.highlight_groups) do
+		util.highlight(group, color)
+	end
 end
 
 return M

From 04fa9d94a596f93e456cefcf42deefe25a5aba2b Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Fri, 8 Jul 2022 19:53:27 -0400
Subject: [PATCH 033/190] refactor(nvim-tree): link folder names

---
 lua/rose-pine/theme.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 16a8c3c..82c29d7 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -306,7 +306,7 @@ function M.get(config)
 		NvimTreeImageFile = { fg = p.text },
 		NvimTreeNormal = { fg = p.text },
 		NvimTreeOpenedFile = { fg = p.text, bg = p.highlight_med },
-		NvimTreeOpenedFolderName = { fg = p.foam },
+		NvimTreeOpenedFolderName = { link = 'NvimTreeFolderName' },
 		NvimTreeRootFolder = { fg = p.iris },
 		NvimTreeSpecialFile = { link = 'NvimTreeNormal' },
 		NvimTreeWindowPicker = { fg = groups.background, bg = p.iris },

From 006aac9d673389975868fb5391e6bd247a7d7445 Mon Sep 17 00:00:00 2001
From: Will Leinweber <will@users.noreply.github.com>
Date: Sat, 16 Jul 2022 20:08:57 -0700
Subject: [PATCH 034/190] feat: Add nvim-dap-ui highlight groups (#87)

---
 lua/rose-pine/theme.lua | 21 +++++++++++++++++++++
 readme.md               |  1 +
 2 files changed, 22 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 82c29d7..34493b7 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -433,6 +433,27 @@ function M.get(config)
 		NotifyERRORBorder = { fg = p.love },
 		NotifyERRORTitle = { link = 'NotifyERRORBorder' },
 		NotifyERRORIcon = { link = 'NotifyERRORBorder' },
+
+		-- rcarriga/nvim-dap-ui
+		DapUIVariable = { link = 'Normal' },
+		DapUIValue = { link = 'Normal' },
+		DapUIFrameName = { link = 'Normal' },
+		DapUIThread = { fg = p.gold },
+		DapUIWatchesValue = { link = 'DapUIThread' },
+		DapUIBreakpointsInfo = { link = 'DapUIThread' },
+		DapUIBreakpointsCurrentLine = { fg = p.gold, style = 'bold' },
+		DapUIWatchesEmpty = { fg = p.love },
+		DapUIWatchesError = { link = 'DapUIWatchesEmpty' },
+		DapUIBreakpointsDisabledLine = { fg = p.muted },
+		DapUISource = { fg = p.iris },
+		DapUIBreakpointsPath = { fg = p.foam },
+		DapUIScope = { link = 'DapUIBreakpointsPath' },
+		DapUILineNumber = { link = 'DapUIBreakpointsPath' },
+		DapUIBreakpointsLine = { link = 'DapUIBreakpointsPath' },
+		DapUIFloatBorder = { link = 'DapUIBreakpointsPath' },
+		DapUIStoppedThread = { link = 'DapUIBreakpointsPath' },
+		DapUIDecoration = { link = 'DapUIBreakpointsPath' },
+		DapUIModifiedValue = { fg = p.foam, style = 'bold' },
 	}
 
 	vim.g.terminal_color_0 = p.overlay -- black
diff --git a/readme.md b/readme.md
index a896d02..9f824c1 100644
--- a/readme.md
+++ b/readme.md
@@ -100,3 +100,4 @@ We welcome and appreciate any help in creating a lovely experience for all.
 
 - [Get highlight groups under cursor](https://github.com/nvim-treesitter/playground#show-treesitter-and-syntax-highlight-groups-under-the-cursor)
 - [Adding new highlight groups](https://github.com/rose-pine/neovim/issues/6#issuecomment-962466323)
+- [Palette reference by name](https://rosepinetheme.com/palette)

From 506de581e524e653ce2724568bd9d0bf0a949436 Mon Sep 17 00:00:00 2001
From: gdnand <91826760+gdnand@users.noreply.github.com>
Date: Sun, 14 Aug 2022 12:59:26 +0000
Subject: [PATCH 035/190] ADD: dashboard hlGroups (#90)

---
 lua/rose-pine/theme.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 34493b7..d2387d5 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -454,6 +454,12 @@ function M.get(config)
 		DapUIStoppedThread = { link = 'DapUIBreakpointsPath' },
 		DapUIDecoration = { link = 'DapUIBreakpointsPath' },
 		DapUIModifiedValue = { fg = p.foam, style = 'bold' },
+
+		-- glepnir/dashboard-nvim
+		DashboardShortcut = { fg = p.love },
+		DashboardHeader = { fg = p.pine },
+		DashboardCenter = { fg = p.gold },
+		DashboardFooter = { fg = p.iris },
 	}
 
 	vim.g.terminal_color_0 = p.overlay -- black

From 95dd29d70ca4a3f5ff34047bf4e76dba2e2e1e66 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Tue, 6 Sep 2022 17:28:48 -0400
Subject: [PATCH 036/190] reduce `SpellBad` importance

---
 lua/rose-pine/theme.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index d2387d5..e8d3a44 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -65,7 +65,7 @@ function M.get(config)
 		RedrawDebugRecompose = { fg = '#ffffff', bg = p.love },
 		Search = { bg = p.highlight_med },
 		SpecialKey = { fg = p.foam },
-		SpellBad = { sp = p.love, style = 'undercurl' },
+		SpellBad = { sp = p.subtle, style = 'undercurl' },
 		SpellCap = { sp = p.subtle, style = 'undercurl' },
 		SpellLocal = { sp = p.subtle, style = 'undercurl' },
 		SpellRare = { sp = p.subtle, style = 'undercurl' },

From 47dd2ad6ba4ff65fd1d0135e4b2d45b3e4df70ac Mon Sep 17 00:00:00 2001
From: Guilherme de Andrade <guilhermedeandrade@protonmail.com>
Date: Sun, 18 Sep 2022 17:22:07 +0100
Subject: [PATCH 037/190] docs: remove tag option from Packer snippet (#96)

---
 readme.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/readme.md b/readme.md
index 9f824c1..973625b 100644
--- a/readme.md
+++ b/readme.md
@@ -19,7 +19,6 @@
 use({
     'rose-pine/neovim',
     as = 'rose-pine',
-    tag = 'v1.*',
     config = function()
         vim.cmd('colorscheme rose-pine')
     end

From 39dd687ed95dc990b010cf68ae9302b6c0150311 Mon Sep 17 00:00:00 2001
From: Daniel <d.danymat@gmail.com>
Date: Tue, 20 Sep 2022 15:40:30 +0200
Subject: [PATCH 038/190] feat: Add support to markid (#97) (#99)

---
 lua/rose-pine/plugins/markid.lua | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 lua/rose-pine/plugins/markid.lua

diff --git a/lua/rose-pine/plugins/markid.lua b/lua/rose-pine/plugins/markid.lua
new file mode 100644
index 0000000..9279adb
--- /dev/null
+++ b/lua/rose-pine/plugins/markid.lua
@@ -0,0 +1,10 @@
+--- Rosé Pine for markid
+--- https://github.com/David-Kunz/markid
+---
+--- @usage
+--- local highlights = require('rose-pine.plugins.markid')
+--- require("nvim-treesitter.configs").setup({ markid = { enable = true, colors = highlights } })
+
+local p = require('rose-pine.palette')
+
+return { p.foam, p.rose, p.iris }

From e67b0bfdfe08b2d1fc19f102d6649cac3052b572 Mon Sep 17 00:00:00 2001
From: Mi Yu <hello@afteryu.me>
Date: Mon, 3 Oct 2022 10:39:52 -0400
Subject: [PATCH 039/190] feat: Add neovim :checkhealth highlight groups (#100)

---
 lua/rose-pine/theme.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index e8d3a44..3fcc54a 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -193,6 +193,11 @@ function M.get(config)
 		DiagnosticVirtualTextInfo = { fg = groups.info },
 		DiagnosticVirtualTextWarn = { fg = groups.warn },
 
+		-- healthcheck
+		healthError = { fg = groups.error },
+		healthSuccess = { fg = groups.info },
+		healthWarning = { fg = groups.warn },
+
 		-- TSAttribute = {},
 		TSBoolean = { link = 'Boolean' },
 		TSCharacter = { link = 'Character' },

From 3eac7f3baabf155303501cf6b16e1d2358b24355 Mon Sep 17 00:00:00 2001
From: Myuwi <42811084+myuwi@users.noreply.github.com>
Date: Thu, 20 Oct 2022 23:15:40 +0300
Subject: [PATCH 040/190] fix: add support for `@*` treesitter highlight groups
 (#101)

---
 lua/rose-pine/theme.lua | 50 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 3fcc54a..a302196 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -250,6 +250,56 @@ function M.get(config)
 		TSVariable = { fg = p.text, style = styles.italic },
 		TSVariableBuiltin = { fg = p.love },
 
+		-- Treesitter
+		['@annotation'] = { link = 'PreProc' },
+		['@attribute'] = { link = 'PreProc' },
+		['@boolean'] = { link = 'Boolean' },
+		['@character'] = { link = 'Character' },
+		['@comment'] = { link = 'Comment' },
+		['@conditional'] = { link = 'Conditional' },
+		['@constant'] = { fg = p.foam },
+		['@constant.builtin'] = { fg = p.love },
+		['@constructor'] = { fg = p.foam },
+		['@field'] = { fg = p.foam },
+		['@function'] = { fg = p.rose },
+		['@function.builtin'] = { fg = p.love },
+		['@include'] = { fg = p.pine },
+		['@keyword'] = { fg = p.pine },
+		['@keyword.operator'] = { fg = p.subtle },
+		['@label'] = { fg = p.foam },
+		['@namespace'] = { link = 'Include' },
+		['@number'] = { link = 'Number' },
+		['@operator'] = { fg = p.subtle },
+		['@parameter'] = { fg = p.iris, style = styles.italic },
+		['@property'] = { fg = p.iris, style = styles.italic },
+		['@punctuation.bracket'] = { fg = groups.punctuation },
+		['@punctuation.delimiter'] = { fg = groups.punctuation },
+		['@punctuation.special'] = { fg = groups.punctuation },
+		['@string'] = { link = 'String' },
+		['@string.escape'] = { fg = p.pine },
+		['@string.special'] = { link = '@string' },
+		['@symbol'] = { link = 'Identifier' },
+		['@tag'] = { fg = p.foam },
+		['@tag.attribute'] = { link = '@property' },
+		['@tag.delimiter'] = { fg = p.subtle },
+		['@text'] = { fg = p.text },
+		['@text.strong'] = { bold = true },
+		['@text.emphasis'] = { italic = true },
+		['@text.underline'] = { underline = true },
+		['@text.strike'] = { strikethrough = true },
+		['@text.math'] = { link = 'Special' },
+		['@text.environment'] = { link = 'Macro' },
+		['@text.environment.name'] = { link = 'Type' },
+		['@text.title'] = { fg = groups.headings.h1, style = 'bold' },
+		['@text.uri'] = { fg = groups.link },
+		['@text.note'] = { link = 'SpecialComment' },
+		['@text.warning'] = { link = 'Todo' },
+		['@text.danger'] = { link = 'WarningMsg' },
+		['@todo'] = { link = 'Todo' },
+		['@type'] = { link = 'Type' },
+		['@variable'] = { fg = p.text, style = styles.italic },
+		['@variable.builtin'] = { fg = p.love },
+
 		-- vim.lsp.buf.document_highlight()
 		LspReferenceText = { bg = p.highlight_med },
 		LspReferenceRead = { bg = p.highlight_med },

From d04e8b2aa54b138bfa67be8b77b83bdb7bfdcdde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20Carre=C3=B1o?=
 <34664891+Pkcarreno@users.noreply.github.com>
Date: Mon, 24 Oct 2022 13:26:41 -0400
Subject: [PATCH 041/190] fix: bufferline deprecated names (#102)

---
 lua/rose-pine/plugins/bufferline.lua | 238 ++++++++++++++-------------
 1 file changed, 124 insertions(+), 114 deletions(-)

diff --git a/lua/rose-pine/plugins/bufferline.lua b/lua/rose-pine/plugins/bufferline.lua
index 118b871..db722cf 100644
--- a/lua/rose-pine/plugins/bufferline.lua
+++ b/lua/rose-pine/plugins/bufferline.lua
@@ -9,205 +9,215 @@ local p = require('rose-pine.palette')
 
 return {
 	-- fill = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- background = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- tab = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- tab_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- tab_close = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- close_button = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- close_button_visible = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- close_button_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	buffer_visible = {
-		guifg = p.subtle,
-		guibg = p.base,
+		fg = p.subtle,
+		bg = p.base,
 	},
 	buffer_selected = {
-		guifg = p.text,
-		guibg = p.surface,
-		gui = 'bold,italic',
+		fg = p.text,
+		bg = p.surface,
+		bold = true,
+		italic = true,
 	},
 	-- diagnostic = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- diagnostic_visible = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- diagnostic_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
-	-- 	gui = 'bold,italic',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
 	-- },
 	-- info = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guisp = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	sp = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- info_visible = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- info_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
-	-- 	gui = 'bold,italic',
-	-- 	guisp = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- 	sp = '<color-value-here>',
 	-- },
 	-- info_diagnostic = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guisp = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	sp = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- info_diagnostic_visible = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- info_diagnostic_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
-	-- 	gui = 'bold,italic',
-	-- 	guisp = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- 	sp = '<color-value-here>',
 	-- },
 	-- warning = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guisp = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	sp = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- warning_visible = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- warning_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
-	-- 	gui = 'bold,italic',
-	-- 	guisp = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- 	sp = '<color-value-here>',
 	-- },
 	-- warning_diagnostic = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guisp = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	sp = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- warning_diagnostic_visible = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- warning_diagnostic_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
-	-- 	gui = 'bold,italic',
-	-- 	guisp = warning_diagnostic_fg,
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- 	sp = warning_diagnostic_fg,
 	-- },
 	-- error = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
-	-- 	guisp = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	sp = '<color-value-here>',
 	-- },
 	-- error_visible = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- error_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
-	-- 	gui = 'bold,italic',
-	-- 	guisp = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- 	sp = '<color-value-here>',
 	-- },
 	-- error_diagnostic = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
-	-- 	guisp = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	sp = '<color-value-here>',
 	-- },
 	-- error_diagnostic_visible = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- error_diagnostic_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
-	-- 	gui = 'bold,italic',
-	-- 	guisp = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- 	sp = '<color-value-here>',
 	-- },
 	-- modified = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- modified_visible = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- modified_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- duplicate_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	gui = 'italic',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	italic = true,
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- duplicate_visible = {
-	-- 	guifg = '<color-value-here>',
-	-- 	gui = 'italic',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	italic = true,
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- duplicate = {
-	-- 	guifg = '<color-value-here>',
-	-- 	gui = 'italic',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	italic = true,
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- separator_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- separator_visible = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- separator = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- indicator_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
 	-- },
 	-- pick_selected = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
-	-- 	gui = 'bold,italic',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	italic = true,
 	-- },
 	-- pick_visible = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
-	-- 	gui = 'bold,italic',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
 	-- },
 	-- pick = {
-	-- 	guifg = '<color-value-here>',
-	-- 	guibg = '<color-value-here>',
-	-- 	gui = 'bold,italic',
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
 	-- },
 }

From 4b6d23ff2e268b21d4e3fe969ab6b593eb0d393f Mon Sep 17 00:00:00 2001
From: Slotos <slotos@gmail.com>
Date: Wed, 9 Nov 2022 03:39:38 +0200
Subject: [PATCH 042/190] Ease up diff backgrounds (#104)

Lower the blend intensity to leave sufficient colour difference for the eye to catch on.
---
 lua/rose-pine/theme.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index a302196..c262f1a 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -29,10 +29,10 @@ function M.get(config)
 		CursorLineNr = { fg = p.text },
 		DarkenedPanel = { bg = groups.panel },
 		DarkenedStatusline = { bg = groups.panel },
-		DiffAdd = { bg = blend(groups.git_add, groups.background, 0.5) },
+		DiffAdd = { bg = blend(groups.git_add, groups.background, 0.2) },
 		DiffChange = { bg = p.overlay },
-		DiffDelete = { bg = blend(groups.git_delete, groups.background, 0.5) },
-		DiffText = { bg = blend(groups.git_text, groups.background, 0.5) },
+		DiffDelete = { bg = blend(groups.git_delete, groups.background, 0.2) },
+		DiffText = { bg = blend(groups.git_text, groups.background, 0.2) },
 		diffAdded = { link = 'DiffAdd' },
 		diffChanged = { link = 'DiffChange' },
 		diffRemoved = { link = 'DiffDelete' },

From 148a6d2577f30b92716095c6677cfda2a49bcd0d Mon Sep 17 00:00:00 2001
From: Slotos <slotos@gmail.com>
Date: Wed, 9 Nov 2022 03:45:19 +0200
Subject: [PATCH 043/190] Ease up diff backgrounds (#104)

Lower the blend intensity to leave sufficient colour difference for the eye to catch on.

From 8ce63c869293f2e1e8c9880e27c4f33c6fb059b6 Mon Sep 17 00:00:00 2001
From: numToStr <24727447+numToStr@users.noreply.github.com>
Date: Sun, 20 Nov 2022 20:09:24 +0530
Subject: [PATCH 044/190] chore: rename colors/rose-pine.{vim => lua} (#105)

---
 colors/rose-pine.lua | 3 +++
 colors/rose-pine.vim | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 colors/rose-pine.lua
 delete mode 100644 colors/rose-pine.vim

diff --git a/colors/rose-pine.lua b/colors/rose-pine.lua
new file mode 100644
index 0000000..fd735a8
--- /dev/null
+++ b/colors/rose-pine.lua
@@ -0,0 +1,3 @@
+package.loaded['rose-pine.palette'] = nil
+
+require('rose-pine').colorscheme()
diff --git a/colors/rose-pine.vim b/colors/rose-pine.vim
deleted file mode 100644
index 0df6221..0000000
--- a/colors/rose-pine.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-lua package.loaded['rose-pine.palette'] = nil
-
-lua require('rose-pine').colorscheme()

From db7e63846f6a1cab21864ae9379f4632cf4ba51d Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sat, 3 Dec 2022 11:10:00 -0500
Subject: [PATCH 045/190] create license

closes #106
---
 license | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 license

diff --git a/license b/license
new file mode 100644
index 0000000..590df78
--- /dev/null
+++ b/license
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Rosé Pine
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From 9fd19a95146ca7be4f54471dc2e30f57e1634f65 Mon Sep 17 00:00:00 2001
From: Zakhary Kaplan <me@zakhary.dev>
Date: Tue, 27 Dec 2022 12:23:58 -0500
Subject: [PATCH 046/190] fix: indent-blankline missing hlGroups (#108)

---
 lua/rose-pine/theme.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index c262f1a..7a99908 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -376,6 +376,8 @@ function M.get(config)
 
 		-- luka-reineke/indent-blankline.nvim
 		IndentBlanklineChar = { fg = p.muted },
+		IndentBlanklineSpaceChar = { fg = p.muted },
+		IndentBlanklineSpaceCharBlankline = { fg = p.muted },
 
 		-- hrsh7th/nvim-cmp
 		CmpItemAbbr = { fg = p.subtle },

From 37fa09c6d2b5e62c560370963ad9b453da6f15ec Mon Sep 17 00:00:00 2001
From: Arkady Rost <arkrost@users.noreply.github.com>
Date: Tue, 3 Jan 2023 18:47:51 +0000
Subject: [PATCH 047/190] Fixed Telescope background in case when
 config.disable_background = true and (#110)

config.disable_float_background = false

Co-authored-by: Arkady Rost <arost@almworks.com>
---
 lua/rose-pine/theme.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 7a99908..3a78242 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -465,10 +465,10 @@ function M.get(config)
 		PounceMatch = { link = 'Search' },
 
 		-- nvim-telescope/telescope.nvim
-		TelescopeBorder = { fg = groups.border },
+		TelescopeBorder = { fg = groups.border, bg = styles.float_background },
 		TelescopeMatching = { fg = p.rose },
-		TelescopeNormal = { fg = p.subtle },
-		TelescopePromptNormal = { fg = p.text },
+		TelescopeNormal = { fg = p.subtle, bg = styles.float_background },
+		TelescopePromptNormal = { fg = p.text, bg = styles.float_background },
 		TelescopePromptPrefix = { fg = p.subtle },
 		TelescopeSelection = { fg = p.text, bg = p.overlay },
 		TelescopeSelectionCaret = { fg = p.rose, bg = p.overlay },

From d1e3278a45c7f218104cd542b74866c67e109d29 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Fri, 13 Jan 2023 13:55:27 -0500
Subject: [PATCH 048/190] ci: add issue templates

Thanks to https://github.com/folke/lazy.nvim for the inspiration!
---
 .github/ISSUE_TEMPLATE/bug_report.yml      | 80 ++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.yml | 29 ++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..178ab92
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,80 @@
+name: Bug Report
+description: File a bug/issue
+title: "bug: "
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **Before** reporting an issue, make sure to read the [documentation](https://github.com/rose-pine/neovim) and search [existing issues](https://github.com/rose-pine/neovim/issues). Usage questions such as ***"How do I...?"*** belong in [Discussions](https://github.com/rose-pine/neovim/discussions) and will be closed.
+  - type: input
+    attributes:
+      label: "Neovim version (nvim -v)"
+      placeholder: "0.8.0 commit db1b0ee3b30f"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: "Terminal"
+      placeholder: "Kitty"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is. Please include any related errors you see in Neovim.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1.
+        2.
+        3.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: A concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Repro
+      description: Minimal `init.lua` to reproduce this issue. Save as `repro.lua` and run with `nvim -u repro.lua`
+      value: |
+        -- DO NOT change the paths and do not remove the colorscheme
+        local root = vim.fn.fnamemodify("./.repro", ":p")
+
+        -- Set stdpaths to use .repro
+        for _, name in ipairs({ "config", "data", "state", "cache" }) do
+          vim.env[("XDG_%s_HOME"):format(name:upper())] = root .. "/" .. name
+        end
+
+        -- Bootstrap lazy.nvim
+        local lazypath = root .. "/plugins/lazy.nvim"
+        if not vim.loop.fs_stat(lazypath) then
+          vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", lazypath, })
+        end
+        vim.opt.runtimepath:prepend(lazypath)
+
+        -- Install plugins
+        local plugins = {
+          "rose-pine/neovim.nvim",
+		  config = function()
+            -- Add relevant Rosé Pine config below
+		    require("rose-pine").setup({})
+		  end
+        }
+        require("lazy").setup(plugins, {
+          root = root .. "/plugins",
+        })
+
+        vim.cmd.colorscheme("rose-pine")
+        -- Add anything else here
+      render: Lua
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..2b45cdb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,29 @@
+name: Feature Request
+description: Suggest a new feature
+title: "feature: "
+labels: [enhancement]
+body:
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+  - type: textarea
+    validations:
+      required: false
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.

From 7f6a7364deafc362dec9539462a7e7756ea67b04 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Fri, 13 Jan 2023 13:58:29 -0500
Subject: [PATCH 049/190] ci: fix template formatting

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 178ab92..6a475c5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -64,10 +64,10 @@ body:
         -- Install plugins
         local plugins = {
           "rose-pine/neovim.nvim",
-		  config = function()
+          config = function()
             -- Add relevant Rosé Pine config below
-		    require("rose-pine").setup({})
-		  end
+            require("rose-pine").setup({})
+          end
         }
         require("lazy").setup(plugins, {
           root = root .. "/plugins",

From b33cdf76cdfdae4ca91e4bd91d60814f9ef7fd6c Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Fri, 13 Jan 2023 14:11:12 -0500
Subject: [PATCH 050/190] chore: update editorconfig

---
 .editorconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 7fc8038..283165a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,6 +7,6 @@ indent_style = tab
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.lua]
-indent_size = 3
-indent_style = tab
+[*.{yaml,yml}]
+indent_size = 2
+indent_style = space

From 61e22c730b6510403380cc1b7943386aa2694e69 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Mon, 16 Jan 2023 23:42:14 -0500
Subject: [PATCH 051/190] fix: decouple `StatusLine` background from floats

---
 lua/rose-pine/theme.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 3a78242..edda7d6 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -70,7 +70,7 @@ function M.get(config)
 		SpellLocal = { sp = p.subtle, style = 'undercurl' },
 		SpellRare = { sp = p.subtle, style = 'undercurl' },
 		SignColumn = { fg = p.text, bg = styles.background },
-		StatusLine = { fg = p.subtle, bg = styles.float_background },
+		StatusLine = { fg = p.subtle, bg = p.surface },
 		StatusLineNC = { fg = p.muted, bg = styles.background },
 		StatusLineTerm = { link = 'StatusLine' },
 		StatusLineTermNC = { link = 'StatusLineNC' },

From 6d91e39c286d2c75fb35c9ccff70e85c8d5ec123 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Tue, 17 Jan 2023 21:07:28 -0500
Subject: [PATCH 052/190] Update bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 6a475c5..c0c3f56 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -63,7 +63,10 @@ body:
 
         -- Install plugins
         local plugins = {
-          "rose-pine/neovim.nvim",
+          "rose-pine/neovim",
+          name = "rose-pine",
+          lazy = false,
+          priority = 1000,
           config = function()
             -- Add relevant Rosé Pine config below
             require("rose-pine").setup({})

From 9e30b45caf3e87cf7f178f989e7a532b45b2f8e8 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Tue, 17 Jan 2023 21:09:31 -0500
Subject: [PATCH 053/190] Update readme.md

---
 readme.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/readme.md b/readme.md
index 973625b..af2c78a 100644
--- a/readme.md
+++ b/readme.md
@@ -13,6 +13,21 @@
 
 ## Usage
 
+> With [lazy.nvim](https://github.com/folke/lazy.nvim)
+
+```lua
+{
+    'rose-pine/neovim',
+    name = 'rose-pine',
+    lazy = false,
+    priority = 1000,
+    config = function()
+        require("rose-pine").setup()
+        vim.cmd('colorscheme rose-pine')
+    end
+}
+```
+
 > With [packer.nvim](https://github.com/wbthomason/packer.nvim)
 
 ```lua
@@ -20,6 +35,7 @@ use({
     'rose-pine/neovim',
     as = 'rose-pine',
     config = function()
+        require("rose-pine").setup()
         vim.cmd('colorscheme rose-pine')
     end
 })

From 16a473966448ad4f8edd3cd6bb9817179d82ed5d Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Wed, 22 Feb 2023 13:25:36 -0600
Subject: [PATCH 054/190] Merge canary (#114)

* feat!: use new highlight api

* feat: support custom highlight blending

Example:

```
{
	highlight_groups = {
		StatusLine = { bg = 'love', blend = 10 }
	}
}
```

* refactor: move config into separate file

* wip: update semantic tokens

* ci: add issue templates

Thanks to https://github.com/folke/lazy.nvim for the inspiration!

* ci: fix template formatting

* chore: update editorconfig

* fix: decouple more backgrounds from floats

* change `@tag.attribute` to iris

* add cursor highlights

Closes #121

* match link underline colour

* improve `dim_nc_background` behaviour

ref #123

* feat: expose each variant as individual theme

ref #98

* feat: update tokens

ref #107

* feat: distinguish between `CmpItemKind`'s
---
 .github/ISSUE_TEMPLATE/bug_report.yml |   2 -
 colors/rose-pine-dawn.lua             |   1 +
 colors/rose-pine-main.lua             |   1 +
 colors/rose-pine-moon.lua             |   1 +
 lua/rose-pine.lua                     |  85 +--
 lua/rose-pine/config.lua              | 100 +++
 lua/rose-pine/palette.lua             |  22 +-
 lua/rose-pine/theme.lua               | 944 +++++++++++++-------------
 lua/rose-pine/util.lua                |  28 +-
 readme.md                             |  10 +-
 10 files changed, 606 insertions(+), 588 deletions(-)
 create mode 100644 colors/rose-pine-dawn.lua
 create mode 100644 colors/rose-pine-main.lua
 create mode 100644 colors/rose-pine-moon.lua
 create mode 100644 lua/rose-pine/config.lua

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index c0c3f56..b7603ef 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -65,8 +65,6 @@ body:
         local plugins = {
           "rose-pine/neovim",
           name = "rose-pine",
-          lazy = false,
-          priority = 1000,
           config = function()
             -- Add relevant Rosé Pine config below
             require("rose-pine").setup({})
diff --git a/colors/rose-pine-dawn.lua b/colors/rose-pine-dawn.lua
new file mode 100644
index 0000000..b4482c0
--- /dev/null
+++ b/colors/rose-pine-dawn.lua
@@ -0,0 +1 @@
+require('rose-pine').colorscheme({ variant = 'dawn' })
diff --git a/colors/rose-pine-main.lua b/colors/rose-pine-main.lua
new file mode 100644
index 0000000..6951634
--- /dev/null
+++ b/colors/rose-pine-main.lua
@@ -0,0 +1 @@
+require('rose-pine').colorscheme({ variant = 'main' })
diff --git a/colors/rose-pine-moon.lua b/colors/rose-pine-moon.lua
new file mode 100644
index 0000000..57e6a68
--- /dev/null
+++ b/colors/rose-pine-moon.lua
@@ -0,0 +1 @@
+require('rose-pine').colorscheme({ variant = 'moon' })
diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index ca82387..bbfadb1 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -1,70 +1,12 @@
-local util = require('rose-pine.util')
-
+local config = require('rose-pine.config')
 local M = {}
 
-local config = {
-	bold_vert_split = false,
-	dark_variant = 'main',
-	dim_nc_background = false,
-	disable_background = false,
-	disable_float_background = false,
-	disable_italics = false,
-
-	groups = {
-		background = 'base',
-		panel = 'surface',
-		border = 'highlight_med',
-		comment = 'muted',
-		link = 'iris',
-		punctuation = 'muted',
-
-		error = 'love',
-		hint = 'iris',
-		info = 'foam',
-		warn = 'gold',
-
-		git_add = 'foam',
-		git_change = 'rose',
-		git_delete = 'love',
-		git_dirty = 'rose',
-		git_ignore = 'muted',
-		git_merge = 'iris',
-		git_rename = 'pine',
-		git_stage = 'iris',
-		git_text = 'rose',
-
-		headings = {
-			h1 = 'iris',
-			h2 = 'foam',
-			h3 = 'rose',
-			h4 = 'gold',
-			h5 = 'pine',
-			h6 = 'foam',
-		},
-	},
-	highlight_groups = {},
-}
-
-function M.setup(opts)
-	opts = opts or {}
-	vim.g.rose_pine_variant = opts.dark_variant or 'main'
-
-	if opts.groups and type(opts.groups.headings) == 'string' then
-		opts.groups.headings = {
-			h1 = opts.groups.headings,
-			h2 = opts.groups.headings,
-			h3 = opts.groups.headings,
-			h4 = opts.groups.headings,
-			h5 = opts.groups.headings,
-			h6 = opts.groups.headings,
-		}
+---@param options Config|nil
+function M.colorscheme(options)
+	if options then
+		config.extend(options)
 	end
 
-	config.user_variant = opts.dark_variant or nil
-	config = vim.tbl_deep_extend('force', config, opts)
-end
-
-function M.colorscheme()
 	if vim.g.colors_name then
 		vim.cmd('hi clear')
 	end
@@ -72,20 +14,9 @@ function M.colorscheme()
 	vim.opt.termguicolors = true
 	vim.g.colors_name = 'rose-pine'
 
-	local theme = require('rose-pine.theme').get(config)
-
-	-- Set theme highlights
-	for group, color in pairs(theme) do
-		-- Skip highlight group if user overrides
-		if config.highlight_groups[group] == nil then
-			util.highlight(group, color)
-		end
-	end
-
-	-- Set user highlights
-	for group, color in pairs(config.highlight_groups) do
-		util.highlight(group, color)
-	end
+	require('rose-pine.theme')._load(config.options)
 end
 
+M.setup = config.setup
+
 return M
diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
new file mode 100644
index 0000000..c5a935e
--- /dev/null
+++ b/lua/rose-pine/config.lua
@@ -0,0 +1,100 @@
+local M = {}
+
+---@class Groups
+---@field background string
+---@field panel string
+---@field border string
+---@field comment string
+---@field link string
+---@field punctuation string
+---@field error string
+---@field hint string
+---@field info string
+---@field warn string
+---@field git_add string
+---@field git_change string
+---@field git_delete string
+---@field git_dirty string
+---@field git_ignore string
+---@field git_merge string
+---@field git_rename string
+---@field git_stage string
+---@field git_text string
+---@field headings Headings|string
+
+---@class Headings
+---@field h1 string
+---@field h2 string
+---@field h3 string
+---@field h4 string
+---@field h5 string
+---@field h6 string
+
+---@class Config
+---@field variant 'auto'|'main'|'moon'|'dawn'
+---@field dark_variant 'main'|'moon'|'dawn'
+---@field bold_vert_split boolean
+---@field dim_nc_background boolean
+---@field disable_background boolean
+---@field disable_float_background boolean
+---@field disable_italics boolean
+---@field groups Groups
+---@field highlight_groups table<string, any>
+local defaults = {
+	variant = 'auto',
+	dark_variant = 'main',
+	bold_vert_split = false,
+	dim_nc_background = false,
+	disable_background = false,
+	disable_float_background = false,
+	disable_italics = false,
+	highlight_groups = {},
+
+	groups = {
+		background = 'base',
+		panel = 'surface',
+		border = 'highlight_med',
+		comment = 'muted',
+		link = 'iris',
+		punctuation = 'muted',
+		error = 'love',
+		hint = 'iris',
+		info = 'foam',
+		warn = 'gold',
+		git_add = 'foam',
+		git_change = 'rose',
+		git_delete = 'love',
+		git_dirty = 'rose',
+		git_ignore = 'muted',
+		git_merge = 'iris',
+		git_rename = 'pine',
+		git_stage = 'iris',
+		git_text = 'rose',
+		headings = {
+			h1 = 'iris',
+			h2 = 'foam',
+			h3 = 'rose',
+			h4 = 'gold',
+			h5 = 'pine',
+			h6 = 'foam',
+		},
+	},
+}
+
+---@type Config
+M.options = {}
+
+---@param options Config|nil
+function M.setup(options)
+	M.options = vim.tbl_deep_extend('force', {}, defaults, options or {})
+end
+
+---@param options Config|nil
+function M.extend(options)
+	M.options =
+		vim.tbl_deep_extend('force', {}, M.options or defaults, options or {})
+end
+
+M.setup()
+
+return M
diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index d98eaec..db776f5 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -1,5 +1,8 @@
+local options = require('rose-pine.config').options
+
 local variants = {
 	main = {
+		nc = '#16141f',
 		base = '#191724',
 		surface = '#1f1d2e',
 		overlay = '#26233a',
@@ -18,6 +21,7 @@ local variants = {
 		none = 'NONE',
 	},
 	moon = {
+		nc = '#1f1d30',
 		base = '#232136',
 		surface = '#2a273f',
 		overlay = '#393552',
@@ -36,6 +40,7 @@ local variants = {
 		none = 'NONE',
 	},
 	dawn = {
+		nc = '#f8f0e7',
 		base = '#faf4ed',
 		surface = '#fffaf3',
 		overlay = '#f2e9e1',
@@ -55,12 +60,15 @@ local variants = {
 	},
 }
 
-local palette = {}
-
-if vim.o.background == 'light' then
-	palette = variants.dawn
-else
-	palette = variants[(vim.g.rose_pine_variant == 'moon' and 'moon') or 'main']
+if options.variant == 'main' then
+	return variants.main
+end
+if options.variant == 'moon' then
+	return variants.moon
+end
+if options.variant == 'dawn' then
+	return variants.dawn
 end
 
-return palette
+return vim.o.background == 'light' and variants.dawn
+	or variants[options.dark_variant or 'main']
diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index edda7d6..f065f69 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -1,523 +1,488 @@
-local blend = require('rose-pine.util').blend
-
 local M = {}
 
-function M.get(config)
+---@param options Config
+function M._load(options)
+	local h = require('rose-pine.util').highlight
 	local p = require('rose-pine.palette')
 
-	local theme = {}
-	local groups = config.groups or {}
-	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 groups.background,
-		float_background = (config.disable_float_background and p.none)
-			or groups.panel,
+	local groups = options.groups or {}
+	local maybe = {
+		base = (options.disable_background and p.none) or p.base,
+		surface = (options.disable_float_background and p.none) or p.surface,
+		italic = not options.disable_italics,
 	}
-	styles.nc_background = (config.dim_nc_background and groups.panel)
-		or styles.background
+	maybe.bold_vert_split = (options.bold_vert_split and groups.border)
+		or p.none
+	maybe.dim_nc_background = (options.dim_nc_background and p.nc)
 
-	theme = {
-		ColorColumn = { bg = p.overlay },
-		Conceal = { bg = p.none },
-		CurSearch = { link = 'IncSearch' },
-		-- Cursor = {},
-		CursorColumn = { bg = p.highlight_low },
-		-- CursorIM = {},
-		CursorLine = { bg = p.highlight_low },
-		CursorLineNr = { fg = p.text },
-		DarkenedPanel = { bg = groups.panel },
-		DarkenedStatusline = { bg = groups.panel },
-		DiffAdd = { bg = blend(groups.git_add, groups.background, 0.2) },
-		DiffChange = { bg = p.overlay },
-		DiffDelete = { bg = blend(groups.git_delete, groups.background, 0.2) },
-		DiffText = { bg = blend(groups.git_text, groups.background, 0.2) },
-		diffAdded = { link = 'DiffAdd' },
-		diffChanged = { link = 'DiffChange' },
-		diffRemoved = { link = 'DiffDelete' },
-		Directory = { fg = p.foam, bg = p.none },
-		-- EndOfBuffer = {},
-		ErrorMsg = { fg = p.love, style = 'bold' },
-		FloatBorder = { fg = groups.border },
-		FloatTitle = { fg = p.muted },
-		FoldColumn = { fg = p.muted },
-		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 },
-		ModeMsg = { fg = p.subtle },
-		MoreMsg = { fg = p.iris },
-		NonText = { fg = p.muted },
-		Normal = { fg = p.text, bg = styles.background },
-		NormalFloat = { fg = p.text, bg = styles.float_background },
-		NormalNC = { fg = p.text, bg = styles.nc_background },
-		NvimInternalError = { fg = '#ffffff', bg = p.love },
-		Pmenu = { fg = p.subtle, bg = styles.float_background },
-		PmenuSbar = { bg = p.highlight_low },
-		PmenuSel = { fg = p.text, bg = p.overlay },
-		PmenuThumb = { bg = p.highlight_med },
-		Question = { fg = p.gold },
-		-- QuickFixLine = {},
-		-- RedrawDebugNormal = {}
-		RedrawDebugClear = { fg = '#ffffff', bg = p.gold },
-		RedrawDebugComposed = { fg = '#ffffff', bg = p.pine },
-		RedrawDebugRecompose = { fg = '#ffffff', bg = p.love },
-		Search = { bg = p.highlight_med },
-		SpecialKey = { fg = p.foam },
-		SpellBad = { sp = p.subtle, style = 'undercurl' },
-		SpellCap = { sp = p.subtle, style = 'undercurl' },
-		SpellLocal = { sp = p.subtle, style = 'undercurl' },
-		SpellRare = { sp = p.subtle, style = 'undercurl' },
-		SignColumn = { fg = p.text, bg = styles.background },
-		StatusLine = { fg = p.subtle, bg = p.surface },
-		StatusLineNC = { fg = p.muted, bg = styles.background },
-		StatusLineTerm = { link = 'StatusLine' },
-		StatusLineTermNC = { link = 'StatusLineNC' },
-		TabLine = { fg = p.subtle, bg = styles.float_background },
-		TabLineFill = { bg = styles.float_background },
-		TabLineSel = { fg = p.text, bg = p.overlay },
-		Title = { fg = p.text },
-		VertSplit = { fg = groups.border, bg = styles.vert_split },
-		Visual = { bg = p.highlight_med },
-		-- VisualNOS = {},
-		WarningMsg = { fg = p.gold },
-		-- Whitespace = {},
-		WildMenu = { link = 'IncSearch' },
+	h('ColorColumn', { bg = p.overlay })
+	h('Conceal', { bg = p.none })
+	h('CurSearch', { link = 'IncSearch' })
+	h('Cursor', { fg = p.text, bg = p.highlight_high })
+	h('CursorColumn', { bg = p.highlight_low })
+	-- CursorIM = {},
+	h('CursorLine', { bg = p.highlight_low })
+	h('CursorLineNr', { fg = p.text })
+	h('DarkenedPanel', { bg = maybe.surface })
+	h('DarkenedStatusline', { bg = maybe.surface })
+	h('DiffAdd', { bg = groups.git_add, blend = 20 })
 
-		Boolean = { fg = p.rose },
-		Character = { fg = p.gold },
-		Comment = { fg = groups.comment, style = styles.italic },
-		Conditional = { fg = p.pine },
-		Constant = { fg = p.gold },
-		Debug = { fg = p.rose },
-		Define = { fg = p.iris },
-		Delimiter = { fg = p.subtle },
-		Error = { fg = p.love },
-		Exception = { fg = p.pine },
-		Float = { fg = p.gold },
-		Function = { fg = p.rose },
-		Identifier = { fg = p.rose },
-		-- Ignore = {},
-		Include = { fg = p.iris },
-		Keyword = { fg = p.pine },
-		Label = { fg = p.foam },
-		Macro = { fg = p.iris },
-		Number = { fg = p.gold },
-		Operator = { fg = p.subtle },
-		PreCondit = { fg = p.iris },
-		PreProc = { fg = p.iris },
-		Repeat = { fg = p.pine },
-		Special = { fg = p.rose },
-		SpecialChar = { fg = p.rose },
-		SpecialComment = { fg = p.iris },
-		Statement = { fg = p.pine },
-		StorageClass = { fg = p.foam },
-		String = { fg = p.gold },
-		Structure = { fg = p.foam },
-		Tag = { fg = p.rose },
-		Todo = { fg = p.iris },
-		Type = { fg = p.foam },
-		Typedef = { fg = p.foam },
-		Underlined = { style = 'underline' },
+	h('DiffChange', { bg = p.overlay })
+	h('DiffDelete', { bg = groups.git_delete, blend = 20 })
+	h('DiffText', { bg = groups.git_text, blend = 20 })
+	h('diffAdded', { link = 'DiffAdd' })
+	h('diffChanged', { link = 'DiffChange' })
+	h('diffRemoved', { link = 'DiffDelete' })
+	h('Directory', { fg = p.foam, bg = p.none })
+	-- EndOfBuffer = {},
+	h('ErrorMsg', { fg = p.love, bold = true })
+	h('FloatBorder', { fg = groups.border })
+	h('FloatTitle', { fg = p.muted })
+	h('FoldColumn', { fg = p.muted })
+	h('Folded', { fg = p.text, bg = maybe.surface })
+	h('IncSearch', { fg = p.base, bg = p.rose })
+	h('LineNr', { fg = p.muted })
+	h('MatchParen', { fg = p.text, bg = p.highlight_med })
+	h('ModeMsg', { fg = p.subtle })
+	h('MoreMsg', { fg = p.iris })
+	h('NonText', { fg = p.muted })
+	h('Normal', { fg = p.text, bg = maybe.base })
+	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 = p.surface })
+	h('PmenuSbar', { bg = p.highlight_low })
+	h('PmenuSel', { fg = p.text, bg = p.overlay })
+	h('PmenuThumb', { bg = p.highlight_med })
+	h('Question', { fg = p.gold })
+	-- QuickFixLine = {},
+	-- RedrawDebugNormal = {}
+	h('RedrawDebugClear', { fg = '#ffffff', bg = p.gold })
+	h('RedrawDebugComposed', { fg = '#ffffff', bg = p.pine })
+	h('RedrawDebugRecompose', { fg = '#ffffff', bg = p.love })
+	h('Search', { bg = p.highlight_med })
+	h('SpecialKey', { fg = p.foam })
+	h('SpellBad', { sp = p.subtle, undercurl = true })
+	h('SpellCap', { sp = p.subtle, undercurl = true })
+	h('SpellLocal', { sp = p.subtle, undercurl = true })
+	h('SpellRare', { sp = p.subtle, undercurl = true })
+	h('SignColumn', {
+		fg = p.text,
+		bg = (options.dim_nc_background and p.none) or maybe.base,
+	})
+	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 = 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 })
+	h('Visual', { bg = p.highlight_med })
+	-- VisualNOS = {},
+	h('WarningMsg', { fg = p.gold })
+	-- Whitespace = {},
+	h('WildMenu', { link = 'IncSearch' })
 
-		htmlArg = { fg = p.iris },
-		htmlBold = { style = 'bold' },
-		htmlEndTag = { fg = p.subtle },
-		htmlH1 = { fg = groups.headings.h1, style = 'bold' },
-		htmlH2 = { fg = groups.headings.h2, style = 'bold' },
-		htmlH3 = { fg = groups.headings.h3, style = 'bold' },
-		htmlH4 = { fg = groups.headings.h4, style = 'bold' },
-		htmlH5 = { fg = groups.headings.h5, style = 'bold' },
-		htmlItalic = { style = styles.italic },
-		htmlLink = { fg = groups.link },
-		htmlTag = { fg = p.subtle },
-		htmlTagN = { fg = p.text },
-		htmlTagName = { fg = p.foam },
+	h('Boolean', { fg = p.rose })
+	h('Character', { fg = p.gold })
+	h('Comment', { fg = groups.comment, italic = maybe.italic })
+	h('Conditional', { fg = p.pine })
+	h('Constant', { fg = p.gold })
+	h('Debug', { fg = p.rose })
+	h('Define', { fg = p.iris })
+	h('Delimiter', { fg = p.subtle })
+	h('Error', { fg = p.love })
+	h('Exception', { fg = p.pine })
+	h('Float', { fg = p.gold })
+	h('Function', { fg = p.rose })
+	h('Identifier', { fg = p.rose })
+	-- Ignore = {},
+	h('Include', { fg = p.iris })
+	h('Keyword', { fg = p.pine })
+	h('Label', { fg = p.foam })
+	h('Macro', { fg = p.iris })
+	h('Number', { fg = p.gold })
+	h('Operator', { fg = p.subtle })
+	h('PreCondit', { fg = p.iris })
+	h('PreProc', { fg = p.iris })
+	h('Repeat', { fg = p.pine })
+	h('Special', { fg = p.rose })
+	h('SpecialChar', { fg = p.rose })
+	h('SpecialComment', { fg = p.iris })
+	h('Statement', { fg = p.pine })
+	h('StorageClass', { fg = p.foam })
+	h('String', { fg = p.gold })
+	h('Structure', { fg = p.foam })
+	h('Tag', { fg = p.rose })
+	h('Todo', { fg = p.iris })
+	h('Type', { fg = p.foam })
+	h('Typedef', { link = 'Type' })
+	h('Underlined', { underline = true })
 
-		markdownDelimiter = { fg = p.subtle },
-		markdownH1 = { fg = groups.headings.h1, style = 'bold' },
-		markdownH1Delimiter = { link = 'markdownH1' },
-		markdownH2 = { fg = groups.headings.h2, style = 'bold' },
-		markdownH2Delimiter = { link = 'markdownH2' },
-		markdownH3 = { fg = groups.headings.h3, style = 'bold' },
-		markdownH3Delimiter = { link = 'markdownH3' },
-		markdownH4 = { fg = groups.headings.h4, style = 'bold' },
-		markdownH4Delimiter = { link = 'markdownH4' },
-		markdownH5 = { fg = groups.headings.h5, style = 'bold' },
-		markdownH5Delimiter = { link = 'markdownH5' },
-		markdownH6 = { fg = groups.headings.h6, style = 'bold' },
-		markdownH6Delimiter = { link = 'markdownH6' },
-		markdownLinkText = { fg = groups.link, style = 'underline' },
-		markdownUrl = { link = 'markdownLinkText' },
+	h('htmlArg', { fg = p.iris })
+	h('htmlBold', { bold = true })
+	h('htmlEndTag', { fg = p.subtle })
+	h('htmlH1', { fg = groups.headings.h1, bold = true })
+	h('htmlH2', { fg = groups.headings.h2, bold = true })
+	h('htmlH3', { fg = groups.headings.h3, bold = true })
+	h('htmlH4', { fg = groups.headings.h4, bold = true })
+	h('htmlH5', { fg = groups.headings.h5, bold = true })
+	h('htmlItalic', { italic = maybe.italic })
+	h('htmlLink', { fg = groups.link })
+	h('htmlTag', { fg = p.subtle })
+	h('htmlTagN', { fg = p.text })
+	h('htmlTagName', { fg = p.foam })
 
-		mkdCode = { fg = p.foam, style = styles.italic },
-		mkdCodeDelimiter = { fg = p.rose },
-		mkdCodeEnd = { fg = p.foam },
-		mkdCodeStart = { fg = p.foam },
-		mkdFootnotes = { fg = p.foam },
-		mkdID = { fg = p.foam, style = 'underline' },
-		mkdInlineURL = { fg = groups.link, style = 'underline' },
-		mkdLink = { link = 'mkdInlineURL' },
-		mkdLinkDef = { link = 'mkdInlineURL' },
-		mkdListItemLine = { fg = p.text },
-		mkdRule = { fg = p.subtle },
-		mkdURL = { link = 'mkdInlineURL' },
+	h('markdownDelimiter', { fg = p.subtle })
+	h('markdownH1', { fg = groups.headings.h1, bold = true })
+	h('markdownH1Delimiter', { link = 'markdownH1' })
+	h('markdownH2', { fg = groups.headings.h2, bold = true })
+	h('markdownH2Delimiter', { link = 'markdownH2' })
+	h('markdownH3', { fg = groups.headings.h3, bold = true })
+	h('markdownH3Delimiter', { link = 'markdownH3' })
+	h('markdownH4', { fg = groups.headings.h4, bold = true })
+	h('markdownH4Delimiter', { link = 'markdownH4' })
+	h('markdownH5', { fg = groups.headings.h5, bold = true })
+	h('markdownH5Delimiter', { link = 'markdownH5' })
+	h('markdownH6', { fg = groups.headings.h6, bold = true })
+	h('markdownH6Delimiter', { link = 'markdownH6' })
+	h(
+		'markdownLinkText',
+		{ fg = groups.link, sp = groups.link, underline = true }
+	)
+	h('markdownUrl', { link = 'markdownLinkText' })
 
-		DiagnosticError = { fg = groups.error },
-		DiagnosticHint = { fg = groups.hint },
-		DiagnosticInfo = { fg = groups.info },
-		DiagnosticWarn = { fg = groups.warn },
-		DiagnosticDefaultError = { fg = groups.error },
-		DiagnosticDefaultHint = { fg = groups.hint },
-		DiagnosticDefaultInfo = { fg = groups.info },
-		DiagnosticDefaultWarn = { fg = groups.warn },
-		DiagnosticFloatingError = { fg = groups.error },
-		DiagnosticFloatingHint = { fg = groups.hint },
-		DiagnosticFloatingInfo = { fg = groups.info },
-		DiagnosticFloatingWarn = { fg = groups.warn },
-		DiagnosticSignError = { fg = groups.error },
-		DiagnosticSignHint = { fg = groups.hint },
-		DiagnosticSignInfo = { fg = groups.info },
-		DiagnosticSignWarn = { fg = groups.warn },
-		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' },
-		DiagnosticUnderlineWarn = { sp = groups.warn, style = 'undercurl' },
-		DiagnosticVirtualTextError = { fg = groups.error },
-		DiagnosticVirtualTextHint = { fg = groups.hint },
-		DiagnosticVirtualTextInfo = { fg = groups.info },
-		DiagnosticVirtualTextWarn = { fg = groups.warn },
+	h('mkdCode', { fg = p.foam, italic = maybe.italic })
+	h('mkdCodeDelimiter', { fg = p.rose })
+	h('mkdCodeEnd', { fg = p.foam })
+	h('mkdCodeStart', { fg = p.foam })
+	h('mkdFootnotes', { fg = p.foam })
+	h('mkdID', { fg = p.foam, underline = true })
+	h('mkdInlineURL', { fg = groups.link, underline = true })
+	h('mkdLink', { link = 'mkdInlineURL' })
+	h('mkdLinkDef', { link = 'mkdInlineURL' })
+	h('mkdListItemLine', { fg = p.text })
+	h('mkdRule', { fg = p.subtle })
+	h('mkdURL', { link = 'mkdInlineURL' })
 
-		-- healthcheck
-		healthError = { fg = groups.error },
-		healthSuccess = { fg = groups.info },
-		healthWarning = { fg = groups.warn },
+	h('DiagnosticError', { fg = groups.error })
+	h('DiagnosticHint', { fg = groups.hint })
+	h('DiagnosticInfo', { fg = groups.info })
+	h('DiagnosticWarn', { fg = groups.warn })
+	h('DiagnosticDefaultError', { fg = groups.error })
+	h('DiagnosticDefaultHint', { fg = groups.hint })
+	h('DiagnosticDefaultInfo', { fg = groups.info })
+	h('DiagnosticDefaultWarn', { fg = groups.warn })
+	h('DiagnosticFloatingError', { fg = groups.error })
+	h('DiagnosticFloatingHint', { fg = groups.hint })
+	h('DiagnosticFloatingInfo', { fg = groups.info })
+	h('DiagnosticFloatingWarn', { fg = groups.warn })
+	h('DiagnosticSignError', { fg = groups.error })
+	h('DiagnosticSignHint', { fg = groups.hint })
+	h('DiagnosticSignInfo', { fg = groups.info })
+	h('DiagnosticSignWarn', { fg = groups.warn })
+	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 })
+	h('DiagnosticUnderlineWarn', { sp = groups.warn, undercurl = true })
+	h('DiagnosticVirtualTextError', { fg = groups.error })
+	h('DiagnosticVirtualTextHint', { fg = groups.hint })
+	h('DiagnosticVirtualTextInfo', { fg = groups.info })
+	h('DiagnosticVirtualTextWarn', { fg = groups.warn })
 
-		-- TSAttribute = {},
-		TSBoolean = { link = 'Boolean' },
-		TSCharacter = { link = 'Character' },
-		TSComment = { link = 'Comment' },
-		TSConditional = { link = 'Conditional' },
-		TSConstBuiltin = { fg = p.love },
-		-- TSConstMacro = {},
-		TSConstant = { fg = p.foam },
-		TSConstructor = { fg = p.foam },
-		-- TSEmphasis = {},
-		-- TSError = {},
-		-- TSException = {},
-		TSField = { fg = p.foam },
-		-- TSFloat = {},
-		TSFuncBuiltin = { fg = p.love },
-		-- TSFuncMacro = {},
-		TSFunction = { fg = p.rose },
-		TSInclude = { fg = p.pine },
-		TSKeyword = { fg = p.pine },
-		-- TSKeywordFunction = {},
-		TSKeywordOperator = { fg = p.subtle },
-		TSLabel = { fg = p.foam },
-		-- TSLiteral = {},
-		-- TSMethod = {},
-		-- TSNamespace = {},
-		-- TSNone = {},
-		TSNumber = { link = 'Number' },
-		TSOperator = { fg = p.subtle },
-		TSParameter = { fg = p.iris, style = styles.italic },
-		-- TSParameterReference = {},
-		TSProperty = { fg = p.iris, style = styles.italic },
-		TSPunctBracket = { fg = groups.punctuation },
-		TSPunctDelimiter = { fg = groups.punctuation },
-		TSPunctSpecial = { fg = groups.punctuation },
-		-- TSRepeat = {},
-		-- TSStrike = {},
-		TSString = { link = 'String' },
-		TSStringEscape = { fg = p.pine },
-		-- TSStringRegex = {},
-		TSStringSpecial = { link = 'TSString' },
-		-- TSSymbol = {},
-		TSTag = { fg = p.foam },
-		TSTagDelimiter = { fg = p.subtle },
-		TSText = { fg = p.text },
-		TSTitle = { fg = groups.headings.h1, style = 'bold' },
-		TSType = { link = 'Type' },
-		-- TSTypeBuiltin = {},
-		TSURI = { fg = groups.link },
-		-- TSUnderline = {},
-		TSVariable = { fg = p.text, style = styles.italic },
-		TSVariableBuiltin = { fg = p.love },
+	-- healthcheck
+	h('healthError', { fg = groups.error })
+	h('healthSuccess', { fg = groups.info })
+	h('healthWarning', { fg = groups.warn })
 
-		-- Treesitter
-		['@annotation'] = { link = 'PreProc' },
-		['@attribute'] = { link = 'PreProc' },
-		['@boolean'] = { link = 'Boolean' },
-		['@character'] = { link = 'Character' },
-		['@comment'] = { link = 'Comment' },
-		['@conditional'] = { link = 'Conditional' },
-		['@constant'] = { fg = p.foam },
-		['@constant.builtin'] = { fg = p.love },
-		['@constructor'] = { fg = p.foam },
-		['@field'] = { fg = p.foam },
-		['@function'] = { fg = p.rose },
-		['@function.builtin'] = { fg = p.love },
-		['@include'] = { fg = p.pine },
-		['@keyword'] = { fg = p.pine },
-		['@keyword.operator'] = { fg = p.subtle },
-		['@label'] = { fg = p.foam },
-		['@namespace'] = { link = 'Include' },
-		['@number'] = { link = 'Number' },
-		['@operator'] = { fg = p.subtle },
-		['@parameter'] = { fg = p.iris, style = styles.italic },
-		['@property'] = { fg = p.iris, style = styles.italic },
-		['@punctuation.bracket'] = { fg = groups.punctuation },
-		['@punctuation.delimiter'] = { fg = groups.punctuation },
-		['@punctuation.special'] = { fg = groups.punctuation },
-		['@string'] = { link = 'String' },
-		['@string.escape'] = { fg = p.pine },
-		['@string.special'] = { link = '@string' },
-		['@symbol'] = { link = 'Identifier' },
-		['@tag'] = { fg = p.foam },
-		['@tag.attribute'] = { link = '@property' },
-		['@tag.delimiter'] = { fg = p.subtle },
-		['@text'] = { fg = p.text },
-		['@text.strong'] = { bold = true },
-		['@text.emphasis'] = { italic = true },
-		['@text.underline'] = { underline = true },
-		['@text.strike'] = { strikethrough = true },
-		['@text.math'] = { link = 'Special' },
-		['@text.environment'] = { link = 'Macro' },
-		['@text.environment.name'] = { link = 'Type' },
-		['@text.title'] = { fg = groups.headings.h1, style = 'bold' },
-		['@text.uri'] = { fg = groups.link },
-		['@text.note'] = { link = 'SpecialComment' },
-		['@text.warning'] = { link = 'Todo' },
-		['@text.danger'] = { link = 'WarningMsg' },
-		['@todo'] = { link = 'Todo' },
-		['@type'] = { link = 'Type' },
-		['@variable'] = { fg = p.text, style = styles.italic },
-		['@variable.builtin'] = { fg = p.love },
+	-- Treesitter
+	h('@boolean', { link = 'Boolean' })
+	h('@character', { link = 'Character' })
+	h('@character.special', { link = '@character' })
+	h('@class', { fg = p.foam })
+	h('@comment', { link = 'Comment' })
+	h('@conditional', { link = 'Conditional' })
+	h('@constant', { link = 'Constant' })
+	h('@constant.builtin', { fg = p.love })
+	h('@constant.macro', { link = '@constant' })
+	h('@constructor', { fg = p.foam })
+	h('@field', { fg = p.foam })
+	h('@function', { link = 'Function' })
+	h('@function.builtin', { fg = p.love })
+	h('@function.macro', { link = '@function' })
+	h('@include', { link = 'Include' })
+	h('@interface', { fg = p.foam })
+	h('@keyword', { link = 'Keyword' })
+	h('@keyword.operator', { fg = p.subtle })
+	h('@label', { link = 'Label' })
+	h('@macro', { link = 'Macro' })
+	h('@method', { fg = p.iris })
+	h('@number', { link = 'Number' })
+	h('@operator', { link = 'Operator' })
+	h('@parameter', { fg = p.iris, italic = maybe.italic })
+	h('@preproc', { link = 'PreProc' })
+	h('@property', { fg = p.foam, italic = maybe.italic })
+	h('@punctuation', { fg = groups.punctuation })
+	h('@punctuation.bracket', { link = '@punctuation' })
+	h('@punctuation.delimiter', { link = '@punctuation' })
+	h('@punctuation.special', { link = '@punctuation' })
+	h('@regexp', { link = 'String' })
+	h('@repeat', { link = 'Repeat' })
+	h('@storageclass', { link = 'StorageClass' })
+	h('@string', { link = 'String' })
+	h('@string.escape', { fg = p.pine })
+	h('@string.special', { link = '@string' })
+	h('@symbol', { link = 'Identifier' })
+	h('@tag', { link = 'Tag' })
+	h('@tag.attribute', { fg = p.iris })
+	h('@tag.delimiter', { fg = p.subtle })
+	h('@text', { fg = p.text })
+	h('@text.strong', { bold = true })
+	h('@text.emphasis', { italic = true })
+	h('@text.underline', { underline = true })
+	h('@text.strike', { strikethrough = true })
+	h('@text.math', { link = 'Special' })
+	h('@text.environment', { link = 'Macro' })
+	h('@text.environment.name', { link = 'Type' })
+	h('@text.title', { link = 'Title' })
+	h('@text.uri', { fg = groups.link })
+	h('@text.note', { link = 'SpecialComment' })
+	h('@text.warning', { fg = groups.warn })
+	h('@text.danger', { fg = groups.error })
+	h('@todo', { link = 'Todo' })
+	h('@type', { link = 'Type' })
+	h('@variable', { fg = p.text, italic = maybe.italic })
+	h('@variable.builtin', { fg = p.love })
 
-		-- vim.lsp.buf.document_highlight()
-		LspReferenceText = { bg = p.highlight_med },
-		LspReferenceRead = { bg = p.highlight_med },
-		LspReferenceWrite = { bg = p.highlight_med },
+	-- vim.lsp.buf.document_highlight()
+	h('LspReferenceText', { bg = p.highlight_med })
+	h('LspReferenceRead', { bg = p.highlight_med })
+	h('LspReferenceWrite', { bg = p.highlight_med })
 
-		-- lsp-highlight-codelens
-		LspCodeLens = { fg = p.subtle }, -- virtual text of code lens
-		LspCodeLensSeparator = { fg = p.highlight_high }, -- separator between two or more code lens
+	-- lsp-highlight-codelens
+	h('LspCodeLens', { fg = p.subtle }) -- virtual text of code len
+	h('LspCodeLensSeparator', { fg = p.highlight_high }) -- separator between two or more code len
 
-		-- romgrk/barbar.nvim
-		BufferCurrent = { fg = p.text, bg = p.overlay },
-		BufferCurrentIndex = { fg = p.text, bg = p.overlay },
-		BufferCurrentMod = { fg = p.foam, bg = p.overlay },
-		BufferCurrentSign = { fg = p.subtle, bg = p.overlay },
-		BufferCurrentTarget = { fg = p.gold, bg = p.overlay },
-		BufferInactive = { fg = p.subtle },
-		BufferInactiveIndex = { fg = p.subtle },
-		BufferInactiveMod = { fg = p.foam },
-		BufferInactiveSign = { fg = p.muted },
-		BufferInactiveTarget = { fg = p.gold },
-		BufferTabpageFill = { fg = groups.background, bg = groups.background },
-		BufferVisible = { fg = p.subtle },
-		BufferVisibleIndex = { fg = p.subtle },
-		BufferVisibleMod = { fg = p.foam },
-		BufferVisibleSign = { fg = p.muted },
-		BufferVisibleTarget = { fg = p.gold },
+	-- romgrk/barbar.nvim
+	h('BufferCurrent', { fg = p.text, bg = p.overlay })
+	h('BufferCurrentIndex', { fg = p.text, bg = p.overlay })
+	h('BufferCurrentMod', { fg = p.foam, bg = p.overlay })
+	h('BufferCurrentSign', { fg = p.subtle, bg = p.overlay })
+	h('BufferCurrentTarget', { fg = p.gold, bg = p.overlay })
+	h('BufferInactive', { fg = p.subtle })
+	h('BufferInactiveIndex', { fg = p.subtle })
+	h('BufferInactiveMod', { fg = p.foam })
+	h('BufferInactiveSign', { fg = p.muted })
+	h('BufferInactiveTarget', { fg = p.gold })
+	h('BufferTabpageFill', { fg = p.base, bg = p.base })
+	h('BufferVisible', { fg = p.subtle })
+	h('BufferVisibleIndex', { fg = p.subtle })
+	h('BufferVisibleMod', { fg = p.foam })
+	h('BufferVisibleSign', { fg = p.muted })
+	h('BufferVisibleTarget', { fg = p.gold })
 
-		-- lewis6991/gitsigns.nvim
-		GitSignsAdd = { fg = groups.git_add },
-		GitSignsChange = { fg = groups.git_change },
-		GitSignsDelete = { fg = groups.git_delete },
-		SignAdd = { link = 'GitSignsAdd' },
-		SignChange = { link = 'GitSignsChange' },
-		SignDelete = { link = 'GitSignsDelete' },
+	-- lewis6991/gitsigns.nvim
+	h('GitSignsAdd', { fg = groups.git_add })
+	h('GitSignsChange', { fg = groups.git_change })
+	h('GitSignsDelete', { fg = groups.git_delete })
+	h('SignAdd', { link = 'GitSignsAdd' })
+	h('SignChange', { link = 'GitSignsChange' })
+	h('SignDelete', { link = 'GitSignsDelete' })
 
-		-- mvllow/modes.nvim
-		ModesCopy = { bg = p.gold },
-		ModesDelete = { bg = p.love },
-		ModesInsert = { bg = p.foam },
-		ModesVisual = { bg = p.iris },
+	-- mvllow/modes.nvim
+	h('ModesCopy', { bg = p.gold })
+	h('ModesDelete', { bg = p.love })
+	h('ModesInsert', { bg = p.foam })
+	h('ModesVisual', { bg = p.iris })
 
-		-- kyazdani42/nvim-tree.lua
-		NvimTreeEmptyFolderName = { fg = p.muted },
-		NvimTreeFileDeleted = { fg = p.love },
-		NvimTreeFileDirty = { fg = p.rose },
-		NvimTreeFileMerge = { fg = p.iris },
-		NvimTreeFileNew = { fg = p.foam },
-		NvimTreeFileRenamed = { fg = p.pine },
-		NvimTreeFileStaged = { fg = p.iris },
-		NvimTreeFolderIcon = { fg = p.subtle },
-		NvimTreeFolderName = { fg = p.foam },
-		NvimTreeGitDeleted = { fg = groups.git_delete },
-		NvimTreeGitDirty = { fg = groups.git_dirty },
-		NvimTreeGitIgnored = { fg = groups.git_ignore },
-		NvimTreeGitMerge = { fg = groups.git_merge },
-		NvimTreeGitNew = { fg = groups.git_add },
-		NvimTreeGitRenamed = { fg = groups.git_rename },
-		NvimTreeGitStaged = { fg = groups.git_stage },
-		NvimTreeImageFile = { fg = p.text },
-		NvimTreeNormal = { fg = p.text },
-		NvimTreeOpenedFile = { fg = p.text, bg = p.highlight_med },
-		NvimTreeOpenedFolderName = { link = 'NvimTreeFolderName' },
-		NvimTreeRootFolder = { fg = p.iris },
-		NvimTreeSpecialFile = { link = 'NvimTreeNormal' },
-		NvimTreeWindowPicker = { fg = groups.background, bg = p.iris },
+	-- kyazdani42/nvim-tree.lua
+	h('NvimTreeEmptyFolderName', { fg = p.muted })
+	h('NvimTreeFileDeleted', { fg = p.love })
+	h('NvimTreeFileDirty', { fg = p.rose })
+	h('NvimTreeFileMerge', { fg = p.iris })
+	h('NvimTreeFileNew', { fg = p.foam })
+	h('NvimTreeFileRenamed', { fg = p.pine })
+	h('NvimTreeFileStaged', { fg = p.iris })
+	h('NvimTreeFolderIcon', { fg = p.subtle })
+	h('NvimTreeFolderName', { fg = p.foam })
+	h('NvimTreeGitDeleted', { fg = groups.git_delete })
+	h('NvimTreeGitDirty', { fg = groups.git_dirty })
+	h('NvimTreeGitIgnored', { fg = groups.git_ignore })
+	h('NvimTreeGitMerge', { fg = groups.git_merge })
+	h('NvimTreeGitNew', { fg = groups.git_add })
+	h('NvimTreeGitRenamed', { fg = groups.git_rename })
+	h('NvimTreeGitStaged', { fg = groups.git_stage })
+	h('NvimTreeImageFile', { fg = p.text })
+	h('NvimTreeNormal', { fg = p.text })
+	h('NvimTreeOpenedFile', { fg = p.text, bg = p.highlight_med })
+	h('NvimTreeOpenedFolderName', { link = 'NvimTreeFolderName' })
+	h('NvimTreeRootFolder', { fg = p.iris })
+	h('NvimTreeSpecialFile', { link = 'NvimTreeNormal' })
+	h('NvimTreeWindowPicker', { fg = p.love, bg = p.love, blend = 10 })
 
-		-- folke/which-key.nvim
-		WhichKey = { fg = p.iris },
-		WhichKeyGroup = { fg = p.foam },
-		WhichKeySeparator = { fg = p.subtle },
-		WhichKeyDesc = { fg = p.gold },
-		WhichKeyFloat = { bg = groups.panel },
-		WhichKeyValue = { fg = p.rose },
+	-- folke/which-key.nvim
+	h('WhichKey', { fg = p.iris })
+	h('WhichKeyGroup', { fg = p.foam })
+	h('WhichKeySeparator', { fg = p.subtle })
+	h('WhichKeyDesc', { fg = p.gold })
+	h('WhichKeyFloat', { bg = maybe.surface })
+	h('WhichKeyValue', { fg = p.rose })
 
-		-- luka-reineke/indent-blankline.nvim
-		IndentBlanklineChar = { fg = p.muted },
-		IndentBlanklineSpaceChar = { fg = p.muted },
-		IndentBlanklineSpaceCharBlankline = { fg = p.muted },
+	-- luka-reineke/indent-blankline.nvim
+	h('IndentBlanklineChar', { fg = p.muted })
+	h('IndentBlanklineSpaceChar', { fg = p.muted })
+	h('IndentBlanklineSpaceCharBlankline', { fg = p.muted })
 
-		-- hrsh7th/nvim-cmp
-		CmpItemAbbr = { fg = p.subtle },
-		CmpItemAbbrDeprecated = { fg = p.subtle, style = 'strikethrough' },
-		CmpItemAbbrMatch = { fg = p.text, style = 'bold' },
-		CmpItemAbbrMatchFuzzy = { fg = p.text, style = 'bold' },
-		CmpItemKind = { fg = p.iris },
-		CmpItemKindClass = { fg = p.gold },
-		CmpItemKindFunction = { fg = p.iris },
-		CmpItemKindInterface = { fg = p.gold },
-		CmpItemKindMethod = { fg = p.iris },
-		CmpItemKindSnippet = { fg = p.iris },
-		CmpItemKindVariable = { fg = p.foam },
+	-- hrsh7th/nvim-cmp
+	h('CmpItemAbbr', { fg = p.subtle })
+	h('CmpItemAbbrDeprecated', { fg = p.subtle, strikethrough = true })
+	h('CmpItemAbbrMatch', { fg = p.text, bold = true })
+	h('CmpItemAbbrMatchFuzzy', { fg = p.text, bold = true })
+	h('CmpItemKind', { fg = p.subtle })
+	h('CmpItemKindClass', { fg = p.pine })
+	h('CmpItemKindFunction', { fg = p.rose })
+	h('CmpItemKindInterface', { fg = p.foam })
+	h('CmpItemKindMethod', { fg = p.iris })
+	h('CmpItemKindSnippet', { fg = p.gold })
+	h('CmpItemKindVariable', { fg = p.text })
 
-		-- TimUntersberger/neogit
-		NeogitDiffAddHighlight = { fg = p.foam, bg = p.highlight_med },
-		NeogitDiffContextHighlight = { bg = p.highlight_low },
-		NeogitDiffDeleteHighlight = { fg = p.love, bg = p.highlight_med },
-		NeogitHunkHeader = { bg = p.highlight_low },
-		NeogitHunkHeaderHighlight = { bg = p.highlight_low },
+	-- TimUntersberger/neogit
+	h('NeogitDiffAddHighlight', { fg = p.foam, bg = p.highlight_med })
+	h('NeogitDiffContextHighlight', { bg = p.highlight_low })
+	h('NeogitDiffDeleteHighlight', { fg = p.love, bg = p.highlight_med })
+	h('NeogitHunkHeader', { bg = p.highlight_low })
+	h('NeogitHunkHeaderHighlight', { bg = p.highlight_low })
 
-		-- vimwiki/vimwiki
-		VimwikiHR = { fg = p.subtle },
-		VimwikiHeader1 = { fg = groups.headings.h1, style = 'bold' },
-		VimwikiHeader2 = { fg = groups.headings.h2, style = 'bold' },
-		VimwikiHeader3 = { fg = groups.headings.h3, style = 'bold' },
-		VimwikiHeader4 = { fg = groups.headings.h4, style = 'bold' },
-		VimwikiHeader5 = { fg = groups.headings.h5, style = 'bold' },
-		VimwikiHeader6 = { fg = groups.headings.h6, style = 'bold' },
-		VimwikiHeaderChar = { fg = p.pine },
-		VimwikiLink = { fg = groups.link, style = 'underline' },
-		VimwikiList = { fg = p.iris },
-		VimwikiNoExistsLink = { fg = p.love },
+	-- vimwiki/vimwiki
+	h('VimwikiHR', { fg = p.subtle })
+	h('VimwikiHeader1', { fg = groups.headings.h1, bold = true })
+	h('VimwikiHeader2', { fg = groups.headings.h2, bold = true })
+	h('VimwikiHeader3', { fg = groups.headings.h3, bold = true })
+	h('VimwikiHeader4', { fg = groups.headings.h4, bold = true })
+	h('VimwikiHeader5', { fg = groups.headings.h5, bold = true })
+	h('VimwikiHeader6', { fg = groups.headings.h6, bold = true })
+	h('VimwikiHeaderChar', { fg = p.pine })
+	h('VimwikiLink', { fg = groups.link, underline = true })
+	h('VimwikiList', { fg = p.iris })
+	h('VimwikiNoExistsLink', { fg = p.love })
 
-		-- nvim-neorg/neorg
-		NeorgHeading1Prefix = { fg = groups.headings.h1, style = 'bold' },
-		NeorgHeading1Title = { link = 'NeorgHeading1Prefix' },
-		NeorgHeading2Prefix = { fg = groups.headings.h2, style = 'bold' },
-		NeorgHeading2Title = { link = 'NeorgHeading2Prefix' },
-		NeorgHeading3Prefix = { fg = groups.headings.h3, style = 'bold' },
-		NeorgHeading3Title = { link = 'NeorgHeading3Prefix' },
-		NeorgHeading4Prefix = { fg = groups.headings.h4, style = 'bold' },
-		NeorgHeading4Title = { link = 'NeorgHeading4Prefix' },
-		NeorgHeading5Prefix = { fg = groups.headings.h5, style = 'bold' },
-		NeorgHeading5Title = { link = 'NeorgHeading5Prefix' },
-		NeorgHeading6Prefix = { fg = groups.headings.h6, style = 'bold' },
-		NeorgHeading6Title = { link = 'NeorgHeading6Prefix' },
-		NeorgMarkerTitle = { fg = p.text, style = 'bold' },
+	-- nvim-neorg/neorg
+	h('NeorgHeading1Prefix', { fg = groups.headings.h1, bold = true })
+	h('NeorgHeading1Title', { link = 'NeorgHeading1Prefix' })
+	h('NeorgHeading2Prefix', { fg = groups.headings.h2, bold = true })
+	h('NeorgHeading2Title', { link = 'NeorgHeading2Prefix' })
+	h('NeorgHeading3Prefix', { fg = groups.headings.h3, bold = true })
+	h('NeorgHeading3Title', { link = 'NeorgHeading3Prefix' })
+	h('NeorgHeading4Prefix', { fg = groups.headings.h4, bold = true })
+	h('NeorgHeading4Title', { link = 'NeorgHeading4Prefix' })
+	h('NeorgHeading5Prefix', { fg = groups.headings.h5, bold = true })
+	h('NeorgHeading5Title', { link = 'NeorgHeading5Prefix' })
+	h('NeorgHeading6Prefix', { fg = groups.headings.h6, bold = true })
+	h('NeorgHeading6Title', { link = 'NeorgHeading6Prefix' })
+	h('NeorgMarkerTitle', { fg = p.text, bold = true })
 
-		-- tami5/lspsaga.nvim (fork of glepnir/lspsaga.nvim)
-		DefinitionCount = { fg = p.rose },
-		DefinitionIcon = { fg = p.rose },
-		DefintionPreviewTitle = { fg = p.rose, style = 'bold' },
-		LspFloatWinBorder = { fg = groups.border },
-		LspFloatWinNormal = { bg = groups.background },
-		LspSagaAutoPreview = { fg = p.subtle },
-		LspSagaCodeActionBorder = { fg = groups.border },
-		LspSagaCodeActionContent = { fg = p.foam },
-		LspSagaCodeActionTitle = { fg = p.gold, style = 'bold' },
-		LspSagaCodeActionTruncateLine = { link = 'LspSagaCodeActionBorder' },
-		LspSagaDefPreviewBorder = { fg = groups.border },
-		LspSagaDiagnosticBorder = { fg = groups.border },
-		LspSagaDiagnosticHeader = { fg = p.gold, style = 'bold' },
-		LspSagaDiagnosticTruncateLine = { link = 'LspSagaDiagnosticBorder' },
-		LspSagaDocTruncateLine = { link = 'LspSagaHoverBorder' },
-		LspSagaFinderSelection = { fg = p.gold },
-		LspSagaHoverBorder = { fg = groups.border },
-		LspSagaLspFinderBorder = { fg = groups.border },
-		LspSagaRenameBorder = { fg = p.pine },
-		LspSagaRenamePromptPrefix = { fg = p.love },
-		LspSagaShTruncateLine = { link = 'LspSagaSignatureHelpBorder' },
-		LspSagaSignatureHelpBorder = { fg = p.pine },
-		ReferencesCount = { fg = p.rose },
-		ReferencesIcon = { fg = p.rose },
-		SagaShadow = { bg = p.overlay },
-		TargetWord = { fg = p.iris },
+	-- tami5/lspsaga.nvim (fork of glepnir/lspsaga.nvim)
+	h('DefinitionCount', { fg = p.rose })
+	h('DefinitionIcon', { fg = p.rose })
+	h('DefintionPreviewTitle', { fg = p.rose, bold = true })
+	h('LspFloatWinBorder', { fg = groups.border })
+	h('LspFloatWinNormal', { bg = maybe.surface })
+	h('LspSagaAutoPreview', { fg = p.subtle })
+	h('LspSagaCodeActionBorder', { fg = groups.border })
+	h('LspSagaCodeActionContent', { fg = p.foam })
+	h('LspSagaCodeActionTitle', { fg = p.gold, bold = true })
+	h('LspSagaCodeActionTruncateLine', { link = 'LspSagaCodeActionBorder' })
+	h('LspSagaDefPreviewBorder', { fg = groups.border })
+	h('LspSagaDiagnosticBorder', { fg = groups.border })
+	h('LspSagaDiagnosticHeader', { fg = p.gold, bold = true })
+	h('LspSagaDiagnosticTruncateLine', { link = 'LspSagaDiagnosticBorder' })
+	h('LspSagaDocTruncateLine', { link = 'LspSagaHoverBorder' })
+	h('LspSagaFinderSelection', { fg = p.gold })
+	h('LspSagaHoverBorder', { fg = groups.border })
+	h('LspSagaLspFinderBorder', { fg = groups.border })
+	h('LspSagaRenameBorder', { fg = p.pine })
+	h('LspSagaRenamePromptPrefix', { fg = p.love })
+	h('LspSagaShTruncateLine', { link = 'LspSagaSignatureHelpBorder' })
+	h('LspSagaSignatureHelpBorder', { fg = p.pine })
+	h('ReferencesCount', { fg = p.rose })
+	h('ReferencesIcon', { fg = p.rose })
+	h('SagaShadow', { bg = p.overlay })
+	h('TargetWord', { fg = p.iris })
 
-		-- ray-x/lsp_signature.nvim
-		LspSignatureActiveParameter = { bg = p.overlay },
+	-- ray-x/lsp_signature.nvim
+	h('LspSignatureActiveParameter', { bg = p.overlay })
 
-		-- rlane/pounce.nvim
-		PounceAccept = { fg = p.love, bg = p.highlight_high },
-		PounceAcceptBest = { fg = p.base, bg = p.gold },
-		PounceGap = { link = 'Search' },
-		PounceMatch = { link = 'Search' },
+	-- rlane/pounce.nvim
+	h('PounceAccept', { fg = p.love, bg = p.highlight_high })
+	h('PounceAcceptBest', { fg = p.base, bg = p.gold })
+	h('PounceGap', { link = 'Search' })
+	h('PounceMatch', { link = 'Search' })
 
-		-- nvim-telescope/telescope.nvim
-		TelescopeBorder = { fg = groups.border, bg = styles.float_background },
-		TelescopeMatching = { fg = p.rose },
-		TelescopeNormal = { fg = p.subtle, bg = styles.float_background },
-		TelescopePromptNormal = { fg = p.text, bg = styles.float_background },
-		TelescopePromptPrefix = { fg = p.subtle },
-		TelescopeSelection = { fg = p.text, bg = p.overlay },
-		TelescopeSelectionCaret = { fg = p.rose, bg = p.overlay },
-		TelescopeTitle = { fg = p.subtle },
+	-- nvim-telescope/telescope.nvim
+	h('TelescopeBorder', { fg = groups.border, bg = maybe.surface })
+	h('TelescopeMatching', { fg = p.rose })
+	h('TelescopeNormal', { fg = p.subtle, bg = maybe.surface })
+	h('TelescopePromptNormal', {
+		fg = p.text,
+		bg = (
+			options.dim_nc_background
+			and (options.disable_float_background and p.nc or p.surface)
+		) or maybe.surface,
+	})
+	h('TelescopePromptPrefix', { fg = p.subtle })
+	h('TelescopeSelection', { fg = p.text, bg = p.overlay })
+	h('TelescopeSelectionCaret', { fg = p.rose, bg = p.overlay })
+	h('TelescopeTitle', { fg = p.subtle })
 
-		-- rcarriga/nvim-notify
-		NotifyINFOBorder = { fg = p.foam },
-		NotifyINFOTitle = { link = 'NotifyINFOBorder' },
-		NotifyINFOIcon = { link = 'NotifyINFOBorder' },
-		NotifyWARNBorder = { fg = p.gold },
-		NotifyWARNTitle = { link = 'NotifyWARNBorder' },
-		NotifyWARNIcon = { link = 'NotifyWARNBorder' },
-		NotifyDEBUGBorder = { fg = p.muted },
-		NotifyDEBUGTitle = { link = 'NotifyDEBUGBorder' },
-		NotifyDEBUGIcon = { link = 'NotifyDEBUGBorder' },
-		NotifyTRACEBorder = { fg = p.iris },
-		NotifyTRACETitle = { link = 'NotifyTRACEBorder' },
-		NotifyTRACEIcon = { link = 'NotifyTRACEBorder' },
-		NotifyERRORBorder = { fg = p.love },
-		NotifyERRORTitle = { link = 'NotifyERRORBorder' },
-		NotifyERRORIcon = { link = 'NotifyERRORBorder' },
+	-- rcarriga/nvim-notify
+	h('NotifyINFOBorder', { fg = p.foam })
+	h('NotifyINFOTitle', { link = 'NotifyINFOBorder' })
+	h('NotifyINFOIcon', { link = 'NotifyINFOBorder' })
+	h('NotifyWARNBorder', { fg = p.gold })
+	h('NotifyWARNTitle', { link = 'NotifyWARNBorder' })
+	h('NotifyWARNIcon', { link = 'NotifyWARNBorder' })
+	h('NotifyDEBUGBorder', { fg = p.muted })
+	h('NotifyDEBUGTitle', { link = 'NotifyDEBUGBorder' })
+	h('NotifyDEBUGIcon', { link = 'NotifyDEBUGBorder' })
+	h('NotifyTRACEBorder', { fg = p.iris })
+	h('NotifyTRACETitle', { link = 'NotifyTRACEBorder' })
+	h('NotifyTRACEIcon', { link = 'NotifyTRACEBorder' })
+	h('NotifyERRORBorder', { fg = p.love })
+	h('NotifyERRORTitle', { link = 'NotifyERRORBorder' })
+	h('NotifyERRORIcon', { link = 'NotifyERRORBorder' })
 
-		-- rcarriga/nvim-dap-ui
-		DapUIVariable = { link = 'Normal' },
-		DapUIValue = { link = 'Normal' },
-		DapUIFrameName = { link = 'Normal' },
-		DapUIThread = { fg = p.gold },
-		DapUIWatchesValue = { link = 'DapUIThread' },
-		DapUIBreakpointsInfo = { link = 'DapUIThread' },
-		DapUIBreakpointsCurrentLine = { fg = p.gold, style = 'bold' },
-		DapUIWatchesEmpty = { fg = p.love },
-		DapUIWatchesError = { link = 'DapUIWatchesEmpty' },
-		DapUIBreakpointsDisabledLine = { fg = p.muted },
-		DapUISource = { fg = p.iris },
-		DapUIBreakpointsPath = { fg = p.foam },
-		DapUIScope = { link = 'DapUIBreakpointsPath' },
-		DapUILineNumber = { link = 'DapUIBreakpointsPath' },
-		DapUIBreakpointsLine = { link = 'DapUIBreakpointsPath' },
-		DapUIFloatBorder = { link = 'DapUIBreakpointsPath' },
-		DapUIStoppedThread = { link = 'DapUIBreakpointsPath' },
-		DapUIDecoration = { link = 'DapUIBreakpointsPath' },
-		DapUIModifiedValue = { fg = p.foam, style = 'bold' },
+	-- rcarriga/nvim-dap-ui
+	h('DapUIVariable', { link = 'Normal' })
+	h('DapUIValue', { link = 'Normal' })
+	h('DapUIFrameName', { link = 'Normal' })
+	h('DapUIThread', { fg = p.gold })
+	h('DapUIWatchesValue', { link = 'DapUIThread' })
+	h('DapUIBreakpointsInfo', { link = 'DapUIThread' })
+	h('DapUIBreakpointsCurrentLine', { fg = p.gold, bold = true })
+	h('DapUIWatchesEmpty', { fg = p.love })
+	h('DapUIWatchesError', { link = 'DapUIWatchesEmpty' })
+	h('DapUIBreakpointsDisabledLine', { fg = p.muted })
+	h('DapUISource', { fg = p.iris })
+	h('DapUIBreakpointsPath', { fg = p.foam })
+	h('DapUIScope', { link = 'DapUIBreakpointsPath' })
+	h('DapUILineNumber', { link = 'DapUIBreakpointsPath' })
+	h('DapUIBreakpointsLine', { link = 'DapUIBreakpointsPath' })
+	h('DapUIFloatBorder', { link = 'DapUIBreakpointsPath' })
+	h('DapUIStoppedThread', { link = 'DapUIBreakpointsPath' })
+	h('DapUIDecoration', { link = 'DapUIBreakpointsPath' })
+	h('DapUIModifiedValue', { fg = p.foam, bold = true })
 
-		-- glepnir/dashboard-nvim
-		DashboardShortcut = { fg = p.love },
-		DashboardHeader = { fg = p.pine },
-		DashboardCenter = { fg = p.gold },
-		DashboardFooter = { fg = p.iris },
-	}
+	-- glepnir/dashboard-nvim
+	h('DashboardShortcut', { fg = p.love })
+	h('DashboardHeader', { fg = p.pine })
+	h('DashboardCenter', { fg = p.gold })
+	h('DashboardFooter', { fg = p.iris })
 
 	vim.g.terminal_color_0 = p.overlay -- black
 	vim.g.terminal_color_8 = p.subtle -- bright black
@@ -536,7 +501,10 @@ function M.get(config)
 	vim.g.terminal_color_7 = p.text -- white
 	vim.g.terminal_color_15 = p.text -- bright white
 
-	return theme
+	-- Set user highlights
+	for group, color in pairs(options.highlight_groups) do
+		h(group, color)
+	end
 end
 
 return M
diff --git a/lua/rose-pine/util.lua b/lua/rose-pine/util.lua
index 2bfdf85..f8b84f9 100644
--- a/lua/rose-pine/util.lua
+++ b/lua/rose-pine/util.lua
@@ -33,11 +33,11 @@ end
 ---@param bg string background color
 ---@param alpha number number between 0 (background) and 1 (foreground)
 util.blend = function(fg, bg, alpha)
-	fg = rgb(parse_color(fg))
-	bg = rgb(parse_color(bg))
+	local fg_rgb = rgb(parse_color(fg))
+	local bg_rgb = rgb(parse_color(bg))
 
 	local function blend_channel(i)
-		local ret = (alpha * fg[i] + ((1 - alpha) * bg[i]))
+		local ret = (alpha * fg_rgb[i] + ((1 - alpha) * bg_rgb[i]))
 		return math.floor(math.min(math.max(0, ret), 255) + 0.5)
 	end
 
@@ -50,18 +50,22 @@ util.blend = function(fg, bg, alpha)
 end
 
 ---@param group string
----@param color table<string, string>
+---@param color table<string, any>
 util.highlight = function(group, color)
-	local style = color.style and 'gui=' .. color.style or 'gui=NONE'
-	local fg = color.fg and 'guifg=' .. parse_color(color.fg) or 'guifg=NONE'
-	local bg = color.bg and 'guibg=' .. parse_color(color.bg) or 'guibg=NONE'
-	local sp = color.sp and 'guisp=' .. parse_color(color.sp) or ''
+	local fg = color.fg and parse_color(color.fg) or 'none'
+	local bg = color.bg and parse_color(color.bg) or 'none'
+	local sp = color.sp and parse_color(color.sp) or ''
 
-	vim.cmd(string.format('highlight %s %s %s %s %s', group, style, fg, bg, sp))
-
-	if color.link then
-		vim.cmd(string.format('highlight! link %s %s', group, color.link))
+	if
+		color.blend ~= nil
+		and (color.blend >= 0 or color.blend <= 100)
+		and bg ~= nil
+	then
+		bg = util.blend(bg, parse_color('base') or '', color.blend / 100)
 	end
+
+	color = vim.tbl_extend('force', color, { fg = fg, bg = bg, sp = sp })
+	vim.api.nvim_set_hl(0, group, color)
 end
 
 return util
diff --git a/readme.md b/readme.md
index af2c78a..76925f3 100644
--- a/readme.md
+++ b/readme.md
@@ -65,7 +65,9 @@ Variant respects `vim.o.background`, using dawn when light and `dark_variant` wh
 
 ```lua
 require('rose-pine').setup({
-	--- @usage 'main' | 'moon'
+	--- @usage 'auto'|'main'|'moon'|'dawn'
+	variant = 'auto',
+	--- @usage 'main'|'moon'|'dawn'
 	dark_variant = 'main',
 	bold_vert_split = false,
 	dim_nc_background = false,
@@ -101,7 +103,11 @@ require('rose-pine').setup({
 
 	-- Change specific vim highlight groups
 	highlight_groups = {
-		ColorColumn = { bg = 'rose' }
+		ColorColumn = { bg = 'rose' },
+
+		-- Blend colours against the "base" background
+		CursorLine = { bg = 'foam', blend = 10 },
+		StatusLine = { fg = 'love', bg = 'love', blend = 10 },
 	}
 })
 

From 8f3894b5b8bda18d7dce21a0e3ac4fbad522fc75 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Thu, 23 Feb 2023 13:52:31 -0600
Subject: [PATCH 055/190] fix: transparent `Pmenu` when
 `disable_float_background`

Closes #124
---
 lua/rose-pine/theme.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index f065f69..458efa3 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 = p.surface })
+	h('Pmenu', { fg = p.subtle, bg = p.maybe_surface })
 	h('PmenuSbar', { bg = p.highlight_low })
 	h('PmenuSel', { fg = p.text, bg = p.overlay })
 	h('PmenuThumb', { bg = p.highlight_med })

From 022be54f7d13bbb7e088b618452f99f7be3e30fb Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Thu, 23 Feb 2023 14:34:03 -0600
Subject: [PATCH 056/190] Update readme.md

---
 readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readme.md b/readme.md
index 76925f3..c197a31 100644
--- a/readme.md
+++ b/readme.md
@@ -102,6 +102,7 @@ require('rose-pine').setup({
 	},
 
 	-- Change specific vim highlight groups
+	-- https://github.com/rose-pine/neovim/wiki/Recipes
 	highlight_groups = {
 		ColorColumn = { bg = 'rose' },
 

From a68fd96801e0b24dc825905d6765ca7091392d9d Mon Sep 17 00:00:00 2001
From: Brian Di Palma <1597820+briandipalma@users.noreply.github.com>
Date: Fri, 24 Feb 2023 18:06:25 +0000
Subject: [PATCH 057/190] fix: Make extent/size of floating windows clearer
 (#129)

---
 lua/rose-pine/theme.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 458efa3..806ff46 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -36,7 +36,7 @@ function M._load(options)
 	h('Directory', { fg = p.foam, bg = p.none })
 	-- EndOfBuffer = {},
 	h('ErrorMsg', { fg = p.love, bold = true })
-	h('FloatBorder', { fg = groups.border })
+	h('FloatBorder', { fg = groups.border, bg = maybe.surface })
 	h('FloatTitle', { fg = p.muted })
 	h('FoldColumn', { fg = p.muted })
 	h('Folded', { fg = p.text, bg = maybe.surface })

From 80695a625c4a52022a8f2921f85e79e78120a129 Mon Sep 17 00:00:00 2001
From: Tom Marien <tommarien@gmail.com>
Date: Sat, 4 Mar 2023 16:17:46 +0100
Subject: [PATCH 058/190] feat: added leap highlight groups (#133)

---
 lua/rose-pine/theme.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 806ff46..37690ca 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -424,6 +424,11 @@ function M._load(options)
 	h('PounceGap', { link = 'Search' })
 	h('PounceMatch', { link = 'Search' })
 
+	-- ggandor/leap.nvim
+	h('LeapMatch', { link = 'MatchParen' })
+	h('LeapLabelPrimary', { link = 'IncSearch' })
+	h('LeapLabelSecondary', { fg = p.base, bg = p.pine })
+
 	-- nvim-telescope/telescope.nvim
 	h('TelescopeBorder', { fg = groups.border, bg = maybe.surface })
 	h('TelescopeMatching', { fg = p.rose })

From 832f94a9570ead335d256288672e9ed07ae8e69c Mon Sep 17 00:00:00 2001
From: Jakub Theimer <5587309+theimerj@users.noreply.github.com>
Date: Tue, 7 Mar 2023 03:35:28 +0700
Subject: [PATCH 059/190] Add highlights for nvim-navic (#135)

---
 lua/rose-pine/theme.lua | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 37690ca..5acb428 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -489,6 +489,37 @@ function M._load(options)
 	h('DashboardCenter', { fg = p.gold })
 	h('DashboardFooter', { fg = p.iris })
 
+	-- SmiteshP/nvim-navic
+	h('NavicIconsFile', { fg = p.base })
+	h('NavicIconsModule', { fg = p.rose })
+	h('NavicIconsNamespace', { fg = p.base })
+	h('NavicIconsPackage', { fg = p.base })
+	h('NavicIconsClass', { fg = p.gold })
+	h('NavicIconsMethod', { fg = p.pine })
+	h('NavicIconsProperty', { fg = p.foam })
+	h('NavicIconsField', { fg = p.foam })
+	h('NavicIconsConstructor', { fg = p.gold })
+	h('NavicIconsEnum', { fg = p.gold })
+	h('NavicIconsInterface', { fg = p.gold })
+	h('NavicIconsFunction', { fg = p.pine })
+	h('NavicIconsVariable', { fg = p.love })
+	h('NavicIconsConstant', { fg = p.love })
+	h('NavicIconsString', { fg = p.green })
+	h('NavicIconsNumber', { fg = p.gold })
+	h('NavicIconsBoolean', { fg = p.gold })
+	h('NavicIconsArray', { fg = p.gold })
+	h('NavicIconsObject', { fg = p.gold })
+	h('NavicIconsKey', { fg = p.iris })
+	h('NavicIconsKeyword', { fg = p.iris })
+	h('NavicIconsNull', { fg = p.gold })
+	h('NavicIconsEnumMember', { fg = p.foam })
+	h('NavicIconsStruct', { fg = p.gold })
+	h('NavicIconsEvent', { fg = p.gold })
+	h('NavicIconsOperator', { fg = p.base })
+	h('NavicIconsTypeParameter', { fg = p.foam })
+	h('NavicText', { fg = p.subtle })
+	h('NavicSeparator', { fg = p.subtle })
+
 	vim.g.terminal_color_0 = p.overlay -- black
 	vim.g.terminal_color_8 = p.subtle -- bright black
 	vim.g.terminal_color_1 = p.love -- red

From 826458a62cdac2e45abed558df27404fab625002 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Mon, 6 Mar 2023 14:40:10 -0600
Subject: [PATCH 060/190] feat: add `background_nc` and `panel_nc` groups
 (#130) (#132)

---
 lua/rose-pine/config.lua  |  4 ++++
 lua/rose-pine/palette.lua |  6 +++---
 lua/rose-pine/theme.lua   | 42 +++++++++++++++++++--------------------
 readme.md                 |  2 ++
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index c5a935e..156bb7e 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -2,7 +2,9 @@ local M = {}
 
 ---@class Groups
 ---@field background string
+---@field background_nc string
 ---@field panel string
+---@field panel_nc string
 ---@field border string
 ---@field comment string
 ---@field link string
@@ -52,7 +54,9 @@ local defaults = {
 
 	groups = {
 		background = 'base',
+		background_nc = '_experimental_nc',
 		panel = 'surface',
+		panel_nc = 'base',
 		border = 'highlight_med',
 		comment = 'muted',
 		link = 'iris',
diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index db776f5..5ede492 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -2,7 +2,7 @@ local options = require('rose-pine.config').options
 
 local variants = {
 	main = {
-		nc = '#16141f',
+		_experimental_nc = '#16141f',
 		base = '#191724',
 		surface = '#1f1d2e',
 		overlay = '#26233a',
@@ -21,7 +21,7 @@ local variants = {
 		none = 'NONE',
 	},
 	moon = {
-		nc = '#1f1d30',
+		_experimental_nc = '#1f1d30',
 		base = '#232136',
 		surface = '#2a273f',
 		overlay = '#393552',
@@ -40,7 +40,7 @@ local variants = {
 		none = 'NONE',
 	},
 	dawn = {
-		nc = '#f8f0e7',
+		_experimental_nc = '#f8f0e7',
 		base = '#faf4ed',
 		surface = '#fffaf3',
 		overlay = '#f2e9e1',
diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 5acb428..8a7a72f 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -7,13 +7,15 @@ function M._load(options)
 
 	local groups = options.groups or {}
 	local maybe = {
-		base = (options.disable_background and p.none) or p.base,
-		surface = (options.disable_float_background and p.none) or p.surface,
+		base = (options.disable_background and p.none) or groups.background,
+		surface = (options.disable_float_background and p.none) or groups.panel,
 		italic = not options.disable_italics,
 	}
 	maybe.bold_vert_split = (options.bold_vert_split and groups.border)
 		or p.none
-	maybe.dim_nc_background = (options.dim_nc_background and p.nc)
+	maybe.dim_nc_background = (
+		options.dim_nc_background and groups.background_nc
+	) or maybe.base
 
 	h('ColorColumn', { bg = p.overlay })
 	h('Conceal', { bg = p.none })
@@ -50,7 +52,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 = p.maybe_surface })
+	h('Pmenu', { fg = p.subtle, bg = maybe.surface })
 	h('PmenuSbar', { bg = p.highlight_low })
 	h('PmenuSel', { fg = p.text, bg = p.overlay })
 	h('PmenuThumb', { bg = p.highlight_med })
@@ -70,12 +72,12 @@ function M._load(options)
 		fg = p.text,
 		bg = (options.dim_nc_background and p.none) or maybe.base,
 	})
-	h('StatusLine', { fg = p.subtle, bg = p.surface })
-	h('StatusLineNC', { fg = p.muted, bg = maybe.base })
+	h('StatusLine', { fg = p.subtle, bg = groups.panel })
+	h('StatusLineNC', { fg = p.muted, bg = groups.panel_nc })
 	h('StatusLineTerm', { link = 'StatusLine' })
 	h('StatusLineTermNC', { link = 'StatusLineNC' })
-	h('TabLine', { fg = p.subtle, bg = p.surface })
-	h('TabLineFill', { bg = p.surface })
+	h('TabLine', { fg = p.subtle, bg = groups.panel })
+	h('TabLineFill', { bg = groups.panel })
 	h('TabLineSel', { fg = p.text, bg = p.overlay })
 	h('Title', { fg = p.text })
 	h('VertSplit', { fg = groups.border, bg = maybe.bold_vert_split })
@@ -183,10 +185,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 = 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('DiagnosticStatusLineError', { fg = groups.error, bg = groups.panel })
+	h('DiagnosticStatusLineHint', { fg = groups.hint, bg = groups.panel })
+	h('DiagnosticStatusLineInfo', { fg = groups.info, bg = groups.panel })
+	h('DiagnosticStatusLineWarn', { fg = groups.warn, bg = groups.panel })
 	h('DiagnosticUnderlineError', { sp = groups.error, undercurl = true })
 	h('DiagnosticUnderlineHint', { sp = groups.hint, undercurl = true })
 	h('DiagnosticUnderlineInfo', { sp = groups.info, undercurl = true })
@@ -424,22 +426,20 @@ function M._load(options)
 	h('PounceGap', { link = 'Search' })
 	h('PounceMatch', { link = 'Search' })
 
+	local float_background = options.dim_nc_background
+			and (options.disable_float_background and groups.panel_nc or groups.panel)
+		or maybe.surface
+    
 	-- ggandor/leap.nvim
 	h('LeapMatch', { link = 'MatchParen' })
 	h('LeapLabelPrimary', { link = 'IncSearch' })
 	h('LeapLabelSecondary', { fg = p.base, bg = p.pine })
 
 	-- nvim-telescope/telescope.nvim
-	h('TelescopeBorder', { fg = groups.border, bg = maybe.surface })
+	h('TelescopeBorder', { fg = groups.border, bg = float_background })
 	h('TelescopeMatching', { fg = p.rose })
-	h('TelescopeNormal', { fg = p.subtle, bg = maybe.surface })
-	h('TelescopePromptNormal', {
-		fg = p.text,
-		bg = (
-			options.dim_nc_background
-			and (options.disable_float_background and p.nc or p.surface)
-		) or maybe.surface,
-	})
+	h('TelescopeNormal', { fg = p.subtle, bg = float_background })
+	h('TelescopePromptNormal', { fg = p.text, bg = float_background })
 	h('TelescopePromptPrefix', { fg = p.subtle })
 	h('TelescopeSelection', { fg = p.text, bg = p.overlay })
 	h('TelescopeSelectionCaret', { fg = p.rose, bg = p.overlay })
diff --git a/readme.md b/readme.md
index c197a31..370828d 100644
--- a/readme.md
+++ b/readme.md
@@ -78,7 +78,9 @@ require('rose-pine').setup({
 	--- @usage string hex value or named color from rosepinetheme.com/palette
 	groups = {
 		background = 'base',
+		background_nc = '_experimental_nc',
 		panel = 'surface',
+		panel_nc = 'base',
 		border = 'highlight_med',
 		comment = 'muted',
 		link = 'iris',

From 2a7381e9ab923512cd424c8209988c79cd987c25 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Mon, 6 Mar 2023 15:07:12 -0600
Subject: [PATCH 061/190] feat: update navic colours (#136)

---
 lua/rose-pine/theme.lua | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 8a7a72f..45f937d 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -429,7 +429,7 @@ function M._load(options)
 	local float_background = options.dim_nc_background
 			and (options.disable_float_background and groups.panel_nc or groups.panel)
 		or maybe.surface
-    
+
 	-- ggandor/leap.nvim
 	h('LeapMatch', { link = 'MatchParen' })
 	h('LeapLabelPrimary', { link = 'IncSearch' })
@@ -494,28 +494,28 @@ function M._load(options)
 	h('NavicIconsModule', { fg = p.rose })
 	h('NavicIconsNamespace', { fg = p.base })
 	h('NavicIconsPackage', { fg = p.base })
-	h('NavicIconsClass', { fg = p.gold })
-	h('NavicIconsMethod', { fg = p.pine })
+	h('NavicIconsClass', { fg = p.foam })
+	h('NavicIconsMethod', { fg = p.iris })
 	h('NavicIconsProperty', { fg = p.foam })
 	h('NavicIconsField', { fg = p.foam })
 	h('NavicIconsConstructor', { fg = p.gold })
 	h('NavicIconsEnum', { fg = p.gold })
-	h('NavicIconsInterface', { fg = p.gold })
+	h('NavicIconsInterface', { fg = p.foam })
 	h('NavicIconsFunction', { fg = p.pine })
-	h('NavicIconsVariable', { fg = p.love })
-	h('NavicIconsConstant', { fg = p.love })
-	h('NavicIconsString', { fg = p.green })
+	h('NavicIconsVariable', { fg = p.text })
+	h('NavicIconsConstant', { fg = p.gold })
+	h('NavicIconsString', { fg = p.gold })
 	h('NavicIconsNumber', { fg = p.gold })
-	h('NavicIconsBoolean', { fg = p.gold })
+	h('NavicIconsBoolean', { fg = p.rose })
 	h('NavicIconsArray', { fg = p.gold })
 	h('NavicIconsObject', { fg = p.gold })
 	h('NavicIconsKey', { fg = p.iris })
-	h('NavicIconsKeyword', { fg = p.iris })
-	h('NavicIconsNull', { fg = p.gold })
+	h('NavicIconsKeyword', { fg = p.pine })
+	h('NavicIconsNull', { fg = p.love })
 	h('NavicIconsEnumMember', { fg = p.foam })
-	h('NavicIconsStruct', { fg = p.gold })
+	h('NavicIconsStruct', { fg = p.foam })
 	h('NavicIconsEvent', { fg = p.gold })
-	h('NavicIconsOperator', { fg = p.base })
+	h('NavicIconsOperator', { fg = p.subtle })
 	h('NavicIconsTypeParameter', { fg = p.foam })
 	h('NavicText', { fg = p.subtle })
 	h('NavicSeparator', { fg = p.subtle })

From 36feaf500faa4ae867d59e44f93086a992124f68 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Mon, 6 Mar 2023 15:20:48 -0600
Subject: [PATCH 062/190] docs: remove empty setup function (#137)

---
 readme.md | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/readme.md b/readme.md
index 370828d..b1a4c84 100644
--- a/readme.md
+++ b/readme.md
@@ -16,29 +16,19 @@
 > With [lazy.nvim](https://github.com/folke/lazy.nvim)
 
 ```lua
-{
-    'rose-pine/neovim',
-    name = 'rose-pine',
-    lazy = false,
-    priority = 1000,
-    config = function()
-        require("rose-pine").setup()
-        vim.cmd('colorscheme rose-pine')
-    end
-}
+require("lazy").setup({
+	{ 'rose-pine/neovim', name = 'rose-pine' }
+})
+
+vim.cmd('colorscheme rose-pine')
 ```
 
 > With [packer.nvim](https://github.com/wbthomason/packer.nvim)
 
 ```lua
-use({
-    'rose-pine/neovim',
-    as = 'rose-pine',
-    config = function()
-        require("rose-pine").setup()
-        vim.cmd('colorscheme rose-pine')
-    end
-})
+use({ 'rose-pine/neovim', as = 'rose-pine' })
+
+vim.cmd('colorscheme rose-pine')
 ```
 
 _Supported plugins are listed in the [wiki](https://github.com/rose-pine/neovim/wiki#supported-plugins)_
@@ -114,7 +104,7 @@ require('rose-pine').setup({
 	}
 })
 
--- set colorscheme after options
+-- Set colorscheme after options
 vim.cmd('colorscheme rose-pine')
 ```
 
@@ -122,6 +112,6 @@ vim.cmd('colorscheme rose-pine')
 
 We welcome and appreciate any help in creating a lovely experience for all.
 
-- [Get highlight groups under cursor](https://github.com/nvim-treesitter/playground#show-treesitter-and-syntax-highlight-groups-under-the-cursor)
+- Get highlight groups under cursor via `:Inspect` in Neovim 0.9 or [nvim-treesitter/playground](https://github.com/nvim-treesitter/playground#show-treesitter-and-syntax-highlight-groups-under-the-cursor)
 - [Adding new highlight groups](https://github.com/rose-pine/neovim/issues/6#issuecomment-962466323)
 - [Palette reference by name](https://rosepinetheme.com/palette)

From 61ea7ce0330c25cac62548c5eed0a26aee09fb36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=B3=D0=BE=D1=80=20=D0=9C=D0=B0=D1=80=D1=82=D1=8B?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2?= <48406064+mrtnvgr@users.noreply.github.com>
Date: Wed, 8 Mar 2023 10:45:48 +0700
Subject: [PATCH 063/190] feat: add `NoiceCursor` highlight group (#138)

---
 lua/rose-pine/theme.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 45f937d..99c7dc1 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -520,6 +520,9 @@ function M._load(options)
 	h('NavicText', { fg = p.subtle })
 	h('NavicSeparator', { fg = p.subtle })
 
+	-- folke/noice.nvim
+	h('NoiceCursor', { fg = p.highlight_high, bg = p.text })
+
 	vim.g.terminal_color_0 = p.overlay -- black
 	vim.g.terminal_color_8 = p.subtle -- bright black
 	vim.g.terminal_color_1 = p.love -- red

From 576c0d2cb1da49048f3d1d07e66c9545fc56e6b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=B3=D0=BE=D1=80=20=D0=9C=D0=B0=D1=80=D1=82=D1=8B?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2?= <48406064+mrtnvgr@users.noreply.github.com>
Date: Wed, 8 Mar 2023 22:09:04 +0700
Subject: [PATCH 064/190] add @lsp.type highlight groups (add support for lsp
 semantic token groups) (#141)

---
 lua/rose-pine/theme.lua | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 99c7dc1..5004793 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -261,6 +261,18 @@ function M._load(options)
 	h('@type', { link = 'Type' })
 	h('@variable', { fg = p.text, italic = maybe.italic })
 	h('@variable.builtin', { fg = p.love })
+	h('@namespace', { link = '@include' })
+
+	-- LSP Semantic Token Groups
+	h('@lsp.type.enum', { link = '@type' })
+	h('@lsp.type.keyword', { link = '@keyword' })
+	h('@lsp.type.interface', { link = '@interface' })
+	h('@lsp.type.namespace', { link = '@namespace' })
+	h('@lsp.type.parameter', { link = '@parameter' })
+	h('@lsp.type.property', { link = '@property' })
+	h('@lsp.type.variable', {}) -- use treesitter styles for regular variables
+	h('@lsp.typemod.function.defaultLibrary', { link = 'Special' })
+	h('@lsp.typemod.variable.defaultLibrary', { link = '@variable.builtin' })
 
 	-- vim.lsp.buf.document_highlight()
 	h('LspReferenceText', { bg = p.highlight_med })

From 8e66255eeeef8dfb191f103a7066a01d10e0df8d Mon Sep 17 00:00:00 2001
From: Will Leinweber <will@users.noreply.github.com>
Date: Wed, 8 Mar 2023 16:10:19 +0100
Subject: [PATCH 065/190] Add popup title bar color for NeoTree (#140)

---
 lua/rose-pine/theme.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 5004793..10edbe3 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -340,6 +340,9 @@ function M._load(options)
 	h('NvimTreeSpecialFile', { link = 'NvimTreeNormal' })
 	h('NvimTreeWindowPicker', { fg = p.love, bg = p.love, blend = 10 })
 
+  -- nvim-neo-tree/neo-tree.nvim
+  h('NeoTreeTitleBar', { fg = p.surface, bg = p.pine })
+
 	-- folke/which-key.nvim
 	h('WhichKey', { fg = p.iris })
 	h('WhichKeyGroup', { fg = p.foam })

From 5e48e3083a726fe20d670ffe1f779eab00f66e57 Mon Sep 17 00:00:00 2001
From: Jakub Theimer <5587309+theimerj@users.noreply.github.com>
Date: Fri, 10 Mar 2023 01:22:33 +0700
Subject: [PATCH 066/190] add highlights for mini.indentscope (#144)

---
 lua/rose-pine/theme.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 10edbe3..bae94d4 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -538,6 +538,10 @@ function M._load(options)
 	-- folke/noice.nvim
 	h('NoiceCursor', { fg = p.highlight_high, bg = p.text })
 
+	-- echasnovski/mini.indentscope
+	h('MiniIndentscopeSymbol', { fg = p.highlight_med })
+	h('MiniIndentscopeSymbolOff', { fg = p.highlight_med })
+
 	vim.g.terminal_color_0 = p.overlay -- black
 	vim.g.terminal_color_8 = p.subtle -- bright black
 	vim.g.terminal_color_1 = p.love -- red

From af49f208f07e35be8b2e7eb18cef22b437e9d40a Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Sun, 12 Mar 2023 14:35:16 -0500
Subject: [PATCH 067/190] groups.background now overrides all base instances

---
 lua/rose-pine/theme.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index bae94d4..c95a040 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -42,7 +42,7 @@ function M._load(options)
 	h('FloatTitle', { fg = p.muted })
 	h('FoldColumn', { fg = p.muted })
 	h('Folded', { fg = p.text, bg = maybe.surface })
-	h('IncSearch', { fg = p.base, bg = p.rose })
+	h('IncSearch', { fg = groups.background, bg = p.rose })
 	h('LineNr', { fg = p.muted })
 	h('MatchParen', { fg = p.text, bg = p.highlight_med })
 	h('ModeMsg', { fg = p.subtle })
@@ -294,7 +294,7 @@ function M._load(options)
 	h('BufferInactiveMod', { fg = p.foam })
 	h('BufferInactiveSign', { fg = p.muted })
 	h('BufferInactiveTarget', { fg = p.gold })
-	h('BufferTabpageFill', { fg = p.base, bg = p.base })
+	h('BufferTabpageFill', { fg = groups.background, bg = groups.background })
 	h('BufferVisible', { fg = p.subtle })
 	h('BufferVisibleIndex', { fg = p.subtle })
 	h('BufferVisibleMod', { fg = p.foam })

From d500424a3039b6a9494e10d426cc0b449fec9592 Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Sun, 19 Mar 2023 10:37:25 -0400
Subject: [PATCH 068/190] feat: highlights for goolord/alpha-nvim (#146)

---
 lua/rose-pine/theme.lua | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index c95a040..b342bb1 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -340,8 +340,8 @@ function M._load(options)
 	h('NvimTreeSpecialFile', { link = 'NvimTreeNormal' })
 	h('NvimTreeWindowPicker', { fg = p.love, bg = p.love, blend = 10 })
 
-  -- nvim-neo-tree/neo-tree.nvim
-  h('NeoTreeTitleBar', { fg = p.surface, bg = p.pine })
+	-- nvim-neo-tree/neo-tree.nvim
+	h('NeoTreeTitleBar', { fg = p.surface, bg = p.pine })
 
 	-- folke/which-key.nvim
 	h('WhichKey', { fg = p.iris })
@@ -542,6 +542,12 @@ function M._load(options)
 	h('MiniIndentscopeSymbol', { fg = p.highlight_med })
 	h('MiniIndentscopeSymbolOff', { fg = p.highlight_med })
 
+	-- goolord/alpha-nvim
+	h('AlphaHeader', { fg = p.pine })
+	h('AlphaButtons', { fg = p.foam })
+	h('AlphaShortcut', { fg = p.rose })
+	h('AlphaFooter', { fg = p.gold })
+
 	vim.g.terminal_color_0 = p.overlay -- black
 	vim.g.terminal_color_8 = p.subtle -- bright black
 	vim.g.terminal_color_1 = p.love -- red

From 6fd3a3f1b54f5d83afa0967418f05dba17a2cb0f Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Wed, 22 Mar 2023 18:44:38 -0500
Subject: [PATCH 069/190] feat: alias `_experimental_nc` to `nc` in the palette

---
 lua/rose-pine/palette.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index 5ede492..42eb9bc 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -2,7 +2,9 @@ local options = require('rose-pine.config').options
 
 local variants = {
 	main = {
+		---@deprecated for backwards compatibility
 		_experimental_nc = '#16141f',
+		nc = '#16141f',
 		base = '#191724',
 		surface = '#1f1d2e',
 		overlay = '#26233a',
@@ -21,7 +23,9 @@ local variants = {
 		none = 'NONE',
 	},
 	moon = {
+		---@deprecated for backwards compatibility
 		_experimental_nc = '#1f1d30',
+		nc = '#1f1d30',
 		base = '#232136',
 		surface = '#2a273f',
 		overlay = '#393552',
@@ -40,7 +44,9 @@ local variants = {
 		none = 'NONE',
 	},
 	dawn = {
+		---@deprecated for backwards compatibility
 		_experimental_nc = '#f8f0e7',
+		nc = '#f8f0e7',
 		base = '#faf4ed',
 		surface = '#fffaf3',
 		overlay = '#f2e9e1',

From 3eb035f569191c03443d87bb1a0cbc8f03aa6164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=B3=D0=BE=D1=80=20=D0=9C=D0=B0=D1=80=D1=82=D1=8B?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2?= <48406064+mrtnvgr@users.noreply.github.com>
Date: Thu, 23 Mar 2023 20:17:32 +0700
Subject: [PATCH 070/190] feat: add lsp injected highlights (#148)

---
 lua/rose-pine/theme.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index b342bb1..a076670 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -274,6 +274,11 @@ function M._load(options)
 	h('@lsp.typemod.function.defaultLibrary', { link = 'Special' })
 	h('@lsp.typemod.variable.defaultLibrary', { link = '@variable.builtin' })
 
+	-- LSP Injected Groups
+	h('@lsp.typemod.operator.injected', { link = '@operator' })
+	h('@lsp.typemod.string.injected', { link = '@string' })
+	h('@lsp.typemod.variable.injected', { link = '@variable' })
+
 	-- vim.lsp.buf.document_highlight()
 	h('LspReferenceText', { bg = p.highlight_med })
 	h('LspReferenceRead', { bg = p.highlight_med })

From 88dfcf9e8a1976fb7bf08a802fb97ebea4c97dda Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Thu, 23 Mar 2023 14:02:35 -0500
Subject: [PATCH 071/190] feat: match editor background for `GitSigns*` gutter

---
 lua/rose-pine/theme.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index b342bb1..e2e2a6c 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -302,9 +302,9 @@ function M._load(options)
 	h('BufferVisibleTarget', { fg = p.gold })
 
 	-- lewis6991/gitsigns.nvim
-	h('GitSignsAdd', { fg = groups.git_add })
-	h('GitSignsChange', { fg = groups.git_change })
-	h('GitSignsDelete', { fg = groups.git_delete })
+	h('GitSignsAdd', { fg = groups.git_add, bg = groups.background })
+	h('GitSignsChange', { fg = groups.git_change, bg = groups.background })
+	h('GitSignsDelete', { fg = groups.git_delete, bg = groups.background })
 	h('SignAdd', { link = 'GitSignsAdd' })
 	h('SignChange', { link = 'GitSignsChange' })
 	h('SignDelete', { link = 'GitSignsDelete' })

From 8b63bcd142088b11e81ad6369628d11c9525ef79 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Thu, 30 Mar 2023 12:23:37 -0500
Subject: [PATCH 072/190] feat: update bufferline selected tab

Ref #149
---
 lua/rose-pine/plugins/bufferline.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua/rose-pine/plugins/bufferline.lua b/lua/rose-pine/plugins/bufferline.lua
index db722cf..1a5eaac 100644
--- a/lua/rose-pine/plugins/bufferline.lua
+++ b/lua/rose-pine/plugins/bufferline.lua
@@ -20,10 +20,10 @@ return {
 	-- 	fg = '<color-value-here>',
 	-- 	bg = '<color-value-here>',
 	-- },
-	-- tab_selected = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
-	-- },
+	tab_selected = {
+		fg = p.text,
+		bg = p.overlay,
+	},
 	-- tab_close = {
 	-- 	fg = '<color-value-here>',
 	-- 	bg = '<color-value-here>',

From 196cb4cb067d0daf784659a57d8715c68a948132 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Thu, 30 Mar 2023 13:00:32 -0500
Subject: [PATCH 073/190] chore: update config types (#150)

---
 lua/rose-pine/config.lua | 64 +++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 41 deletions(-)

diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index 156bb7e..cd9bef2 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -1,60 +1,39 @@
 local M = {}
 
----@class Groups
----@field background string
----@field background_nc string
----@field panel string
----@field panel_nc string
----@field border string
----@field comment string
----@field link string
----@field punctuation string
----@field error string
----@field hint string
----@field info string
----@field warn string
----@field git_add string
----@field git_change string
----@field git_delete string
----@field git_dirty string
----@field git_ignore string
----@field git_merge string
----@field git_rename string
----@field git_stage string
----@field git_text string
----@field headings Headings|string
+---@class Highlight
+---@field fg string
+---@field bg string
+---@field sp string
+---@field bold boolean
+---@field italic boolean
+---@field undercurl boolean
+---@field underline boolean
+---@field underdouble boolean
+---@field underdotted boolean
+---@field underdashed boolean
+---@field strikethrough boolean
 
----@class Headings
----@field h1 string
----@field h2 string
----@field h3 string
----@field h4 string
----@field h5 string
----@field h6 string
+---@alias Variant 'main' | 'moon' | 'dawn'
 
 ---@class Config
----@field variant 'auto'|'main'|'moon'|'dawn'
----@field dark_variant 'main'|'moon'|'dawn'
----@field bold_vert_split boolean
----@field dim_nc_background boolean
----@field disable_background boolean
----@field disable_float_background boolean
----@field disable_italics boolean
----@field groups Groups
----@field highlight_groups table<string, any>
 local defaults = {
+	---@type 'auto' | Variant
 	variant = 'auto',
+
+	---@type Variant
 	dark_variant = 'main',
+
 	bold_vert_split = false,
+
 	dim_nc_background = false,
+
 	disable_background = false,
 	disable_float_background = false,
 	disable_italics = false,
-	highlight_groups = {},
 
 	groups = {
 		background = 'base',
-		background_nc = '_experimental_nc',
+		background_nc = 'nc',
 		panel = 'surface',
 		panel_nc = 'base',
 		border = 'highlight_med',
@@ -83,6 +62,9 @@ local defaults = {
 			h6 = 'foam',
 		},
 	},
+
+	---@type table<string, Highlight>
+	highlight_groups = {},
 }
 
 ---@type Config

From adc339c3159e3eb648513bde72079cebb99a4bcf Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Thu, 30 Mar 2023 17:04:49 -0500
Subject: [PATCH 074/190] docs: remove empty setup function (#151)


From 15eeca1d44e590b06404d92b68887631f3042a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=B3=D0=BE=D1=80=20=D0=9C=D0=B0=D1=80=D1=82=D1=8B?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2?= <48406064+mrtnvgr@users.noreply.github.com>
Date: Thu, 13 Apr 2023 06:02:24 +0700
Subject: [PATCH 075/190] fix(indent-blankline): fix italic indent lines (#154)

---
 lua/rose-pine/theme.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 3da38cb..0d96113 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -357,9 +357,9 @@ function M._load(options)
 	h('WhichKeyValue', { fg = p.rose })
 
 	-- luka-reineke/indent-blankline.nvim
-	h('IndentBlanklineChar', { fg = p.muted })
-	h('IndentBlanklineSpaceChar', { fg = p.muted })
-	h('IndentBlanklineSpaceCharBlankline', { fg = p.muted })
+	h('IndentBlanklineChar', { fg = p.muted, nocombine = true })
+	h('IndentBlanklineSpaceChar', { fg = p.muted, nocombine = true })
+	h('IndentBlanklineSpaceCharBlankline', { fg = p.muted, nocombine = true })
 
 	-- hrsh7th/nvim-cmp
 	h('CmpItemAbbr', { fg = p.subtle })

From 9cb84974136f778c89f1e320ba8d7bae08ad2833 Mon Sep 17 00:00:00 2001
From: Fitrah <55179750+fitrh@users.noreply.github.com>
Date: Wed, 19 Apr 2023 00:29:36 +0800
Subject: [PATCH 076/190] fix: reset `@lsp.type.comment` (#155)

---
 lua/rose-pine/theme.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 0d96113..4f7af42 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -264,6 +264,7 @@ function M._load(options)
 	h('@namespace', { link = '@include' })
 
 	-- LSP Semantic Token Groups
+	h('@lsp.type.comment', {})
 	h('@lsp.type.enum', { link = '@type' })
 	h('@lsp.type.keyword', { link = '@keyword' })
 	h('@lsp.type.interface', { link = '@interface' })

From 89bcc4b19722bf10acacc82d45f1f828e6503736 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Thu, 27 Apr 2023 12:22:09 -0500
Subject: [PATCH 077/190] Update bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 41 ++++++++++-----------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index b7603ef..929e6fc 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -46,36 +46,25 @@ body:
       label: Repro
       description: Minimal `init.lua` to reproduce this issue. Save as `repro.lua` and run with `nvim -u repro.lua`
       value: |
-        -- DO NOT change the paths and do not remove the colorscheme
-        local root = vim.fn.fnamemodify("./.repro", ":p")
+vim.o.packpath = '/tmp/nvim/site'
 
-        -- Set stdpaths to use .repro
-        for _, name in ipairs({ "config", "data", "state", "cache" }) do
-          vim.env[("XDG_%s_HOME"):format(name:upper())] = root .. "/" .. name
-        end
+local plugins = {
+  rose_pine = 'https://github.com/rose-pine/neovim',
+  -- ADD OTHER PLUGINS _NECESSARY_ TO REPRODUCE THE ISSUE
+}
 
-        -- Bootstrap lazy.nvim
-        local lazypath = root .. "/plugins/lazy.nvim"
-        if not vim.loop.fs_stat(lazypath) then
-          vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", lazypath, })
-        end
-        vim.opt.runtimepath:prepend(lazypath)
+for name, url in pairs(plugins) do
+  local install_path = '/tmp/nvim/site/pack/test/start/' .. name
+  if vim.fn.isdirectory(install_path) == 0 then
+    vim.fn.system { 'git', 'clone', '--depth=1', url, install_path }
+  end
+end
 
-        -- Install plugins
-        local plugins = {
-          "rose-pine/neovim",
-          name = "rose-pine",
-          config = function()
-            -- Add relevant Rosé Pine config below
-            require("rose-pine").setup({})
-          end
-        }
-        require("lazy").setup(plugins, {
-          root = root .. "/plugins",
-        })
+require('rose-pine').setup({
+  -- ADD ROSÉ PINE CONFIG THAT IS _NECESSARY_ FOR REPRODUCING THE ISSUE
+})
 
-        vim.cmd.colorscheme("rose-pine")
-        -- Add anything else here
+vim.cmd.colorscheme = "rose-pine"
       render: Lua
     validations:
       required: false

From 75bb6e5a6d5203fd39ec7d1c8d554c67c77336ad Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Thu, 27 Apr 2023 12:23:40 -0500
Subject: [PATCH 078/190] Update bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 30 +++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 929e6fc..21d9f97 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -46,25 +46,25 @@ body:
       label: Repro
       description: Minimal `init.lua` to reproduce this issue. Save as `repro.lua` and run with `nvim -u repro.lua`
       value: |
-vim.o.packpath = '/tmp/nvim/site'
+        vim.o.packpath = '/tmp/nvim/site'
 
-local plugins = {
-  rose_pine = 'https://github.com/rose-pine/neovim',
-  -- ADD OTHER PLUGINS _NECESSARY_ TO REPRODUCE THE ISSUE
-}
+        local plugins = {
+          rose_pine = 'https://github.com/rose-pine/neovim',
+          -- ADD OTHER PLUGINS _NECESSARY_ TO REPRODUCE THE ISSUE
+        }
 
-for name, url in pairs(plugins) do
-  local install_path = '/tmp/nvim/site/pack/test/start/' .. name
-  if vim.fn.isdirectory(install_path) == 0 then
-    vim.fn.system { 'git', 'clone', '--depth=1', url, install_path }
-  end
-end
+        for name, url in pairs(plugins) do
+          local install_path = '/tmp/nvim/site/pack/test/start/' .. name
+          if vim.fn.isdirectory(install_path) == 0 then
+            vim.fn.system { 'git', 'clone', '--depth=1', url, install_path }
+          end
+        end
 
-require('rose-pine').setup({
-  -- ADD ROSÉ PINE CONFIG THAT IS _NECESSARY_ FOR REPRODUCING THE ISSUE
-})
+        require('rose-pine').setup({
+          -- ADD ROSÉ PINE CONFIG THAT IS _NECESSARY_ FOR REPRODUCING THE ISSUE
+        })
 
-vim.cmd.colorscheme = "rose-pine"
+        vim.cmd.colorscheme = "rose-pine"
       render: Lua
     validations:
       required: false

From eb057bd6dd40e8676089738fc9d4ec490a29c7d2 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sun, 30 Apr 2023 16:27:50 -0500
Subject: [PATCH 079/190] Update bug_report.yml (#157)

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 21d9f97..4cee468 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -46,25 +46,25 @@ body:
       label: Repro
       description: Minimal `init.lua` to reproduce this issue. Save as `repro.lua` and run with `nvim -u repro.lua`
       value: |
-        vim.o.packpath = '/tmp/nvim/site'
+        vim.o.packpath = "/tmp/nvim/site"
 
         local plugins = {
-          rose_pine = 'https://github.com/rose-pine/neovim',
+          rose_pine = "https://github.com/rose-pine/neovim",
           -- ADD OTHER PLUGINS _NECESSARY_ TO REPRODUCE THE ISSUE
         }
 
         for name, url in pairs(plugins) do
-          local install_path = '/tmp/nvim/site/pack/test/start/' .. name
+          local install_path = "/tmp/nvim/site/pack/test/start/" .. name
           if vim.fn.isdirectory(install_path) == 0 then
-            vim.fn.system { 'git', 'clone', '--depth=1', url, install_path }
+            vim.fn.system({ "git", "clone", "--depth=1", url, install_path })
           end
         end
 
-        require('rose-pine').setup({
+        require("rose-pine").setup({
           -- ADD ROSÉ PINE CONFIG THAT IS _NECESSARY_ FOR REPRODUCING THE ISSUE
         })
 
-        vim.cmd.colorscheme = "rose-pine"
+        vim.cmd("colorscheme rose-pine")
       render: Lua
     validations:
       required: false

From 0fb313c3c5704cd8f30dabb5ace7220d1e266fbe Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Sun, 28 May 2023 17:19:01 +0200
Subject: [PATCH 080/190] fix: reset palette when switching colorschemes

---
 colors/rose-pine-dawn.lua |  3 ++-
 colors/rose-pine-main.lua |  3 ++-
 colors/rose-pine-moon.lua |  3 ++-
 colors/rose-pine.lua      |  1 -
 lua/rose-pine.lua         | 16 +++++++---------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/colors/rose-pine-dawn.lua b/colors/rose-pine-dawn.lua
index b4482c0..3ce1680 100644
--- a/colors/rose-pine-dawn.lua
+++ b/colors/rose-pine-dawn.lua
@@ -1 +1,2 @@
-require('rose-pine').colorscheme({ variant = 'dawn' })
+package.loaded['rose-pine.palette'] = nil
+require('rose-pine').colorscheme('dawn')
diff --git a/colors/rose-pine-main.lua b/colors/rose-pine-main.lua
index 6951634..e09c69d 100644
--- a/colors/rose-pine-main.lua
+++ b/colors/rose-pine-main.lua
@@ -1 +1,2 @@
-require('rose-pine').colorscheme({ variant = 'main' })
+package.loaded['rose-pine.palette'] = nil
+require('rose-pine').colorscheme('main')
diff --git a/colors/rose-pine-moon.lua b/colors/rose-pine-moon.lua
index 57e6a68..7196100 100644
--- a/colors/rose-pine-moon.lua
+++ b/colors/rose-pine-moon.lua
@@ -1 +1,2 @@
-require('rose-pine').colorscheme({ variant = 'moon' })
+package.loaded['rose-pine.palette'] = nil
+require('rose-pine').colorscheme('moon')
diff --git a/colors/rose-pine.lua b/colors/rose-pine.lua
index fd735a8..71f155f 100644
--- a/colors/rose-pine.lua
+++ b/colors/rose-pine.lua
@@ -1,3 +1,2 @@
 package.loaded['rose-pine.palette'] = nil
-
 require('rose-pine').colorscheme()
diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index bbfadb1..b843fde 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -1,17 +1,15 @@
 local config = require('rose-pine.config')
 local M = {}
 
----@param options Config|nil
-function M.colorscheme(options)
-	if options then
-		config.extend(options)
-	end
-
-	if vim.g.colors_name then
-		vim.cmd('hi clear')
-	end
+---@param variant Variant|nil
+function M.colorscheme(variant)
+	config.extend({ variant = variant })
 
 	vim.opt.termguicolors = true
+	if vim.g.colors_name then
+		vim.cmd('hi clear')
+		vim.cmd('syntax reset')
+	end
 	vim.g.colors_name = 'rose-pine'
 
 	require('rose-pine.theme')._load(config.options)

From ab6ab41da0b3d1cc09ce3a22827f583d33d94b82 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Sun, 28 May 2023 17:26:42 +0200
Subject: [PATCH 081/190] chore: clean up types and setup logic

---
 lua/rose-pine.lua         |  4 +++-
 lua/rose-pine/config.lua  | 46 ++++++++++++---------------------------
 lua/rose-pine/palette.lua | 10 ++-------
 lua/rose-pine/theme.lua   |  2 +-
 4 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index b843fde..b3cf3ea 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -15,6 +15,8 @@ function M.colorscheme(variant)
 	require('rose-pine.theme')._load(config.options)
 end
 
-M.setup = config.setup
+function M.setup(options)
+	config.extend(options)
+end
 
 return M
diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index cd9bef2..58674d7 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -1,25 +1,18 @@
+---@alias Variant "main" | "moon" | "dawn"
+---@alias Color { fg: string, bg: string, sp: string, bold: boolean, italic: boolean, undercurl: boolean, underline: boolean, underdouble: boolean, underdotted: boolean, underdashed: boolean, strikethrough: boolean }
+
 local M = {}
 
----@class Highlight
----@field fg string
----@field bg string
----@field sp string
----@field bold boolean
----@field italic boolean
----@field undercurl boolean
----@field underline boolean
----@field underdouble boolean
----@field underdotted boolean
----@field underdashed boolean
----@field strikethrough boolean
-
----@alias Variant 'main' | 'moon' | 'dawn'
-
----@class Config
-local defaults = {
-	---@type 'auto' | Variant
+---@class Options
+M.options = {
+	---Set the desired variant: "auto" will follow the vim background,
+	---defaulting to "main" for dark and "dawn" for light. To change the dark
+	---variant, use `options.dark_variant = "moon"`.
+	---@type "auto" | Variant
 	variant = 'auto',
 
+	---Set the desired dark variant: applies when `options.variant` is set to
+	---"auto" to match `vim.o.background`.
 	---@type Variant
 	dark_variant = 'main',
 
@@ -63,24 +56,13 @@ local defaults = {
 		},
 	},
 
-	---@type table<string, Highlight>
+	---@type table<string, Color>
 	highlight_groups = {},
 }
 
----@type Config
-M.options = {}
-
----@param options Config|nil
-function M.setup(options)
-	M.options = vim.tbl_deep_extend('force', {}, defaults, options or {})
-end
-
----@param options Config|nil
+---@param options Options|nil
 function M.extend(options)
-	M.options =
-		vim.tbl_deep_extend('force', {}, M.options or defaults, options or {})
+	M.options = vim.tbl_deep_extend('force', M.options, options or {})
 end
 
-M.setup()
-
 return M
diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index 42eb9bc..66d6438 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -66,14 +66,8 @@ local variants = {
 	},
 }
 
-if options.variant == 'main' then
-	return variants.main
-end
-if options.variant == 'moon' then
-	return variants.moon
-end
-if options.variant == 'dawn' then
-	return variants.dawn
+if variants[options.variant] ~= nil then
+	return variants[options.variant]
 end
 
 return vim.o.background == 'light' and variants.dawn
diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 4f7af42..edb25a1 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -1,6 +1,6 @@
 local M = {}
 
----@param options Config
+---@param options Options
 function M._load(options)
 	local h = require('rose-pine.util').highlight
 	local p = require('rose-pine.palette')

From 9ecd30d749998c9b529ad8aca9c060655306594d Mon Sep 17 00:00:00 2001
From: Sebastian Wiegandt <sebastian.wiegandt@gmail.com>
Date: Sat, 10 Jun 2023 23:56:22 +0200
Subject: [PATCH 082/190] Improve Treesitter heading highlighting for Markdown
 (#163)

---
 lua/rose-pine/theme.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index edb25a1..90e7c30 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -280,6 +280,20 @@ function M._load(options)
 	h('@lsp.typemod.string.injected', { link = '@string' })
 	h('@lsp.typemod.variable.injected', { link = '@variable' })
 
+	-- nvim-treesitter Markdown Headings
+	h('@text.title.1.markdown', { link = 'markdownH1' })
+	h('@text.title.1.marker.markdown', { link = 'markdownH1Delimiter' })
+	h('@text.title.2.markdown', { link = 'markdownH2' })
+	h('@text.title.2.marker.markdown', { link = 'markdownH2Delimiter' })
+	h('@text.title.3.markdown', { link = 'markdownH3' })
+	h('@text.title.3.marker.markdown', { link = 'markdownH3Delimiter' })
+	h('@text.title.4.markdown', { link = 'markdownH4' })
+	h('@text.title.4.marker.markdown', { link = 'markdownH4Delimiter' })
+	h('@text.title.5.markdown', { link = 'markdownH5' })
+	h('@text.title.5.marker.markdown', { link = 'markdownH5Delimiter' })
+	h('@text.title.6.markdown', { link = 'markdownH6' })
+	h('@text.title.6.marker.markdown', { link = 'markdownH6Delimiter' })
+
 	-- vim.lsp.buf.document_highlight()
 	h('LspReferenceText', { bg = p.highlight_med })
 	h('LspReferenceRead', { bg = p.highlight_med })

From 838b33cdc4042564838ae5937602f78c32bcf55a Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Mon, 19 Jun 2023 13:48:02 -0400
Subject: [PATCH 083/190] feat: colors for neo-tree (#166)

---
 lua/rose-pine/theme.lua | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 90e7c30..12a60f0 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -362,6 +362,13 @@ function M._load(options)
 
 	-- nvim-neo-tree/neo-tree.nvim
 	h('NeoTreeTitleBar', { fg = p.surface, bg = p.pine })
+	h('NeoTreeGitAdded', { fg = p.foam })
+	h('NeoTreeGitModified', { fg = p.rose })
+	h('NeoTreeGitDeleted', { fg = p.love })
+	h('NeoTreeGitRenamed', { fg = p.pine })
+	h('NeoTreeGitIgnored', { fg = p.muted })
+	h('NeoTreeGitUntracked', { fg = p.gold })
+	h('NeoTreeGitConflict', { fg = p.iris })
 
 	-- folke/which-key.nvim
 	h('WhichKey', { fg = p.iris })

From 4e0e82b3afd7db010cdb6c00db981e818883b511 Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Mon, 19 Jun 2023 13:48:24 -0400
Subject: [PATCH 084/190] feat: colors for hop (#165)

---
 lua/rose-pine/theme.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 12a60f0..f9591d3 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -477,6 +477,12 @@ function M._load(options)
 	h('LeapLabelPrimary', { link = 'IncSearch' })
 	h('LeapLabelSecondary', { fg = p.base, bg = p.pine })
 
+	-- phaazon/hop.nvim
+	h('HopNextKey', { fg = p.love })
+	h('HopNextKey1', { fg = p.foam })
+	h('HopNextKey2', { fg = p.pine })
+	h('HopUnmatched', { fg = p.highlight_high })
+
 	-- nvim-telescope/telescope.nvim
 	h('TelescopeBorder', { fg = groups.border, bg = float_background })
 	h('TelescopeMatching', { fg = p.rose })

From 3b3ca9ebb9c681392a3f005127b0eea8a2abeaca Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Wed, 21 Jun 2023 15:37:44 +0200
Subject: [PATCH 085/190] feat: change `@method` from iris to rose (#167)

Closes #164
---
 lua/rose-pine/theme.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index f9591d3..d0b5b83 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -224,7 +224,7 @@ function M._load(options)
 	h('@keyword.operator', { fg = p.subtle })
 	h('@label', { link = 'Label' })
 	h('@macro', { link = 'Macro' })
-	h('@method', { fg = p.iris })
+	h('@method', { fg = p.rose })
 	h('@number', { link = 'Number' })
 	h('@operator', { link = 'Operator' })
 	h('@parameter', { fg = p.iris, italic = maybe.italic })

From c552fcadac54c425d4bbdbc9b7f0cfa04cecda45 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Wed, 21 Jun 2023 16:34:13 +0200
Subject: [PATCH 086/190] feat: update tag and includes for consistency with
 semantic tokens (#168)

---
 lua/rose-pine/theme.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index d0b5b83..0282160 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -101,7 +101,7 @@ function M._load(options)
 	h('Function', { fg = p.rose })
 	h('Identifier', { fg = p.rose })
 	-- Ignore = {},
-	h('Include', { fg = p.iris })
+	h('Include', { fg = p.pine })
 	h('Keyword', { fg = p.pine })
 	h('Label', { fg = p.foam })
 	h('Macro', { fg = p.iris })
@@ -117,7 +117,7 @@ function M._load(options)
 	h('StorageClass', { fg = p.foam })
 	h('String', { fg = p.gold })
 	h('Structure', { fg = p.foam })
-	h('Tag', { fg = p.rose })
+	h('Tag', { fg = p.foam })
 	h('Todo', { fg = p.iris })
 	h('Type', { fg = p.foam })
 	h('Typedef', { link = 'Type' })

From 805a183dde97f8345bd0d022923d6e76f4bd4a76 Mon Sep 17 00:00:00 2001
From: Niamh Ferns <81906761+NiamhFerns@users.noreply.github.com>
Date: Sun, 16 Jul 2023 03:04:58 +1200
Subject: [PATCH 087/190] =?UTF-8?q?feat!:=20custom=20user=20highlight=20gr?=
 =?UTF-8?q?oups=20are=20merged=20with=20Ros=C3=A9=20Pine=20defaults=20(#17?=
 =?UTF-8?q?1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Configuring `highlight_groups` now merge by default. For example, to add italics without changing the colour:

```diff
- Keyword = { fg = "pine", italic = true }
+ Keyword = { italic = true }
```

Opt out of this behaviour via `inherit = false`.
---
 lua/rose-pine/theme.lua | 1116 ++++++++++++++++++++-------------------
 readme.md               |    4 +
 2 files changed, 568 insertions(+), 552 deletions(-)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 0282160..e8dcd93 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -17,569 +17,568 @@ function M._load(options)
 		options.dim_nc_background and groups.background_nc
 	) or maybe.base
 
-	h('ColorColumn', { bg = p.overlay })
-	h('Conceal', { bg = p.none })
-	h('CurSearch', { link = 'IncSearch' })
-	h('Cursor', { fg = p.text, bg = p.highlight_high })
-	h('CursorColumn', { bg = p.highlight_low })
-	-- CursorIM = {},
-	h('CursorLine', { bg = p.highlight_low })
-	h('CursorLineNr', { fg = p.text })
-	h('DarkenedPanel', { bg = maybe.surface })
-	h('DarkenedStatusline', { bg = maybe.surface })
-	h('DiffAdd', { bg = groups.git_add, blend = 20 })
-
-	h('DiffChange', { bg = p.overlay })
-	h('DiffDelete', { bg = groups.git_delete, blend = 20 })
-	h('DiffText', { bg = groups.git_text, blend = 20 })
-	h('diffAdded', { link = 'DiffAdd' })
-	h('diffChanged', { link = 'DiffChange' })
-	h('diffRemoved', { link = 'DiffDelete' })
-	h('Directory', { fg = p.foam, bg = p.none })
-	-- EndOfBuffer = {},
-	h('ErrorMsg', { fg = p.love, bold = true })
-	h('FloatBorder', { fg = groups.border, bg = maybe.surface })
-	h('FloatTitle', { fg = p.muted })
-	h('FoldColumn', { fg = p.muted })
-	h('Folded', { fg = p.text, bg = maybe.surface })
-	h('IncSearch', { fg = groups.background, bg = p.rose })
-	h('LineNr', { fg = p.muted })
-	h('MatchParen', { fg = p.text, bg = p.highlight_med })
-	h('ModeMsg', { fg = p.subtle })
-	h('MoreMsg', { fg = p.iris })
-	h('NonText', { fg = p.muted })
-	h('Normal', { fg = p.text, bg = maybe.base })
-	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('PmenuSbar', { bg = p.highlight_low })
-	h('PmenuSel', { fg = p.text, bg = p.overlay })
-	h('PmenuThumb', { bg = p.highlight_med })
-	h('Question', { fg = p.gold })
-	-- QuickFixLine = {},
-	-- RedrawDebugNormal = {}
-	h('RedrawDebugClear', { fg = '#ffffff', bg = p.gold })
-	h('RedrawDebugComposed', { fg = '#ffffff', bg = p.pine })
-	h('RedrawDebugRecompose', { fg = '#ffffff', bg = p.love })
-	h('Search', { bg = p.highlight_med })
-	h('SpecialKey', { fg = p.foam })
-	h('SpellBad', { sp = p.subtle, undercurl = true })
-	h('SpellCap', { sp = p.subtle, undercurl = true })
-	h('SpellLocal', { sp = p.subtle, undercurl = true })
-	h('SpellRare', { sp = p.subtle, undercurl = true })
-	h('SignColumn', {
-		fg = p.text,
-		bg = (options.dim_nc_background and p.none) or maybe.base,
-	})
-	h('StatusLine', { fg = p.subtle, bg = groups.panel })
-	h('StatusLineNC', { fg = p.muted, bg = groups.panel_nc })
-	h('StatusLineTerm', { link = 'StatusLine' })
-	h('StatusLineTermNC', { link = 'StatusLineNC' })
-	h('TabLine', { fg = p.subtle, bg = groups.panel })
-	h('TabLineFill', { bg = groups.panel })
-	h('TabLineSel', { fg = p.text, bg = p.overlay })
-	h('Title', { fg = p.text })
-	h('VertSplit', { fg = groups.border, bg = maybe.bold_vert_split })
-	h('Visual', { bg = p.highlight_med })
-	-- VisualNOS = {},
-	h('WarningMsg', { fg = p.gold })
-	-- Whitespace = {},
-	h('WildMenu', { link = 'IncSearch' })
-
-	h('Boolean', { fg = p.rose })
-	h('Character', { fg = p.gold })
-	h('Comment', { fg = groups.comment, italic = maybe.italic })
-	h('Conditional', { fg = p.pine })
-	h('Constant', { fg = p.gold })
-	h('Debug', { fg = p.rose })
-	h('Define', { fg = p.iris })
-	h('Delimiter', { fg = p.subtle })
-	h('Error', { fg = p.love })
-	h('Exception', { fg = p.pine })
-	h('Float', { fg = p.gold })
-	h('Function', { fg = p.rose })
-	h('Identifier', { fg = p.rose })
-	-- Ignore = {},
-	h('Include', { fg = p.pine })
-	h('Keyword', { fg = p.pine })
-	h('Label', { fg = p.foam })
-	h('Macro', { fg = p.iris })
-	h('Number', { fg = p.gold })
-	h('Operator', { fg = p.subtle })
-	h('PreCondit', { fg = p.iris })
-	h('PreProc', { fg = p.iris })
-	h('Repeat', { fg = p.pine })
-	h('Special', { fg = p.rose })
-	h('SpecialChar', { fg = p.rose })
-	h('SpecialComment', { fg = p.iris })
-	h('Statement', { fg = p.pine })
-	h('StorageClass', { fg = p.foam })
-	h('String', { fg = p.gold })
-	h('Structure', { fg = p.foam })
-	h('Tag', { fg = p.foam })
-	h('Todo', { fg = p.iris })
-	h('Type', { fg = p.foam })
-	h('Typedef', { link = 'Type' })
-	h('Underlined', { underline = true })
-
-	h('htmlArg', { fg = p.iris })
-	h('htmlBold', { bold = true })
-	h('htmlEndTag', { fg = p.subtle })
-	h('htmlH1', { fg = groups.headings.h1, bold = true })
-	h('htmlH2', { fg = groups.headings.h2, bold = true })
-	h('htmlH3', { fg = groups.headings.h3, bold = true })
-	h('htmlH4', { fg = groups.headings.h4, bold = true })
-	h('htmlH5', { fg = groups.headings.h5, bold = true })
-	h('htmlItalic', { italic = maybe.italic })
-	h('htmlLink', { fg = groups.link })
-	h('htmlTag', { fg = p.subtle })
-	h('htmlTagN', { fg = p.text })
-	h('htmlTagName', { fg = p.foam })
-
-	h('markdownDelimiter', { fg = p.subtle })
-	h('markdownH1', { fg = groups.headings.h1, bold = true })
-	h('markdownH1Delimiter', { link = 'markdownH1' })
-	h('markdownH2', { fg = groups.headings.h2, bold = true })
-	h('markdownH2Delimiter', { link = 'markdownH2' })
-	h('markdownH3', { fg = groups.headings.h3, bold = true })
-	h('markdownH3Delimiter', { link = 'markdownH3' })
-	h('markdownH4', { fg = groups.headings.h4, bold = true })
-	h('markdownH4Delimiter', { link = 'markdownH4' })
-	h('markdownH5', { fg = groups.headings.h5, bold = true })
-	h('markdownH5Delimiter', { link = 'markdownH5' })
-	h('markdownH6', { fg = groups.headings.h6, bold = true })
-	h('markdownH6Delimiter', { link = 'markdownH6' })
-	h(
-		'markdownLinkText',
-		{ fg = groups.link, sp = groups.link, underline = true }
-	)
-	h('markdownUrl', { link = 'markdownLinkText' })
-
-	h('mkdCode', { fg = p.foam, italic = maybe.italic })
-	h('mkdCodeDelimiter', { fg = p.rose })
-	h('mkdCodeEnd', { fg = p.foam })
-	h('mkdCodeStart', { fg = p.foam })
-	h('mkdFootnotes', { fg = p.foam })
-	h('mkdID', { fg = p.foam, underline = true })
-	h('mkdInlineURL', { fg = groups.link, underline = true })
-	h('mkdLink', { link = 'mkdInlineURL' })
-	h('mkdLinkDef', { link = 'mkdInlineURL' })
-	h('mkdListItemLine', { fg = p.text })
-	h('mkdRule', { fg = p.subtle })
-	h('mkdURL', { link = 'mkdInlineURL' })
-
-	h('DiagnosticError', { fg = groups.error })
-	h('DiagnosticHint', { fg = groups.hint })
-	h('DiagnosticInfo', { fg = groups.info })
-	h('DiagnosticWarn', { fg = groups.warn })
-	h('DiagnosticDefaultError', { fg = groups.error })
-	h('DiagnosticDefaultHint', { fg = groups.hint })
-	h('DiagnosticDefaultInfo', { fg = groups.info })
-	h('DiagnosticDefaultWarn', { fg = groups.warn })
-	h('DiagnosticFloatingError', { fg = groups.error })
-	h('DiagnosticFloatingHint', { fg = groups.hint })
-	h('DiagnosticFloatingInfo', { fg = groups.info })
-	h('DiagnosticFloatingWarn', { fg = groups.warn })
-	h('DiagnosticSignError', { fg = groups.error })
-	h('DiagnosticSignHint', { fg = groups.hint })
-	h('DiagnosticSignInfo', { fg = groups.info })
-	h('DiagnosticSignWarn', { fg = groups.warn })
-	h('DiagnosticStatusLineError', { fg = groups.error, bg = groups.panel })
-	h('DiagnosticStatusLineHint', { fg = groups.hint, bg = groups.panel })
-	h('DiagnosticStatusLineInfo', { fg = groups.info, bg = groups.panel })
-	h('DiagnosticStatusLineWarn', { fg = groups.warn, bg = groups.panel })
-	h('DiagnosticUnderlineError', { sp = groups.error, undercurl = true })
-	h('DiagnosticUnderlineHint', { sp = groups.hint, undercurl = true })
-	h('DiagnosticUnderlineInfo', { sp = groups.info, undercurl = true })
-	h('DiagnosticUnderlineWarn', { sp = groups.warn, undercurl = true })
-	h('DiagnosticVirtualTextError', { fg = groups.error })
-	h('DiagnosticVirtualTextHint', { fg = groups.hint })
-	h('DiagnosticVirtualTextInfo', { fg = groups.info })
-	h('DiagnosticVirtualTextWarn', { fg = groups.warn })
-
-	-- healthcheck
-	h('healthError', { fg = groups.error })
-	h('healthSuccess', { fg = groups.info })
-	h('healthWarning', { fg = groups.warn })
-
-	-- Treesitter
-	h('@boolean', { link = 'Boolean' })
-	h('@character', { link = 'Character' })
-	h('@character.special', { link = '@character' })
-	h('@class', { fg = p.foam })
-	h('@comment', { link = 'Comment' })
-	h('@conditional', { link = 'Conditional' })
-	h('@constant', { link = 'Constant' })
-	h('@constant.builtin', { fg = p.love })
-	h('@constant.macro', { link = '@constant' })
-	h('@constructor', { fg = p.foam })
-	h('@field', { fg = p.foam })
-	h('@function', { link = 'Function' })
-	h('@function.builtin', { fg = p.love })
-	h('@function.macro', { link = '@function' })
-	h('@include', { link = 'Include' })
-	h('@interface', { fg = p.foam })
-	h('@keyword', { link = 'Keyword' })
-	h('@keyword.operator', { fg = p.subtle })
-	h('@label', { link = 'Label' })
-	h('@macro', { link = 'Macro' })
-	h('@method', { fg = p.rose })
-	h('@number', { link = 'Number' })
-	h('@operator', { link = 'Operator' })
-	h('@parameter', { fg = p.iris, italic = maybe.italic })
-	h('@preproc', { link = 'PreProc' })
-	h('@property', { fg = p.foam, italic = maybe.italic })
-	h('@punctuation', { fg = groups.punctuation })
-	h('@punctuation.bracket', { link = '@punctuation' })
-	h('@punctuation.delimiter', { link = '@punctuation' })
-	h('@punctuation.special', { link = '@punctuation' })
-	h('@regexp', { link = 'String' })
-	h('@repeat', { link = 'Repeat' })
-	h('@storageclass', { link = 'StorageClass' })
-	h('@string', { link = 'String' })
-	h('@string.escape', { fg = p.pine })
-	h('@string.special', { link = '@string' })
-	h('@symbol', { link = 'Identifier' })
-	h('@tag', { link = 'Tag' })
-	h('@tag.attribute', { fg = p.iris })
-	h('@tag.delimiter', { fg = p.subtle })
-	h('@text', { fg = p.text })
-	h('@text.strong', { bold = true })
-	h('@text.emphasis', { italic = true })
-	h('@text.underline', { underline = true })
-	h('@text.strike', { strikethrough = true })
-	h('@text.math', { link = 'Special' })
-	h('@text.environment', { link = 'Macro' })
-	h('@text.environment.name', { link = 'Type' })
-	h('@text.title', { link = 'Title' })
-	h('@text.uri', { fg = groups.link })
-	h('@text.note', { link = 'SpecialComment' })
-	h('@text.warning', { fg = groups.warn })
-	h('@text.danger', { fg = groups.error })
-	h('@todo', { link = 'Todo' })
-	h('@type', { link = 'Type' })
-	h('@variable', { fg = p.text, italic = maybe.italic })
-	h('@variable.builtin', { fg = p.love })
-	h('@namespace', { link = '@include' })
-
-	-- LSP Semantic Token Groups
-	h('@lsp.type.comment', {})
-	h('@lsp.type.enum', { link = '@type' })
-	h('@lsp.type.keyword', { link = '@keyword' })
-	h('@lsp.type.interface', { link = '@interface' })
-	h('@lsp.type.namespace', { link = '@namespace' })
-	h('@lsp.type.parameter', { link = '@parameter' })
-	h('@lsp.type.property', { link = '@property' })
-	h('@lsp.type.variable', {}) -- use treesitter styles for regular variables
-	h('@lsp.typemod.function.defaultLibrary', { link = 'Special' })
-	h('@lsp.typemod.variable.defaultLibrary', { link = '@variable.builtin' })
-
-	-- LSP Injected Groups
-	h('@lsp.typemod.operator.injected', { link = '@operator' })
-	h('@lsp.typemod.string.injected', { link = '@string' })
-	h('@lsp.typemod.variable.injected', { link = '@variable' })
-
-	-- nvim-treesitter Markdown Headings
-	h('@text.title.1.markdown', { link = 'markdownH1' })
-	h('@text.title.1.marker.markdown', { link = 'markdownH1Delimiter' })
-	h('@text.title.2.markdown', { link = 'markdownH2' })
-	h('@text.title.2.marker.markdown', { link = 'markdownH2Delimiter' })
-	h('@text.title.3.markdown', { link = 'markdownH3' })
-	h('@text.title.3.marker.markdown', { link = 'markdownH3Delimiter' })
-	h('@text.title.4.markdown', { link = 'markdownH4' })
-	h('@text.title.4.marker.markdown', { link = 'markdownH4Delimiter' })
-	h('@text.title.5.markdown', { link = 'markdownH5' })
-	h('@text.title.5.marker.markdown', { link = 'markdownH5Delimiter' })
-	h('@text.title.6.markdown', { link = 'markdownH6' })
-	h('@text.title.6.marker.markdown', { link = 'markdownH6Delimiter' })
-
-	-- vim.lsp.buf.document_highlight()
-	h('LspReferenceText', { bg = p.highlight_med })
-	h('LspReferenceRead', { bg = p.highlight_med })
-	h('LspReferenceWrite', { bg = p.highlight_med })
-
-	-- lsp-highlight-codelens
-	h('LspCodeLens', { fg = p.subtle }) -- virtual text of code len
-	h('LspCodeLensSeparator', { fg = p.highlight_high }) -- separator between two or more code len
-
-	-- romgrk/barbar.nvim
-	h('BufferCurrent', { fg = p.text, bg = p.overlay })
-	h('BufferCurrentIndex', { fg = p.text, bg = p.overlay })
-	h('BufferCurrentMod', { fg = p.foam, bg = p.overlay })
-	h('BufferCurrentSign', { fg = p.subtle, bg = p.overlay })
-	h('BufferCurrentTarget', { fg = p.gold, bg = p.overlay })
-	h('BufferInactive', { fg = p.subtle })
-	h('BufferInactiveIndex', { fg = p.subtle })
-	h('BufferInactiveMod', { fg = p.foam })
-	h('BufferInactiveSign', { fg = p.muted })
-	h('BufferInactiveTarget', { fg = p.gold })
-	h('BufferTabpageFill', { fg = groups.background, bg = groups.background })
-	h('BufferVisible', { fg = p.subtle })
-	h('BufferVisibleIndex', { fg = p.subtle })
-	h('BufferVisibleMod', { fg = p.foam })
-	h('BufferVisibleSign', { fg = p.muted })
-	h('BufferVisibleTarget', { fg = p.gold })
-
-	-- lewis6991/gitsigns.nvim
-	h('GitSignsAdd', { fg = groups.git_add, bg = groups.background })
-	h('GitSignsChange', { fg = groups.git_change, bg = groups.background })
-	h('GitSignsDelete', { fg = groups.git_delete, bg = groups.background })
-	h('SignAdd', { link = 'GitSignsAdd' })
-	h('SignChange', { link = 'GitSignsChange' })
-	h('SignDelete', { link = 'GitSignsDelete' })
-
-	-- mvllow/modes.nvim
-	h('ModesCopy', { bg = p.gold })
-	h('ModesDelete', { bg = p.love })
-	h('ModesInsert', { bg = p.foam })
-	h('ModesVisual', { bg = p.iris })
-
-	-- kyazdani42/nvim-tree.lua
-	h('NvimTreeEmptyFolderName', { fg = p.muted })
-	h('NvimTreeFileDeleted', { fg = p.love })
-	h('NvimTreeFileDirty', { fg = p.rose })
-	h('NvimTreeFileMerge', { fg = p.iris })
-	h('NvimTreeFileNew', { fg = p.foam })
-	h('NvimTreeFileRenamed', { fg = p.pine })
-	h('NvimTreeFileStaged', { fg = p.iris })
-	h('NvimTreeFolderIcon', { fg = p.subtle })
-	h('NvimTreeFolderName', { fg = p.foam })
-	h('NvimTreeGitDeleted', { fg = groups.git_delete })
-	h('NvimTreeGitDirty', { fg = groups.git_dirty })
-	h('NvimTreeGitIgnored', { fg = groups.git_ignore })
-	h('NvimTreeGitMerge', { fg = groups.git_merge })
-	h('NvimTreeGitNew', { fg = groups.git_add })
-	h('NvimTreeGitRenamed', { fg = groups.git_rename })
-	h('NvimTreeGitStaged', { fg = groups.git_stage })
-	h('NvimTreeImageFile', { fg = p.text })
-	h('NvimTreeNormal', { fg = p.text })
-	h('NvimTreeOpenedFile', { fg = p.text, bg = p.highlight_med })
-	h('NvimTreeOpenedFolderName', { link = 'NvimTreeFolderName' })
-	h('NvimTreeRootFolder', { fg = p.iris })
-	h('NvimTreeSpecialFile', { link = 'NvimTreeNormal' })
-	h('NvimTreeWindowPicker', { fg = p.love, bg = p.love, blend = 10 })
-
-	-- nvim-neo-tree/neo-tree.nvim
-	h('NeoTreeTitleBar', { fg = p.surface, bg = p.pine })
-	h('NeoTreeGitAdded', { fg = p.foam })
-	h('NeoTreeGitModified', { fg = p.rose })
-	h('NeoTreeGitDeleted', { fg = p.love })
-	h('NeoTreeGitRenamed', { fg = p.pine })
-	h('NeoTreeGitIgnored', { fg = p.muted })
-	h('NeoTreeGitUntracked', { fg = p.gold })
-	h('NeoTreeGitConflict', { fg = p.iris })
-
-	-- folke/which-key.nvim
-	h('WhichKey', { fg = p.iris })
-	h('WhichKeyGroup', { fg = p.foam })
-	h('WhichKeySeparator', { fg = p.subtle })
-	h('WhichKeyDesc', { fg = p.gold })
-	h('WhichKeyFloat', { bg = maybe.surface })
-	h('WhichKeyValue', { fg = p.rose })
-
-	-- luka-reineke/indent-blankline.nvim
-	h('IndentBlanklineChar', { fg = p.muted, nocombine = true })
-	h('IndentBlanklineSpaceChar', { fg = p.muted, nocombine = true })
-	h('IndentBlanklineSpaceCharBlankline', { fg = p.muted, nocombine = true })
-
-	-- hrsh7th/nvim-cmp
-	h('CmpItemAbbr', { fg = p.subtle })
-	h('CmpItemAbbrDeprecated', { fg = p.subtle, strikethrough = true })
-	h('CmpItemAbbrMatch', { fg = p.text, bold = true })
-	h('CmpItemAbbrMatchFuzzy', { fg = p.text, bold = true })
-	h('CmpItemKind', { fg = p.subtle })
-	h('CmpItemKindClass', { fg = p.pine })
-	h('CmpItemKindFunction', { fg = p.rose })
-	h('CmpItemKindInterface', { fg = p.foam })
-	h('CmpItemKindMethod', { fg = p.iris })
-	h('CmpItemKindSnippet', { fg = p.gold })
-	h('CmpItemKindVariable', { fg = p.text })
-
-	-- TimUntersberger/neogit
-	h('NeogitDiffAddHighlight', { fg = p.foam, bg = p.highlight_med })
-	h('NeogitDiffContextHighlight', { bg = p.highlight_low })
-	h('NeogitDiffDeleteHighlight', { fg = p.love, bg = p.highlight_med })
-	h('NeogitHunkHeader', { bg = p.highlight_low })
-	h('NeogitHunkHeaderHighlight', { bg = p.highlight_low })
-
-	-- vimwiki/vimwiki
-	h('VimwikiHR', { fg = p.subtle })
-	h('VimwikiHeader1', { fg = groups.headings.h1, bold = true })
-	h('VimwikiHeader2', { fg = groups.headings.h2, bold = true })
-	h('VimwikiHeader3', { fg = groups.headings.h3, bold = true })
-	h('VimwikiHeader4', { fg = groups.headings.h4, bold = true })
-	h('VimwikiHeader5', { fg = groups.headings.h5, bold = true })
-	h('VimwikiHeader6', { fg = groups.headings.h6, bold = true })
-	h('VimwikiHeaderChar', { fg = p.pine })
-	h('VimwikiLink', { fg = groups.link, underline = true })
-	h('VimwikiList', { fg = p.iris })
-	h('VimwikiNoExistsLink', { fg = p.love })
-
-	-- nvim-neorg/neorg
-	h('NeorgHeading1Prefix', { fg = groups.headings.h1, bold = true })
-	h('NeorgHeading1Title', { link = 'NeorgHeading1Prefix' })
-	h('NeorgHeading2Prefix', { fg = groups.headings.h2, bold = true })
-	h('NeorgHeading2Title', { link = 'NeorgHeading2Prefix' })
-	h('NeorgHeading3Prefix', { fg = groups.headings.h3, bold = true })
-	h('NeorgHeading3Title', { link = 'NeorgHeading3Prefix' })
-	h('NeorgHeading4Prefix', { fg = groups.headings.h4, bold = true })
-	h('NeorgHeading4Title', { link = 'NeorgHeading4Prefix' })
-	h('NeorgHeading5Prefix', { fg = groups.headings.h5, bold = true })
-	h('NeorgHeading5Title', { link = 'NeorgHeading5Prefix' })
-	h('NeorgHeading6Prefix', { fg = groups.headings.h6, bold = true })
-	h('NeorgHeading6Title', { link = 'NeorgHeading6Prefix' })
-	h('NeorgMarkerTitle', { fg = p.text, bold = true })
-
-	-- tami5/lspsaga.nvim (fork of glepnir/lspsaga.nvim)
-	h('DefinitionCount', { fg = p.rose })
-	h('DefinitionIcon', { fg = p.rose })
-	h('DefintionPreviewTitle', { fg = p.rose, bold = true })
-	h('LspFloatWinBorder', { fg = groups.border })
-	h('LspFloatWinNormal', { bg = maybe.surface })
-	h('LspSagaAutoPreview', { fg = p.subtle })
-	h('LspSagaCodeActionBorder', { fg = groups.border })
-	h('LspSagaCodeActionContent', { fg = p.foam })
-	h('LspSagaCodeActionTitle', { fg = p.gold, bold = true })
-	h('LspSagaCodeActionTruncateLine', { link = 'LspSagaCodeActionBorder' })
-	h('LspSagaDefPreviewBorder', { fg = groups.border })
-	h('LspSagaDiagnosticBorder', { fg = groups.border })
-	h('LspSagaDiagnosticHeader', { fg = p.gold, bold = true })
-	h('LspSagaDiagnosticTruncateLine', { link = 'LspSagaDiagnosticBorder' })
-	h('LspSagaDocTruncateLine', { link = 'LspSagaHoverBorder' })
-	h('LspSagaFinderSelection', { fg = p.gold })
-	h('LspSagaHoverBorder', { fg = groups.border })
-	h('LspSagaLspFinderBorder', { fg = groups.border })
-	h('LspSagaRenameBorder', { fg = p.pine })
-	h('LspSagaRenamePromptPrefix', { fg = p.love })
-	h('LspSagaShTruncateLine', { link = 'LspSagaSignatureHelpBorder' })
-	h('LspSagaSignatureHelpBorder', { fg = p.pine })
-	h('ReferencesCount', { fg = p.rose })
-	h('ReferencesIcon', { fg = p.rose })
-	h('SagaShadow', { bg = p.overlay })
-	h('TargetWord', { fg = p.iris })
-
-	-- ray-x/lsp_signature.nvim
-	h('LspSignatureActiveParameter', { bg = p.overlay })
-
-	-- rlane/pounce.nvim
-	h('PounceAccept', { fg = p.love, bg = p.highlight_high })
-	h('PounceAcceptBest', { fg = p.base, bg = p.gold })
-	h('PounceGap', { link = 'Search' })
-	h('PounceMatch', { link = 'Search' })
-
 	local float_background = options.dim_nc_background
 			and (options.disable_float_background and groups.panel_nc or groups.panel)
 		or maybe.surface
 
-	-- ggandor/leap.nvim
-	h('LeapMatch', { link = 'MatchParen' })
-	h('LeapLabelPrimary', { link = 'IncSearch' })
-	h('LeapLabelSecondary', { fg = p.base, bg = p.pine })
+	M.defaults = {
+		['ColorColumn'] = { bg = p.overlay },
+		['Conceal'] = { bg = p.none },
+		['CurSearch'] = { link = 'IncSearch' },
+		['Cursor'] = { fg = p.text, bg = p.highlight_high },
+		['CursorColumn'] = { bg = p.highlight_low },
+		-- CursorIM = {},
+		['CursorLine'] = { bg = p.highlight_low },
+		['CursorLineNr'] = { fg = p.text },
+		['DarkenedPanel'] = { bg = maybe.surface },
+		['DarkenedStatusline'] = { bg = maybe.surface },
+		['DiffAdd'] = { bg = groups.git_add, blend = 20 },
 
-	-- phaazon/hop.nvim
-	h('HopNextKey', { fg = p.love })
-	h('HopNextKey1', { fg = p.foam })
-	h('HopNextKey2', { fg = p.pine })
-	h('HopUnmatched', { fg = p.highlight_high })
+		['DiffChange'] = { bg = p.overlay },
+		['DiffDelete'] = { bg = groups.git_delete, blend = 20 },
+		['DiffText'] = { bg = groups.git_text, blend = 20 },
+		['diffAdded'] = { link = 'DiffAdd' },
+		['diffChanged'] = { link = 'DiffChange' },
+		['diffRemoved'] = { link = 'DiffDelete' },
+		['Directory'] = { fg = p.foam, bg = p.none },
+		-- EndOfBuffer = {},
+		['ErrorMsg'] = { fg = p.love, bold = true },
+		['FloatBorder'] = { fg = groups.border, bg = maybe.surface },
+		['FloatTitle'] = { fg = p.muted },
+		['FoldColumn'] = { fg = p.muted },
+		['Folded'] = { fg = p.text, bg = maybe.surface },
+		['IncSearch'] = { fg = groups.background, bg = p.rose },
+		['LineNr'] = { fg = p.muted },
+		['MatchParen'] = { fg = p.text, bg = p.highlight_med },
+		['ModeMsg'] = { fg = p.subtle },
+		['MoreMsg'] = { fg = p.iris },
+		['NonText'] = { fg = p.muted },
+		['Normal'] = { fg = p.text, bg = maybe.base },
+		['NormalFloat'] = { fg = p.text, bg = maybe.surface },
+		['NormalNC'] = { fg = p.text, bg = maybe.dim_nc_background },
+		['NvimInternalError'] = { fg = '#ffffff', bg = p.love },
+		['Pmenu'] = { fg = p.subtle, bg = maybe.surface },
+		['PmenuSbar'] = { bg = p.highlight_low },
+		['PmenuSel'] = { fg = p.text, bg = p.overlay },
+		['PmenuThumb'] = { bg = p.highlight_med },
+		['Question'] = { fg = p.gold },
+		-- QuickFixLine = {},
+		-- RedrawDebugNormal = {}
+		['RedrawDebugClear'] = { fg = '#ffffff', bg = p.gold },
+		['RedrawDebugComposed'] = { fg = '#ffffff', bg = p.pine },
+		['RedrawDebugRecompose'] = { fg = '#ffffff', bg = p.love },
+		['Search'] = { bg = p.highlight_med },
+		['SpecialKey'] = { fg = p.foam },
+		['SpellBad'] = { sp = p.subtle, undercurl = true },
+		['SpellCap'] = { sp = p.subtle, undercurl = true },
+		['SpellLocal'] = { sp = p.subtle, undercurl = true },
+		['SpellRare'] = { sp = p.subtle, undercurl = true },
+		['SignColumn'] = {
+			fg = p.text,
+			bg = (options.dim_nc_background and p.none) or maybe.base,
+		},
+		['StatusLine'] = { fg = p.subtle, bg = groups.panel },
+		['StatusLineNC'] = { fg = p.muted, bg = groups.panel_nc },
+		['StatusLineTerm'] = { link = 'StatusLine' },
+		['StatusLineTermNC'] = { link = 'StatusLineNC' },
+		['TabLine'] = { fg = p.subtle, bg = groups.panel },
+		['TabLineFill'] = { bg = groups.panel },
+		['TabLineSel'] = { fg = p.text, bg = p.overlay },
+		['Title'] = { fg = p.text },
+		['VertSplit'] = { fg = groups.border, bg = maybe.bold_vert_split },
+		['Visual'] = { bg = p.highlight_med },
+		-- VisualNOS = {},
+		['WarningMsg'] = { fg = p.gold },
+		-- Whitespace = {},
+		['WildMenu'] = { link = 'IncSearch' },
 
-	-- nvim-telescope/telescope.nvim
-	h('TelescopeBorder', { fg = groups.border, bg = float_background })
-	h('TelescopeMatching', { fg = p.rose })
-	h('TelescopeNormal', { fg = p.subtle, bg = float_background })
-	h('TelescopePromptNormal', { fg = p.text, bg = float_background })
-	h('TelescopePromptPrefix', { fg = p.subtle })
-	h('TelescopeSelection', { fg = p.text, bg = p.overlay })
-	h('TelescopeSelectionCaret', { fg = p.rose, bg = p.overlay })
-	h('TelescopeTitle', { fg = p.subtle })
+		['Boolean'] = { fg = p.rose },
+		['Character'] = { fg = p.gold },
+		['Comment'] = { fg = groups.comment, italic = maybe.italic },
+		['Conditional'] = { fg = p.pine },
+		['Constant'] = { fg = p.gold },
+		['Debug'] = { fg = p.rose },
+		['Define'] = { fg = p.iris },
+		['Delimiter'] = { fg = p.subtle },
+		['Error'] = { fg = p.love },
+		['Exception'] = { fg = p.pine },
+		['Float'] = { fg = p.gold },
+		['Function'] = { fg = p.rose },
+		['Identifier'] = { fg = p.rose },
+		-- Ignore = {},
+		['Include'] = { fg = p.pine },
+		['Keyword'] = { fg = p.pine },
+		['Label'] = { fg = p.foam },
+		['Macro'] = { fg = p.iris },
+		['Number'] = { fg = p.gold },
+		['Operator'] = { fg = p.subtle },
+		['PreCondit'] = { fg = p.iris },
+		['PreProc'] = { fg = p.iris },
+		['Repeat'] = { fg = p.pine },
+		['Special'] = { fg = p.rose },
+		['SpecialChar'] = { fg = p.rose },
+		['SpecialComment'] = { fg = p.iris },
+		['Statement'] = { fg = p.pine },
+		['StorageClass'] = { fg = p.foam },
+		['String'] = { fg = p.gold },
+		['Structure'] = { fg = p.foam },
+		['Tag'] = { fg = p.foam },
+		['Todo'] = { fg = p.iris },
+		['Type'] = { fg = p.foam },
+		['Typedef'] = { link = 'Type' },
+		['Underlined'] = { underline = true },
 
-	-- rcarriga/nvim-notify
-	h('NotifyINFOBorder', { fg = p.foam })
-	h('NotifyINFOTitle', { link = 'NotifyINFOBorder' })
-	h('NotifyINFOIcon', { link = 'NotifyINFOBorder' })
-	h('NotifyWARNBorder', { fg = p.gold })
-	h('NotifyWARNTitle', { link = 'NotifyWARNBorder' })
-	h('NotifyWARNIcon', { link = 'NotifyWARNBorder' })
-	h('NotifyDEBUGBorder', { fg = p.muted })
-	h('NotifyDEBUGTitle', { link = 'NotifyDEBUGBorder' })
-	h('NotifyDEBUGIcon', { link = 'NotifyDEBUGBorder' })
-	h('NotifyTRACEBorder', { fg = p.iris })
-	h('NotifyTRACETitle', { link = 'NotifyTRACEBorder' })
-	h('NotifyTRACEIcon', { link = 'NotifyTRACEBorder' })
-	h('NotifyERRORBorder', { fg = p.love })
-	h('NotifyERRORTitle', { link = 'NotifyERRORBorder' })
-	h('NotifyERRORIcon', { link = 'NotifyERRORBorder' })
+		['htmlArg'] = { fg = p.iris },
+		['htmlBold'] = { bold = true },
+		['htmlEndTag'] = { fg = p.subtle },
+		['htmlH1'] = { fg = groups.headings.h1, bold = true },
+		['htmlH2'] = { fg = groups.headings.h2, bold = true },
+		['htmlH3'] = { fg = groups.headings.h3, bold = true },
+		['htmlH4'] = { fg = groups.headings.h4, bold = true },
+		['htmlH5'] = { fg = groups.headings.h5, bold = true },
+		['htmlItalic'] = { italic = maybe.italic },
+		['htmlLink'] = { fg = groups.link },
+		['htmlTag'] = { fg = p.subtle },
+		['htmlTagN'] = { fg = p.text },
+		['htmlTagName'] = { fg = p.foam },
 
-	-- rcarriga/nvim-dap-ui
-	h('DapUIVariable', { link = 'Normal' })
-	h('DapUIValue', { link = 'Normal' })
-	h('DapUIFrameName', { link = 'Normal' })
-	h('DapUIThread', { fg = p.gold })
-	h('DapUIWatchesValue', { link = 'DapUIThread' })
-	h('DapUIBreakpointsInfo', { link = 'DapUIThread' })
-	h('DapUIBreakpointsCurrentLine', { fg = p.gold, bold = true })
-	h('DapUIWatchesEmpty', { fg = p.love })
-	h('DapUIWatchesError', { link = 'DapUIWatchesEmpty' })
-	h('DapUIBreakpointsDisabledLine', { fg = p.muted })
-	h('DapUISource', { fg = p.iris })
-	h('DapUIBreakpointsPath', { fg = p.foam })
-	h('DapUIScope', { link = 'DapUIBreakpointsPath' })
-	h('DapUILineNumber', { link = 'DapUIBreakpointsPath' })
-	h('DapUIBreakpointsLine', { link = 'DapUIBreakpointsPath' })
-	h('DapUIFloatBorder', { link = 'DapUIBreakpointsPath' })
-	h('DapUIStoppedThread', { link = 'DapUIBreakpointsPath' })
-	h('DapUIDecoration', { link = 'DapUIBreakpointsPath' })
-	h('DapUIModifiedValue', { fg = p.foam, bold = true })
+		['markdownDelimiter'] = { fg = p.subtle },
+		['markdownH1'] = { fg = groups.headings.h1, bold = true },
+		['markdownH1Delimiter'] = { link = 'markdownH1' },
+		['markdownH2'] = { fg = groups.headings.h2, bold = true },
+		['markdownH2Delimiter'] = { link = 'markdownH2' },
+		['markdownH3'] = { fg = groups.headings.h3, bold = true },
+		['markdownH3Delimiter'] = { link = 'markdownH3' },
+		['markdownH4'] = { fg = groups.headings.h4, bold = true },
+		['markdownH4Delimiter'] = { link = 'markdownH4' },
+		['markdownH5'] = { fg = groups.headings.h5, bold = true },
+		['markdownH5Delimiter'] = { link = 'markdownH5' },
+		['markdownH6'] = { fg = groups.headings.h6, bold = true },
+		['markdownH6Delimiter'] = { link = 'markdownH6' },
+		['markdownLinkText'] = { fg = groups.link, sp = groups.link, underline = true },
+		['markdownUrl'] = { link = 'markdownLinkText' },
 
-	-- glepnir/dashboard-nvim
-	h('DashboardShortcut', { fg = p.love })
-	h('DashboardHeader', { fg = p.pine })
-	h('DashboardCenter', { fg = p.gold })
-	h('DashboardFooter', { fg = p.iris })
+		['mkdCode'] = { fg = p.foam, italic = maybe.italic },
+		['mkdCodeDelimiter'] = { fg = p.rose },
+		['mkdCodeEnd'] = { fg = p.foam },
+		['mkdCodeStart'] = { fg = p.foam },
+		['mkdFootnotes'] = { fg = p.foam },
+		['mkdID'] = { fg = p.foam, underline = true },
+		['mkdInlineURL'] = { fg = groups.link, underline = true },
+		['mkdLink'] = { link = 'mkdInlineURL' },
+		['mkdLinkDef'] = { link = 'mkdInlineURL' },
+		['mkdListItemLine'] = { fg = p.text },
+		['mkdRule'] = { fg = p.subtle },
+		['mkdURL'] = { link = 'mkdInlineURL' },
 
-	-- SmiteshP/nvim-navic
-	h('NavicIconsFile', { fg = p.base })
-	h('NavicIconsModule', { fg = p.rose })
-	h('NavicIconsNamespace', { fg = p.base })
-	h('NavicIconsPackage', { fg = p.base })
-	h('NavicIconsClass', { fg = p.foam })
-	h('NavicIconsMethod', { fg = p.iris })
-	h('NavicIconsProperty', { fg = p.foam })
-	h('NavicIconsField', { fg = p.foam })
-	h('NavicIconsConstructor', { fg = p.gold })
-	h('NavicIconsEnum', { fg = p.gold })
-	h('NavicIconsInterface', { fg = p.foam })
-	h('NavicIconsFunction', { fg = p.pine })
-	h('NavicIconsVariable', { fg = p.text })
-	h('NavicIconsConstant', { fg = p.gold })
-	h('NavicIconsString', { fg = p.gold })
-	h('NavicIconsNumber', { fg = p.gold })
-	h('NavicIconsBoolean', { fg = p.rose })
-	h('NavicIconsArray', { fg = p.gold })
-	h('NavicIconsObject', { fg = p.gold })
-	h('NavicIconsKey', { fg = p.iris })
-	h('NavicIconsKeyword', { fg = p.pine })
-	h('NavicIconsNull', { fg = p.love })
-	h('NavicIconsEnumMember', { fg = p.foam })
-	h('NavicIconsStruct', { fg = p.foam })
-	h('NavicIconsEvent', { fg = p.gold })
-	h('NavicIconsOperator', { fg = p.subtle })
-	h('NavicIconsTypeParameter', { fg = p.foam })
-	h('NavicText', { fg = p.subtle })
-	h('NavicSeparator', { fg = p.subtle })
+		['DiagnosticError'] = { fg = groups.error },
+		['DiagnosticHint'] = { fg = groups.hint },
+		['DiagnosticInfo'] = { fg = groups.info },
+		['DiagnosticWarn'] = { fg = groups.warn },
+		['DiagnosticDefaultError'] = { fg = groups.error },
+		['DiagnosticDefaultHint'] = { fg = groups.hint },
+		['DiagnosticDefaultInfo'] = { fg = groups.info },
+		['DiagnosticDefaultWarn'] = { fg = groups.warn },
+		['DiagnosticFloatingError'] = { fg = groups.error },
+		['DiagnosticFloatingHint'] = { fg = groups.hint },
+		['DiagnosticFloatingInfo'] = { fg = groups.info },
+		['DiagnosticFloatingWarn'] = { fg = groups.warn },
+		['DiagnosticSignError'] = { fg = groups.error },
+		['DiagnosticSignHint'] = { fg = groups.hint },
+		['DiagnosticSignInfo'] = { fg = groups.info },
+		['DiagnosticSignWarn'] = { fg = groups.warn },
+		['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, undercurl = true },
+		['DiagnosticUnderlineHint'] = { sp = groups.hint, undercurl = true },
+		['DiagnosticUnderlineInfo'] = { sp = groups.info, undercurl = true },
+		['DiagnosticUnderlineWarn'] = { sp = groups.warn, undercurl = true },
+		['DiagnosticVirtualTextError'] = { fg = groups.error },
+		['DiagnosticVirtualTextHint'] = { fg = groups.hint },
+		['DiagnosticVirtualTextInfo'] = { fg = groups.info },
+		['DiagnosticVirtualTextWarn'] = { fg = groups.warn },
 
-	-- folke/noice.nvim
-	h('NoiceCursor', { fg = p.highlight_high, bg = p.text })
+		-- healthcheck
+		['healthError'] = { fg = groups.error },
+		['healthSuccess'] = { fg = groups.info },
+		['healthWarning'] = { fg = groups.warn },
 
-	-- echasnovski/mini.indentscope
-	h('MiniIndentscopeSymbol', { fg = p.highlight_med })
-	h('MiniIndentscopeSymbolOff', { fg = p.highlight_med })
+		-- Treesitter
+		['@boolean'] = { link = 'Boolean' },
+		['@character'] = { link = 'Character' },
+		['@character.special'] = { link = '@character' },
+		['@class'] = { fg = p.foam },
+		['@comment'] = { link = 'Comment' },
+		['@conditional'] = { link = 'Conditional' },
+		['@constant'] = { link = 'Constant' },
+		['@constant.builtin'] = { fg = p.love },
+		['@constant.macro'] = { link = '@constant' },
+		['@constructor'] = { fg = p.foam },
+		['@field'] = { fg = p.foam },
+		['@function'] = { link = 'Function' },
+		['@function.builtin'] = { fg = p.love },
+		['@function.macro'] = { link = '@function' },
+		['@include'] = { link = 'Include' },
+		['@interface'] = { fg = p.foam },
+		['@keyword'] = { link = 'Keyword' },
+		['@keyword.operator'] = { fg = p.subtle },
+		['@label'] = { link = 'Label' },
+		['@macro'] = { link = 'Macro' },
+		['@method'] = { fg = p.rose },
+		['@number'] = { link = 'Number' },
+		['@operator'] = { link = 'Operator' },
+		['@parameter'] = { fg = p.iris, italic = maybe.italic },
+		['@preproc'] = { link = 'PreProc' },
+		['@property'] = { fg = p.foam, italic = maybe.italic },
+		['@punctuation'] = { fg = groups.punctuation },
+		['@punctuation.bracket'] = { link = '@punctuation' },
+		['@punctuation.delimiter'] = { link = '@punctuation' },
+		['@punctuation.special'] = { link = '@punctuation' },
+		['@regexp'] = { link = 'String' },
+		['@repeat'] = { link = 'Repeat' },
+		['@storageclass'] = { link = 'StorageClass' },
+		['@string'] = { link = 'String' },
+		['@string.escape'] = { fg = p.pine },
+		['@string.special'] = { link = '@string' },
+		['@symbol'] = { link = 'Identifier' },
+		['@tag'] = { link = 'Tag' },
+		['@tag.attribute'] = { fg = p.iris },
+		['@tag.delimiter'] = { fg = p.subtle },
+		['@text'] = { fg = p.text },
+		['@text.strong'] = { bold = true },
+		['@text.emphasis'] = { italic = true },
+		['@text.underline'] = { underline = true },
+		['@text.strike'] = { strikethrough = true },
+		['@text.math'] = { link = 'Special' },
+		['@text.environment'] = { link = 'Macro' },
+		['@text.environment.name'] = { link = 'Type' },
+		['@text.title'] = { link = 'Title' },
+		['@text.uri'] = { fg = groups.link },
+		['@text.note'] = { link = 'SpecialComment' },
+		['@text.warning'] = { fg = groups.warn },
+		['@text.danger'] = { fg = groups.error },
+		['@todo'] = { link = 'Todo' },
+		['@type'] = { link = 'Type' },
+		['@variable'] = { fg = p.text, italic = maybe.italic },
+		['@variable.builtin'] = { fg = p.love },
+		['@namespace'] = { link = '@include' },
 
-	-- goolord/alpha-nvim
-	h('AlphaHeader', { fg = p.pine })
-	h('AlphaButtons', { fg = p.foam })
-	h('AlphaShortcut', { fg = p.rose })
-	h('AlphaFooter', { fg = p.gold })
+		-- LSP Semantic Token Groups
+		['@lsp.type.comment'] = {},
+		['@lsp.type.enum'] = { link = '@type' },
+		['@lsp.type.keyword'] = { link = '@keyword' },
+		['@lsp.type.interface'] = { link = '@interface' },
+		['@lsp.type.namespace'] = { link = '@namespace' },
+		['@lsp.type.parameter'] = { link = '@parameter' },
+		['@lsp.type.property'] = { link = '@property' },
+		['@lsp.type.variable'] = {}, -- use treesitter styles for regular variables
+		['@lsp.typemod.function.defaultLibrary'] = { link = 'Special' },
+		['@lsp.typemod.variable.defaultLibrary'] = { link = '@variable.builtin' },
+
+		-- LSP Injected Groups
+		['@lsp.typemod.operator.injected'] = { link = '@operator' },
+		['@lsp.typemod.string.injected'] = { link = '@string' },
+		['@lsp.typemod.variable.injected'] = { link = '@variable' },
+
+		-- nvim-treesitter Markdown Headings
+		['@text.title.1.markdown'] = { link = 'markdownH1' },
+		['@text.title.1.marker.markdown'] = { link = 'markdownH1Delimiter' },
+		['@text.title.2.markdown'] = { link = 'markdownH2' },
+		['@text.title.2.marker.markdown'] = { link = 'markdownH2Delimiter' },
+		['@text.title.3.markdown'] = { link = 'markdownH3' },
+		['@text.title.3.marker.markdown'] = { link = 'markdownH3Delimiter' },
+		['@text.title.4.markdown'] = { link = 'markdownH4' },
+		['@text.title.4.marker.markdown'] = { link = 'markdownH4Delimiter' },
+		['@text.title.5.markdown'] = { link = 'markdownH5' },
+		['@text.title.5.marker.markdown'] = { link = 'markdownH5Delimiter' },
+		['@text.title.6.markdown'] = { link = 'markdownH6' },
+		['@text.title.6.marker.markdown'] = { link = 'markdownH6Delimiter' },
+
+		-- vim.lsp.buf.document_highlight()
+		['LspReferenceText'] = { bg = p.highlight_med },
+		['LspReferenceRead'] = { bg = p.highlight_med },
+		['LspReferenceWrite'] = { bg = p.highlight_med },
+
+		-- lsp-highlight-codelens
+		['LspCodeLens'] = { fg = p.subtle }, -- virtual text of code len
+		['LspCodeLensSeparator'] = { fg = p.highlight_high }, -- separator between two or more code len
+
+		-- romgrk/barbar.nvim
+		['BufferCurrent'] = { fg = p.text, bg = p.overlay },
+		['BufferCurrentIndex'] = { fg = p.text, bg = p.overlay },
+		['BufferCurrentMod'] = { fg = p.foam, bg = p.overlay },
+		['BufferCurrentSign'] = { fg = p.subtle, bg = p.overlay },
+		['BufferCurrentTarget'] = { fg = p.gold, bg = p.overlay },
+		['BufferInactive'] = { fg = p.subtle },
+		['BufferInactiveIndex'] = { fg = p.subtle },
+		['BufferInactiveMod'] = { fg = p.foam },
+		['BufferInactiveSign'] = { fg = p.muted },
+		['BufferInactiveTarget'] = { fg = p.gold },
+		['BufferTabpageFill'] = { fg = groups.background, bg = groups.background },
+		['BufferVisible'] = { fg = p.subtle },
+		['BufferVisibleIndex'] = { fg = p.subtle },
+		['BufferVisibleMod'] = { fg = p.foam },
+		['BufferVisibleSign'] = { fg = p.muted },
+		['BufferVisibleTarget'] = { fg = p.gold },
+
+		-- lewis6991/gitsigns.nvim
+		['GitSignsAdd'] = { fg = groups.git_add, bg = groups.background },
+		['GitSignsChange'] = { fg = groups.git_change, bg = groups.background },
+		['GitSignsDelete'] = { fg = groups.git_delete, bg = groups.background },
+		['SignAdd'] = { link = 'GitSignsAdd' },
+		['SignChange'] = { link = 'GitSignsChange' },
+		['SignDelete'] = { link = 'GitSignsDelete' },
+
+		-- mvllow/modes.nvim
+		['ModesCopy'] = { bg = p.gold },
+		['ModesDelete'] = { bg = p.love },
+		['ModesInsert'] = { bg = p.foam },
+		['ModesVisual'] = { bg = p.iris },
+
+		-- kyazdani42/nvim-tree.lua
+		['NvimTreeEmptyFolderName'] = { fg = p.muted },
+		['NvimTreeFileDeleted'] = { fg = p.love },
+		['NvimTreeFileDirty'] = { fg = p.rose },
+		['NvimTreeFileMerge'] = { fg = p.iris },
+		['NvimTreeFileNew'] = { fg = p.foam },
+		['NvimTreeFileRenamed'] = { fg = p.pine },
+		['NvimTreeFileStaged'] = { fg = p.iris },
+		['NvimTreeFolderIcon'] = { fg = p.subtle },
+		['NvimTreeFolderName'] = { fg = p.foam },
+		['NvimTreeGitDeleted'] = { fg = groups.git_delete },
+		['NvimTreeGitDirty'] = { fg = groups.git_dirty },
+		['NvimTreeGitIgnored'] = { fg = groups.git_ignore },
+		['NvimTreeGitMerge'] = { fg = groups.git_merge },
+		['NvimTreeGitNew'] = { fg = groups.git_add },
+		['NvimTreeGitRenamed'] = { fg = groups.git_rename },
+		['NvimTreeGitStaged'] = { fg = groups.git_stage },
+		['NvimTreeImageFile'] = { fg = p.text },
+		['NvimTreeNormal'] = { fg = p.text },
+		['NvimTreeOpenedFile'] = { fg = p.text, bg = p.highlight_med },
+		['NvimTreeOpenedFolderName'] = { link = 'NvimTreeFolderName' },
+		['NvimTreeRootFolder'] = { fg = p.iris },
+		['NvimTreeSpecialFile'] = { link = 'NvimTreeNormal' },
+		['NvimTreeWindowPicker'] = { fg = p.love, bg = p.love, blend = 10 },
+
+		-- nvim-neo-tree/neo-tree.nvim
+		['NeoTreeTitleBar'] = { fg = p.surface, bg = p.pine },
+		['NeoTreeGitAdded'] = { fg = p.foam },
+		['NeoTreeGitModified'] = { fg = p.rose },
+		['NeoTreeGitDeleted'] = { fg = p.love },
+		['NeoTreeGitRenamed'] = { fg = p.pine },
+		['NeoTreeGitIgnored'] = { fg = p.muted },
+		['NeoTreeGitUntracked'] = { fg = p.gold },
+		['NeoTreeGitConflict'] = { fg = p.iris },
+
+		-- folke/which-key.nvim
+		['WhichKey'] = { fg = p.iris },
+		['WhichKeyGroup'] = { fg = p.foam },
+		['WhichKeySeparator'] = { fg = p.subtle },
+		['WhichKeyDesc'] = { fg = p.gold },
+		['WhichKeyFloat'] = { bg = maybe.surface },
+		['WhichKeyValue'] = { fg = p.rose },
+
+		-- luka-reineke/indent-blankline.nvim
+		['IndentBlanklineChar'] = { fg = p.muted, nocombine = true },
+		['IndentBlanklineSpaceChar'] = { fg = p.muted, nocombine = true },
+		['IndentBlanklineSpaceCharBlankline'] = { fg = p.muted, nocombine = true },
+
+		-- hrsh7th/nvim-cmp
+		['CmpItemAbbr'] = { fg = p.subtle },
+		['CmpItemAbbrDeprecated'] = { fg = p.subtle, strikethrough = true },
+		['CmpItemAbbrMatch'] = { fg = p.text, bold = true },
+		['CmpItemAbbrMatchFuzzy'] = { fg = p.text, bold = true },
+		['CmpItemKind'] = { fg = p.subtle },
+		['CmpItemKindClass'] = { fg = p.pine },
+		['CmpItemKindFunction'] = { fg = p.rose },
+		['CmpItemKindInterface'] = { fg = p.foam },
+		['CmpItemKindMethod'] = { fg = p.iris },
+		['CmpItemKindSnippet'] = { fg = p.gold },
+		['CmpItemKindVariable'] = { fg = p.text },
+
+		-- TimUntersberger/neogit
+		['NeogitDiffAddHighlight'] = { fg = p.foam, bg = p.highlight_med },
+		['NeogitDiffContextHighlight'] = { bg = p.highlight_low },
+		['NeogitDiffDeleteHighlight'] = { fg = p.love, bg = p.highlight_med },
+		['NeogitHunkHeader'] = { bg = p.highlight_low },
+		['NeogitHunkHeaderHighlight'] = { bg = p.highlight_low },
+
+		-- vimwiki/vimwiki
+		['VimwikiHR'] = { fg = p.subtle },
+		['VimwikiHeader1'] = { fg = groups.headings.h1, bold = true },
+		['VimwikiHeader2'] = { fg = groups.headings.h2, bold = true },
+		['VimwikiHeader3'] = { fg = groups.headings.h3, bold = true },
+		['VimwikiHeader4'] = { fg = groups.headings.h4, bold = true },
+		['VimwikiHeader5'] = { fg = groups.headings.h5, bold = true },
+		['VimwikiHeader6'] = { fg = groups.headings.h6, bold = true },
+		['VimwikiHeaderChar'] = { fg = p.pine },
+		['VimwikiLink'] = { fg = groups.link, underline = true },
+		['VimwikiList'] = { fg = p.iris },
+		['VimwikiNoExistsLink'] = { fg = p.love },
+
+		-- nvim-neorg/neorg
+		['NeorgHeading1Prefix'] = { fg = groups.headings.h1, bold = true },
+		['NeorgHeading1Title'] = { link = 'NeorgHeading1Prefix' },
+		['NeorgHeading2Prefix'] = { fg = groups.headings.h2, bold = true },
+		['NeorgHeading2Title'] = { link = 'NeorgHeading2Prefix' },
+		['NeorgHeading3Prefix'] = { fg = groups.headings.h3, bold = true },
+		['NeorgHeading3Title'] = { link = 'NeorgHeading3Prefix' },
+		['NeorgHeading4Prefix'] = { fg = groups.headings.h4, bold = true },
+		['NeorgHeading4Title'] = { link = 'NeorgHeading4Prefix' },
+		['NeorgHeading5Prefix'] = { fg = groups.headings.h5, bold = true },
+		['NeorgHeading5Title'] = { link = 'NeorgHeading5Prefix' },
+		['NeorgHeading6Prefix'] = { fg = groups.headings.h6, bold = true },
+		['NeorgHeading6Title'] = { link = 'NeorgHeading6Prefix' },
+		['NeorgMarkerTitle'] = { fg = p.text, bold = true },
+
+		-- tami5/lspsaga.nvim (fork of glepnir/lspsaga.nvim)
+		['DefinitionCount'] = { fg = p.rose },
+		['DefinitionIcon'] = { fg = p.rose },
+		['DefintionPreviewTitle'] = { fg = p.rose, bold = true },
+		['LspFloatWinBorder'] = { fg = groups.border },
+		['LspFloatWinNormal'] = { bg = maybe.surface },
+		['LspSagaAutoPreview'] = { fg = p.subtle },
+		['LspSagaCodeActionBorder'] = { fg = groups.border },
+		['LspSagaCodeActionContent'] = { fg = p.foam },
+		['LspSagaCodeActionTitle'] = { fg = p.gold, bold = true },
+		['LspSagaCodeActionTruncateLine'] = { link = 'LspSagaCodeActionBorder' },
+		['LspSagaDefPreviewBorder'] = { fg = groups.border },
+		['LspSagaDiagnosticBorder'] = { fg = groups.border },
+		['LspSagaDiagnosticHeader'] = { fg = p.gold, bold = true },
+		['LspSagaDiagnosticTruncateLine'] = { link = 'LspSagaDiagnosticBorder' },
+		['LspSagaDocTruncateLine'] = { link = 'LspSagaHoverBorder' },
+		['LspSagaFinderSelection'] = { fg = p.gold },
+		['LspSagaHoverBorder'] = { fg = groups.border },
+		['LspSagaLspFinderBorder'] = { fg = groups.border },
+		['LspSagaRenameBorder'] = { fg = p.pine },
+		['LspSagaRenamePromptPrefix'] = { fg = p.love },
+		['LspSagaShTruncateLine'] = { link = 'LspSagaSignatureHelpBorder' },
+		['LspSagaSignatureHelpBorder'] = { fg = p.pine },
+		['ReferencesCount'] = { fg = p.rose },
+		['ReferencesIcon'] = { fg = p.rose },
+		['SagaShadow'] = { bg = p.overlay },
+		['TargetWord'] = { fg = p.iris },
+
+		-- ray-x/lsp_signature.nvim
+		['LspSignatureActiveParameter'] = { bg = p.overlay },
+
+		-- rlane/pounce.nvim
+		['PounceAccept'] = { fg = p.love, bg = p.highlight_high },
+		['PounceAcceptBest'] = { fg = p.base, bg = p.gold },
+		['PounceGap'] = { link = 'Search' },
+		['PounceMatch'] = { link = 'Search' },
+
+		-- ggandor/leap.nvim
+		['LeapMatch'] = { link = 'MatchParen' },
+		['LeapLabelPrimary'] = { link = 'IncSearch' },
+		['LeapLabelSecondary'] = { fg = p.base, bg = p.pine },
+
+		-- phaazon/hop.nvim
+		['HopNextKey'] = { fg = p.love },
+		['HopNextKey1'] = { fg = p.foam },
+		['HopNextKey2'] = { fg = p.pine },
+		['HopUnmatched'] = { fg = p.highlight_high },
+
+		-- nvim-telescope/telescope.nvim
+		['TelescopeBorder'] = { fg = groups.border, bg = float_background },
+		['TelescopeMatching'] = { fg = p.rose },
+		['TelescopeNormal'] = { fg = p.subtle, bg = float_background },
+		['TelescopePromptNormal'] = { fg = p.text, bg = float_background },
+		['TelescopePromptPrefix'] = { fg = p.subtle },
+		['TelescopeSelection'] = { fg = p.text, bg = p.overlay },
+		['TelescopeSelectionCaret'] = { fg = p.rose, bg = p.overlay },
+		['TelescopeTitle'] = { fg = p.subtle },
+
+		-- rcarriga/nvim-notify
+		['NotifyINFOBorder'] = { fg = p.foam },
+		['NotifyINFOTitle'] = { link = 'NotifyINFOBorder' },
+		['NotifyINFOIcon'] = { link = 'NotifyINFOBorder' },
+		['NotifyWARNBorder'] = { fg = p.gold },
+		['NotifyWARNTitle'] = { link = 'NotifyWARNBorder' },
+		['NotifyWARNIcon'] = { link = 'NotifyWARNBorder' },
+		['NotifyDEBUGBorder'] = { fg = p.muted },
+		['NotifyDEBUGTitle'] = { link = 'NotifyDEBUGBorder' },
+		['NotifyDEBUGIcon'] = { link = 'NotifyDEBUGBorder' },
+		['NotifyTRACEBorder'] = { fg = p.iris },
+		['NotifyTRACETitle'] = { link = 'NotifyTRACEBorder' },
+		['NotifyTRACEIcon'] = { link = 'NotifyTRACEBorder' },
+		['NotifyERRORBorder'] = { fg = p.love },
+		['NotifyERRORTitle'] = { link = 'NotifyERRORBorder' },
+		['NotifyERRORIcon'] = { link = 'NotifyERRORBorder' },
+
+		-- rcarriga/nvim-dap-ui
+		['DapUIVariable'] = { link = 'Normal' },
+		['DapUIValue'] = { link = 'Normal' },
+		['DapUIFrameName'] = { link = 'Normal' },
+		['DapUIThread'] = { fg = p.gold },
+		['DapUIWatchesValue'] = { link = 'DapUIThread' },
+		['DapUIBreakpointsInfo'] = { link = 'DapUIThread' },
+		['DapUIBreakpointsCurrentLine'] = { fg = p.gold, bold = true },
+		['DapUIWatchesEmpty'] = { fg = p.love },
+		['DapUIWatchesError'] = { link = 'DapUIWatchesEmpty' },
+		['DapUIBreakpointsDisabledLine'] = { fg = p.muted },
+		['DapUISource'] = { fg = p.iris },
+		['DapUIBreakpointsPath'] = { fg = p.foam },
+		['DapUIScope'] = { link = 'DapUIBreakpointsPath' },
+		['DapUILineNumber'] = { link = 'DapUIBreakpointsPath' },
+		['DapUIBreakpointsLine'] = { link = 'DapUIBreakpointsPath' },
+		['DapUIFloatBorder'] = { link = 'DapUIBreakpointsPath' },
+		['DapUIStoppedThread'] = { link = 'DapUIBreakpointsPath' },
+		['DapUIDecoration'] = { link = 'DapUIBreakpointsPath' },
+		['DapUIModifiedValue'] = { fg = p.foam, bold = true },
+
+		-- glepnir/dashboard-nvim
+		['DashboardShortcut'] = { fg = p.love },
+		['DashboardHeader'] = { fg = p.pine },
+		['DashboardCenter'] = { fg = p.gold },
+		['DashboardFooter'] = { fg = p.iris },
+
+		-- SmiteshP/nvim-navic
+		['NavicIconsFile'] = { fg = p.base },
+		['NavicIconsModule'] = { fg = p.rose },
+		['NavicIconsNamespace'] = { fg = p.base },
+		['NavicIconsPackage'] = { fg = p.base },
+		['NavicIconsClass'] = { fg = p.foam },
+		['NavicIconsMethod'] = { fg = p.iris },
+		['NavicIconsProperty'] = { fg = p.foam },
+		['NavicIconsField'] = { fg = p.foam },
+		['NavicIconsConstructor'] = { fg = p.gold },
+		['NavicIconsEnum'] = { fg = p.gold },
+		['NavicIconsInterface'] = { fg = p.foam },
+		['NavicIconsFunction'] = { fg = p.pine },
+		['NavicIconsVariable'] = { fg = p.text },
+		['NavicIconsConstant'] = { fg = p.gold },
+		['NavicIconsString'] = { fg = p.gold },
+		['NavicIconsNumber'] = { fg = p.gold },
+		['NavicIconsBoolean'] = { fg = p.rose },
+		['NavicIconsArray'] = { fg = p.gold },
+		['NavicIconsObject'] = { fg = p.gold },
+		['NavicIconsKey'] = { fg = p.iris },
+		['NavicIconsKeyword'] = { fg = p.pine },
+		['NavicIconsNull'] = { fg = p.love },
+		['NavicIconsEnumMember'] = { fg = p.foam },
+		['NavicIconsStruct'] = { fg = p.foam },
+		['NavicIconsEvent'] = { fg = p.gold },
+		['NavicIconsOperator'] = { fg = p.subtle },
+		['NavicIconsTypeParameter'] = { fg = p.foam },
+		['NavicText'] = { fg = p.subtle },
+		['NavicSeparator'] = { fg = p.subtle },
+
+		-- folke/noice.nvim
+		['NoiceCursor'] = { fg = p.highlight_high, bg = p.text },
+
+		-- echasnovski/mini.indentscope
+		['MiniIndentscopeSymbol'] = { fg = p.highlight_med },
+		['MiniIndentscopeSymbolOff'] = { fg = p.highlight_med },
+
+		-- goolord/alpha-nvim
+		['AlphaHeader'] = { fg = p.pine },
+		['AlphaButtons'] = { fg = p.foam },
+		['AlphaShortcut'] = { fg = p.rose },
+		['AlphaFooter'] = { fg = p.gold },
+	}
 
 	vim.g.terminal_color_0 = p.overlay -- black
 	vim.g.terminal_color_8 = p.subtle -- bright black
@@ -598,8 +597,21 @@ function M._load(options)
 	vim.g.terminal_color_7 = p.text -- white
 	vim.g.terminal_color_15 = p.text -- bright white
 
-	-- Set user highlights
-	for group, color in pairs(options.highlight_groups) do
+	-- Set users highlight_group customisations.
+	for group, opts in pairs(options.highlight_groups) do
+		local default_opts = M.defaults[group]
+
+		if (opts.inherit == nil or opts.inherit) and default_opts ~= nil then -- On merge.
+			opts.inherit = nil -- Don't add this key to the highlight_group after merge.
+			M.defaults[group] = vim.tbl_extend('force', default_opts, opts)
+		else -- On overwrite.
+			opts.inherit = nil -- Don't add this key to the highlight_group.
+			M.defaults[group] = opts
+		end
+	end
+
+	-- Set highlights.
+	for group, color in pairs(M.defaults) do
 		h(group, color)
 	end
 end
diff --git a/readme.md b/readme.md
index b1a4c84..621c14f 100644
--- a/readme.md
+++ b/readme.md
@@ -93,6 +93,10 @@ require('rose-pine').setup({
 		-- headings = 'subtle'
 	},
 
+	-- Whether or not highlight_groups optios should change only only update
+	-- the settings they touch or should reset the entire highlight_group.
+	respect_default_highlight_groups = true,
+
 	-- Change specific vim highlight groups
 	-- https://github.com/rose-pine/neovim/wiki/Recipes
 	highlight_groups = {

From eb4c5591c730fa18af374241c904653ac8ba3e9c Mon Sep 17 00:00:00 2001
From: Asthestarsfalll <72954905+Asthestarsfalll@users.noreply.github.com>
Date: Fri, 21 Jul 2023 16:09:29 +0800
Subject: [PATCH 088/190] feat: color for flash (#174)

---
 lua/rose-pine/theme.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index e8dcd93..c702531 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -77,6 +77,7 @@ function M._load(options)
 			fg = p.text,
 			bg = (options.dim_nc_background and p.none) or maybe.base,
 		},
+		['Substitute'] = { fg = p.base, bg = p.love },
 		['StatusLine'] = { fg = p.subtle, bg = groups.panel },
 		['StatusLineNC'] = { fg = p.muted, bg = groups.panel_nc },
 		['StatusLineTerm'] = { link = 'StatusLine' },

From 70c641a0b7d7cb96407c0324739a62bbf635a122 Mon Sep 17 00:00:00 2001
From: Tobias Sommer <tobias.sommer.dev@mailbox.org>
Date: Sat, 22 Jul 2023 16:31:03 +0200
Subject: [PATCH 089/190] docs: add `inherit` option (#175)

* Remove the option, which is not longer implemented
* Add an example for the inherit highlight config
---
 readme.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/readme.md b/readme.md
index 621c14f..443de41 100644
--- a/readme.md
+++ b/readme.md
@@ -93,10 +93,6 @@ require('rose-pine').setup({
 		-- headings = 'subtle'
 	},
 
-	-- Whether or not highlight_groups optios should change only only update
-	-- the settings they touch or should reset the entire highlight_group.
-	respect_default_highlight_groups = true,
-
 	-- Change specific vim highlight groups
 	-- https://github.com/rose-pine/neovim/wiki/Recipes
 	highlight_groups = {
@@ -105,6 +101,11 @@ require('rose-pine').setup({
 		-- Blend colours against the "base" background
 		CursorLine = { bg = 'foam', blend = 10 },
 		StatusLine = { fg = 'love', bg = 'love', blend = 10 },
+
+		-- By default each group adds to the existing config.
+		-- If you only want to set what is written in this config exactly,
+		-- you can set the inherit option:
+		Search = { bg = 'gold', inherit = false },
 	}
 })
 

From bca840fc9095fd47e56d04cfb01e8ffd55b6ae2d Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Fri, 28 Jul 2023 23:03:23 +0200
Subject: [PATCH 090/190] docs: update installation (#178)

---
 readme.md | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/readme.md b/readme.md
index 443de41..8012087 100644
--- a/readme.md
+++ b/readme.md
@@ -11,27 +11,31 @@
     </a>
 </p>
 
-## Usage
+## Install
 
-> With [lazy.nvim](https://github.com/folke/lazy.nvim)
+**[Paq](https://github.com/savq/paq-nvim)**
+
+```lua
+require('paq')({
+  { 'rose-pine/neovim', as = 'rose-pine' }
+})
+```
+
+**[lazy.nvim](https://github.com/folke/lazy.nvim)**
 
 ```lua
 require("lazy").setup({
-	{ 'rose-pine/neovim', name = 'rose-pine' }
+  { 'rose-pine/neovim', name = 'rose-pine' }
 })
-
-vim.cmd('colorscheme rose-pine')
 ```
 
-> With [packer.nvim](https://github.com/wbthomason/packer.nvim)
+**[packer.nvim](https://github.com/wbthomason/packer.nvim)**
 
 ```lua
-use({ 'rose-pine/neovim', as = 'rose-pine' })
-
-vim.cmd('colorscheme rose-pine')
-```
-
-_Supported plugins are listed in the [wiki](https://github.com/rose-pine/neovim/wiki#supported-plugins)_
+require('packer').startup(function(use)
+  use({ 'rose-pine/neovim', as = 'rose-pine' })
+end)
+```∞
 
 ## Gallery
 

From 8f37719a515f1ae292fc991ed29d49286e0a5148 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Fri, 28 Jul 2023 23:04:08 +0200
Subject: [PATCH 091/190] docs: fix readme typo (#179)

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 8012087..1888d34 100644
--- a/readme.md
+++ b/readme.md
@@ -35,7 +35,7 @@ require("lazy").setup({
 require('packer').startup(function(use)
   use({ 'rose-pine/neovim', as = 'rose-pine' })
 end)
-```∞
+```
 
 ## Gallery
 

From c48de5d8f8866a115aa7900cea8bff29926f69c8 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Wed, 25 Oct 2023 14:43:34 -0500
Subject: [PATCH 092/190] Update readme.md (#181)

---
 readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readme.md b/readme.md
index 1888d34..ed6d466 100644
--- a/readme.md
+++ b/readme.md
@@ -53,6 +53,7 @@ end)
 
 ## Options
 
+> [!NOTE]
 > Options should be set **before** colorscheme
 
 Variant respects `vim.o.background`, using dawn when light and `dark_variant` when dark

From 84a88f68e1351c701f5fb329ddab66023219d298 Mon Sep 17 00:00:00 2001
From: mortezadadgar <mortezadadgar97@gmail.com>
Date: Sun, 7 Jan 2024 22:44:25 +0330
Subject: [PATCH 093/190] Add support for `fzf-lua` (#194)

In a attempt make it more like telescope colors.
---
 lua/rose-pine/theme.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index c702531..d5e4faf 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -492,6 +492,15 @@ function M._load(options)
 		['TelescopeSelectionCaret'] = { fg = p.rose, bg = p.overlay },
 		['TelescopeTitle'] = { fg = p.subtle },
 
+		-- ibhagwan/fzf-lua
+		['FzfLuaNormal'] = { fg = p.subtle, bg = float_background },
+		['FzfLuaTitle'] = { fg = p.subtle },
+		['FzfLuaBorder'] = { fg = groups.border, bg = float_background },
+		['FzfLuaHeaderText'] = { fg = p.love },
+		['FzfLuaHeaderBind'] = { fg = p.rose },
+		['FzfLuaBufFlagCur'] = { fg = p.subtle },
+		['FzfLuaBufFlagAlt'] = { fg = p.subtle },
+
 		-- rcarriga/nvim-notify
 		['NotifyINFOBorder'] = { fg = p.foam },
 		['NotifyINFOTitle'] = { link = 'NotifyINFOBorder' },

From 29477a109aca06e4077b86a04815a43bd68d3a15 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sun, 7 Jan 2024 13:42:09 -0600
Subject: [PATCH 094/190] feat!: add new options with better support for
 transparency (#185)

This commit adds a few new options and improves transparency support.

Enable transparency styles:

```lua
styles = { transparency = true }
```

Feedback is appreciated!
---
 .github/ISSUE_TEMPLATE/bug_report.yml      |  24 +-
 .github/ISSUE_TEMPLATE/feature_request.yml |  12 -
 .stylua.toml                               |   4 -
 changelog.md                               |  82 +++
 colors/rose-pine-dawn.lua                  |   4 +-
 colors/rose-pine-main.lua                  |   4 +-
 colors/rose-pine-moon.lua                  |   4 +-
 colors/rose-pine.lua                       |   4 +-
 lua/lualine/themes/rose-pine-alt.lua       |  18 +-
 lua/lualine/themes/rose-pine.lua           |  14 +-
 lua/rose-pine.lua                          | 662 ++++++++++++++++++++-
 lua/rose-pine/config.lua                   | 188 ++++--
 lua/rose-pine/palette.lua                  | 111 ++--
 lua/rose-pine/plugins/bufferline.lua       |   2 +-
 lua/rose-pine/plugins/galaxyline.lua       |   2 +-
 lua/rose-pine/plugins/markid.lua           |   2 +-
 lua/rose-pine/plugins/toggleterm.lua       |  12 +-
 lua/rose-pine/theme.lua                    | 629 --------------------
 lua/rose-pine/util.lua                     |  71 ---
 lua/rose-pine/utilities.lua                |  66 ++
 readme.md                                  | 145 ++---
 21 files changed, 1101 insertions(+), 959 deletions(-)
 delete mode 100644 .stylua.toml
 create mode 100644 changelog.md
 delete mode 100644 lua/rose-pine/theme.lua
 delete mode 100644 lua/rose-pine/util.lua
 create mode 100644 lua/rose-pine/utilities.lua

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 4cee468..cd69062 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -15,30 +15,14 @@ body:
       required: true
   - type: input
     attributes:
-      label: "Terminal"
-      placeholder: "Kitty"
+      label: "Terminal / multiplexer"
+      placeholder: "Kitty / tmux"
     validations:
       required: true
   - type: textarea
     attributes:
       label: Describe the bug
-      description: A clear and concise description of what the bug is. Please include any related errors you see in Neovim.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Steps To Reproduce
-      description: Steps to reproduce the behavior.
-      placeholder: |
-        1.
-        2.
-        3.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: A concise description of what you expected to happen.
+      description: A clear and concise description of what the bug is. Please include screenshots if possible and any related errors you see in Neovim.
     validations:
       required: true
   - type: textarea
@@ -61,7 +45,7 @@ body:
         end
 
         require("rose-pine").setup({
-          -- ADD ROSÉ PINE CONFIG THAT IS _NECESSARY_ FOR REPRODUCING THE ISSUE
+          -- ADD ROSÉ PINE CONFIG THAT IS _NECESSARY_ TO REPRODUCE THE ISSUE
         })
 
         vim.cmd("colorscheme rose-pine")
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 2b45cdb..bd9d3f6 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -3,24 +3,12 @@ description: Suggest a new feature
 title: "feature: "
 labels: [enhancement]
 body:
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: Is your feature request related to a problem? Please describe.
-      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
   - type: textarea
     validations:
       required: true
     attributes:
       label: Describe the solution you'd like
       description: A clear and concise description of what you want to happen.
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: Describe alternatives you've considered
-      description: A clear and concise description of any alternative solutions or features you've considered.
   - type: textarea
     validations:
       required: false
diff --git a/.stylua.toml b/.stylua.toml
deleted file mode 100644
index 9d5f247..0000000
--- a/.stylua.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-column_width = 80
-indent_type = "Tabs"
-line_endings = "Unix"
-quote_style = "AutoPreferSingle"
diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000..bd583ba
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,82 @@
+# Changelog
+
+## v2.0.0-next.1
+
+### What's new
+
+- Add proper support for `StatusLineTerm` & `StatusLineTermNC`, controlled via `enable.terminal`
+- Add background glow to diagnostic virtual text
+- Add `extend_background_behind_borders`
+- Add `styles.bold` and alternatively styling when disabled
+- Add `before_highlight` hook to allow changing palette values and behaviours
+- Increase contrast of search, visual selections, and more
+
+### Features
+
+**extend_background_behind_borders**
+
+Extend float backgrounds behind borders. Results vary depending on your border characters.
+
+```lua
+{
+    extend_background_behind_borders = true
+}
+```
+
+**styles.transparency**
+
+Enable a unique experience focused around transparent terminals, avoiding large backgrounds and differentiating selections with foreground colours when possible.
+
+```lua
+{
+    styles = {
+        transparency = true
+    }
+}
+```
+
+**before_highlight**
+
+```lua
+{
+    before_highlight = function(group, highlight, palette)
+        -- Disable all undercurls
+        if highlight.undercurl then
+            highlight.undercurl = false
+        end
+
+        -- Change palette colour
+        if highlight.fg == palette.pine then
+            highlight.fg = palette.foam
+        end
+    end,
+}
+```
+
+### Breaking changes
+
+> [!WARNING]
+> Removed or renamed options should continue to work via internal migrations but backwards compatibility is not tested and may break at any time.
+
+```diff
+- dim_nc_background = true,
++ dim_inactive_windows = true,
+
+- disable_background = true,
+- disable_float_background = true,
++ styles.transparency = true
+
+- disable_italics = true,
++ styles.italic = false,
+
+- groups = {
+-   background = "...",
+-   comment = "...",
+-   punctuation = "...",
+- },
++ highlight_groups = {
++   Normal = { bg = "..." },
++   Comment = { fg = "..." },
++   ["@punctuation"] = { fg = "..." },
++ }
+```
diff --git a/colors/rose-pine-dawn.lua b/colors/rose-pine-dawn.lua
index 3ce1680..a95b327 100644
--- a/colors/rose-pine-dawn.lua
+++ b/colors/rose-pine-dawn.lua
@@ -1,2 +1,2 @@
-package.loaded['rose-pine.palette'] = nil
-require('rose-pine').colorscheme('dawn')
+package.loaded["rose-pine.palette"] = nil
+require("rose-pine").colorscheme("dawn")
diff --git a/colors/rose-pine-main.lua b/colors/rose-pine-main.lua
index e09c69d..15729c9 100644
--- a/colors/rose-pine-main.lua
+++ b/colors/rose-pine-main.lua
@@ -1,2 +1,2 @@
-package.loaded['rose-pine.palette'] = nil
-require('rose-pine').colorscheme('main')
+package.loaded["rose-pine.palette"] = nil
+require("rose-pine").colorscheme("main")
diff --git a/colors/rose-pine-moon.lua b/colors/rose-pine-moon.lua
index 7196100..34b58c0 100644
--- a/colors/rose-pine-moon.lua
+++ b/colors/rose-pine-moon.lua
@@ -1,2 +1,2 @@
-package.loaded['rose-pine.palette'] = nil
-require('rose-pine').colorscheme('moon')
+package.loaded["rose-pine.palette"] = nil
+require("rose-pine").colorscheme("moon")
diff --git a/colors/rose-pine.lua b/colors/rose-pine.lua
index 71f155f..f705290 100644
--- a/colors/rose-pine.lua
+++ b/colors/rose-pine.lua
@@ -1,2 +1,2 @@
-package.loaded['rose-pine.palette'] = nil
-require('rose-pine').colorscheme()
+package.loaded["rose-pine.palette"] = nil
+require("rose-pine").colorscheme()
diff --git a/lua/lualine/themes/rose-pine-alt.lua b/lua/lualine/themes/rose-pine-alt.lua
index 1e1ee36..05d8af7 100644
--- a/lua/lualine/themes/rose-pine-alt.lua
+++ b/lua/lualine/themes/rose-pine-alt.lua
@@ -1,26 +1,26 @@
-local p = require('rose-pine.palette')
+local p = require("rose-pine.palette")
 
 return {
 	normal = {
-		a = { bg = p.surface, fg = p.rose, gui = 'bold' },
+		a = { bg = p.surface, fg = p.rose, gui = "bold" },
 		b = { bg = p.surface, fg = p.text },
-		c = { bg = p.surface, fg = p.subtle, gui = 'italic' },
+		c = { bg = p.surface, fg = p.subtle, gui = "italic" },
 	},
 	insert = {
-		a = { bg = p.surface, fg = p.foam, gui = 'bold' },
+		a = { bg = p.surface, fg = p.foam, gui = "bold" },
 	},
 	visual = {
-		a = { bg = p.surface, fg = p.iris, gui = 'bold' },
+		a = { bg = p.surface, fg = p.iris, gui = "bold" },
 	},
 	replace = {
-		a = { bg = p.surface, fg = p.pine, gui = 'bold' },
+		a = { bg = p.surface, fg = p.pine, gui = "bold" },
 	},
 	command = {
-		a = { bg = p.surface, fg = p.love, gui = 'bold' },
+		a = { bg = p.surface, fg = p.love, gui = "bold" },
 	},
 	inactive = {
-		a = { bg = p.base, fg = p.subtle, gui = 'bold' },
+		a = { bg = p.base, fg = p.subtle, gui = "bold" },
 		b = { bg = p.base, fg = p.subtle },
-		c = { bg = p.base, fg = p.subtle, gui = 'italic' },
+		c = { bg = p.base, fg = p.subtle, gui = "italic" },
 	},
 }
diff --git a/lua/lualine/themes/rose-pine.lua b/lua/lualine/themes/rose-pine.lua
index dde3075..96d6b92 100644
--- a/lua/lualine/themes/rose-pine.lua
+++ b/lua/lualine/themes/rose-pine.lua
@@ -1,33 +1,33 @@
-local p = require('rose-pine.palette')
+local p = require("rose-pine.palette")
 
 return {
 	normal = {
-		a = { bg = p.rose, fg = p.base, gui = 'bold' },
+		a = { bg = p.rose, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.rose },
 		c = { bg = p.base, fg = p.text },
 	},
 	insert = {
-		a = { bg = p.foam, fg = p.base, gui = 'bold' },
+		a = { bg = p.foam, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.foam },
 		c = { bg = p.base, fg = p.text },
 	},
 	visual = {
-		a = { bg = p.iris, fg = p.base, gui = 'bold' },
+		a = { bg = p.iris, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.iris },
 		c = { bg = p.base, fg = p.text },
 	},
 	replace = {
-		a = { bg = p.pine, fg = p.base, gui = 'bold' },
+		a = { bg = p.pine, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.pine },
 		c = { bg = p.base, fg = p.text },
 	},
 	command = {
-		a = { bg = p.love, fg = p.base, gui = 'bold' },
+		a = { bg = p.love, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.love },
 		c = { bg = p.base, fg = p.text },
 	},
 	inactive = {
-		a = { bg = p.base, fg = p.muted, gui = 'bold' },
+		a = { bg = p.base, fg = p.muted, gui = "bold" },
 		b = { bg = p.base, fg = p.muted },
 		c = { bg = p.base, fg = p.muted },
 	},
diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index b3cf3ea..d45d4af 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -1,22 +1,668 @@
-local config = require('rose-pine.config')
 local M = {}
+local config = require("rose-pine.config")
 
----@param variant Variant|nil
+local function set_highlights()
+	local utilities = require("rose-pine.utilities")
+	local palette = require("rose-pine.palette")
+	local styles = config.options.styles
+	local groups = config.options.groups
+
+	local function make_border(fg)
+		fg = fg or groups.border
+		return { fg = fg, bg = config.options.extend_background_behind_borders and palette.surface or "NONE" }
+	end
+
+	local function make_title(fg)
+		fg = fg or palette.foam
+		return { fg = styles.bold and palette.text or fg, bold = styles.bold }
+	end
+
+	local highlights = {
+		ColorColumn = { bg = palette.surface },
+		Conceal = { bg = "NONE" },
+		CurSearch = { fg = palette.base, bg = palette.gold },
+		Cursor = { fg = palette.text, bg = palette.highlight_high },
+		CursorColumn = { bg = palette.overlay },
+		-- CursorIM = {},
+		CursorLine = { bg = palette.overlay },
+		CursorLineNr = { fg = palette.text, bold = styles.bold },
+		-- DarkenedPanel = { },
+		-- DarkenedStatusline = {},
+		DiffAdd = { bg = groups.git_add, blend = 20 },
+		DiffChange = { bg = groups.git_change, blend = 20 },
+		DiffDelete = { bg = groups.git_delete, blend = 20 },
+		DiffText = { bg = groups.git_text, blend = 20 },
+		diffAdded = { link = "DiffAdd" },
+		diffChanged = { link = "DiffChange" },
+		diffRemoved = { link = "DiffDelete" },
+		Directory = make_title(),
+		-- EndOfBuffer = {},
+		ErrorMsg = { fg = groups.error, bold = styles.bold },
+		FloatBorder = make_border(),
+		FloatTitle = { link = "Directory" },
+		FoldColumn = { fg = palette.muted },
+		Folded = { fg = palette.text, bg = groups.panel },
+		IncSearch = { link = "CurSearch" },
+		LineNr = { fg = palette.muted },
+		MatchParen = { fg = palette.pine, bg = palette.pine, blend = 25 },
+		ModeMsg = { fg = palette.subtle },
+		MoreMsg = { fg = palette.iris },
+		NonText = { fg = palette.muted },
+		Normal = { fg = palette.text, bg = palette.base },
+		NormalFloat = { bg = groups.panel },
+		NormalNC = { fg = palette.text, bg = config.options.dim_inactive_windows and palette._nc or palette.base },
+		NvimInternalError = { link = "ErrorMsg" },
+		Pmenu = { fg = palette.subtle, bg = groups.panel },
+		PmenuExtra = { fg = palette.muted, bg = groups.panel },
+		PmenuExtraSel = { fg = palette.subtle, bg = palette.overlay },
+		PmenuKind = { fg = palette.foam, bg = groups.panel },
+		PmenuKindSel = { fg = palette.subtle, bg = palette.overlay },
+		PmenuSbar = { bg = groups.panel },
+		PmenuSel = { fg = palette.title, bg = palette.overlay },
+		PmenuThumb = { bg = palette.muted },
+		Question = { fg = palette.gold },
+		-- QuickFixLink = {},
+		-- RedrawDebugNormal = {},
+		RedrawDebugClear = { fg = palette.base, bg = palette.gold },
+		RedrawDebugComposed = { fg = palette.base, bg = palette.pine },
+		RedrawDebugRecompose = { fg = palette.base, bg = palette.love },
+		Search = { fg = palette.base, bg = palette.text },
+		SignColumn = { fg = palette.text, bg = "NONE" },
+		SpecialKey = { fg = palette.foam },
+		SpellBad = { sp = palette.subtle, undercurl = true },
+		SpellCap = { sp = palette.subtle, undercurl = true },
+		SpellLocal = { sp = palette.subtle, undercurl = true },
+		SpellRare = { sp = palette.subtle, undercurl = true },
+		StatusLine = { fg = palette.subtle, bg = groups.panel },
+		StatusLineNC = { fg = palette.muted, bg = groups.panel, blend = 60 },
+		StatusLineTerm = { fg = palette.base, bg = palette.pine },
+		StatusLineTermNC = { fg = palette.base, bg = palette.pine, blend = 60 },
+		Substitute = { link = "IncSearch" },
+		TabLine = { link = "StatusLine" },
+		TabLineFill = { bg = groups.panel },
+		TabLineSel = { fg = palette.text, bg = palette.overlay, bold = styles.bold },
+		Title = make_title(),
+		VertSplit = make_border(),
+		Visual = { bg = palette.highlight_med },
+		-- VisualNOS = {},
+		WarningMsg = { fg = groups.warn, bold = styles.bold },
+		-- Whitespace = {},
+		WildMenu = { link = "IncSearch" },
+		WinSeparator = make_border(),
+
+		DiagnosticError = { fg = groups.error },
+		DiagnosticHint = { fg = groups.hint },
+		DiagnosticInfo = { fg = groups.info },
+		DiagnosticWarn = { fg = groups.warn },
+		DiagnosticDefaultError = { link = "DiagnosticError" },
+		DiagnosticDefaultHint = { link = "DiagnosticHint" },
+		DiagnosticDefaultInfo = { link = "DiagnosticInfo" },
+		DiagnosticDefaultWarn = { link = "DiagnosticWarn" },
+		DiagnosticFloatingError = { link = "DiagnosticError" },
+		DiagnosticFloatingHint = { link = "DiagnosticHint" },
+		DiagnosticFloatingInfo = { link = "DiagnosticInfo" },
+		DiagnosticFloatingWarn = { link = "DiagnosticWarn" },
+		DiagnosticSignError = { link = "DiagnosticError" },
+		DiagnosticSignHint = { link = "DiagnosticHint" },
+		DiagnosticSignInfo = { link = "DiagnosticInfo" },
+		DiagnosticSignWarn = { link = "DiagnosticWarn" },
+		DiagnosticUnderlineError = { sp = groups.error, undercurl = true },
+		DiagnosticUnderlineHint = { sp = groups.hint, undercurl = true },
+		DiagnosticUnderlineInfo = { sp = groups.info, undercurl = true },
+		DiagnosticUnderlineWarn = { sp = groups.warn, undercurl = true },
+		DiagnosticVirtualTextError = { fg = groups.error, bg = groups.error, blend = 10 },
+		DiagnosticVirtualTextHint = { fg = groups.hint, bg = groups.hint, blend = 10 },
+		DiagnosticVirtualTextInfo = { fg = groups.info, bg = groups.info, blend = 10 },
+		DiagnosticVirtualTextWarn = { fg = groups.warn, bg = groups.warn, blend = 10 },
+
+		Boolean = { fg = palette.rose },
+		Character = { fg = palette.gold },
+		Comment = { fg = palette.subtle, italic = styles.italic },
+		Conditional = { fg = palette.pine },
+		Constant = { fg = palette.gold },
+		Debug = { fg = palette.rose },
+		Define = { fg = palette.iris },
+		Delimiter = { fg = palette.subtle },
+		Error = { fg = palette.love },
+		Exception = { fg = palette.pine },
+		Float = { fg = palette.gold },
+		Function = { fg = palette.rose },
+		Identifier = { fg = palette.text },
+		Include = { fg = palette.pine },
+		Keyword = { fg = palette.pine },
+		Label = { fg = palette.foam },
+		LspCodeLens = { fg = palette.subtle },
+		LspCodeLensSeparator = { fg = palette.muted },
+		LspInlayHint = { fg = palette.muted, bg = palette.muted, blend = 10 },
+		LspReferenceRead = { bg = palette.highlight_med },
+		LspReferenceText = { bg = palette.highlight_med },
+		LspReferenceWrite = { bg = palette.highlight_med },
+		Macro = { fg = palette.iris },
+		Number = { fg = palette.gold },
+		Operator = { fg = palette.subtle },
+		PreConduit = { fg = palette.iris },
+		PreProc = { link = "PreConduit" },
+		Repeat = { fg = palette.pine },
+		Special = { fg = palette.foam },
+		SpecialChar = { link = "Special" },
+		SpecialComment = { fg = palette.iris },
+		Statement = { fg = palette.pine, bold = styles.bold },
+		StorageClass = { fg = palette.foam },
+		String = { fg = palette.gold },
+		Structure = { fg = palette.foam },
+		Tag = { fg = palette.foam },
+		Todo = { fg = palette.iris, bg = palette.iris, blend = 20 },
+		Type = { fg = palette.foam },
+		TypeDef = { link = "Type" },
+		Underlined = { fg = palette.iris, underline = true },
+
+		healthError = { fg = groups.error },
+		healthSuccess = { fg = groups.info },
+		healthWarning = { fg = groups.warn },
+
+		htmlArg = { fg = palette.iris },
+		htmlBold = { bold = styles.bold },
+		htmlEndTag = { fg = palette.subtle },
+		htmlH1 = { link = "markdownH1" },
+		htmlH2 = { link = "markdownH2" },
+		htmlH3 = { link = "markdownH3" },
+		htmlH4 = { link = "markdownH4" },
+		htmlH5 = { link = "markdownH5" },
+		htmlItalic = { italic = styles.italic },
+		htmlLink = { link = "markdownUrl" },
+		htmlTag = { fg = palette.subtle },
+		htmlTagN = { fg = palette.text },
+		htmlTagName = { fg = palette.foam },
+
+		markdownDelimiter = { fg = palette.subtle },
+		markdownH1 = { fg = groups.headings.h1, bold = styles.bold },
+		markdownH1Delimiter = { link = "markdownH1" },
+		markdownH2 = { fg = groups.headings.h2, bold = styles.bold },
+		markdownH2Delimiter = { link = "markdownH2" },
+		markdownH3 = { fg = groups.headings.h3, bold = styles.bold },
+		markdownH3Delimiter = { link = "markdownH3" },
+		markdownH4 = { fg = groups.headings.h4, bold = styles.bold },
+		markdownH4Delimiter = { link = "markdownH4" },
+		markdownH5 = { fg = groups.headings.h5, bold = styles.bold },
+		markdownH5Delimiter = { link = "markdownH5" },
+		markdownH6 = { fg = groups.headings.h6, bold = styles.bold },
+		markdownH6Delimiter = { link = "markdownH6" },
+		markdownLinkText = { link = "markdownUrl" },
+		markdownUrl = { fg = groups.link, sp = groups.link, underline = true },
+
+		mkdCode = { fg = palette.foam, italic = styles.italic },
+		mkdCodeDelimiter = { fg = palette.rose },
+		mkdCodeEnd = { fg = palette.foam },
+		mkdCodeStart = { fg = palette.foam },
+		mkdFootnotes = { fg = palette.foam },
+		mkdID = { fg = palette.foam, underline = true },
+		mkdInlineURL = { link = "markdownUrl" },
+		mkdLink = { link = "markdownUrl" },
+		mkdLinkDef = { link = "markdownUrl" },
+		mkdListItemLine = { fg = palette.text },
+		mkdRule = { fg = palette.subtle },
+		mkdURL = { link = "markdownUrl" },
+
+		["@attribute.diff"] = { fg = palette.gold },
+		["@boolean"] = { link = "Boolean" },
+		["@character"] = { link = "Character" },
+		["@character.special"] = { link = "Character" },
+		["@class"] = { fg = palette.foam },
+		["@comment"] = { link = "Comment" },
+		["@conditional"] = { link = "Conditional" },
+		["@constant"] = { link = "Constant" },
+		["@constant.builtin"] = { fg = palette.love },
+		["@constant.macro"] = { link = "Constant" },
+		["@constructor"] = { fg = palette.foam },
+		["@field"] = { fg = palette.foam },
+		["@function"] = { link = "Function" },
+		["@function.builtin"] = { fg = palette.love },
+		["@function.macro"] = { link = "Function" },
+		["@include"] = { link = "Include" },
+		["@interface"] = { fg = palette.foam },
+		["@keyword"] = { link = "Keyword" },
+		["@keyword.operator"] = { fg = palette.subtle },
+		["@label"] = { link = "Label" },
+		["@lsp.type.comment"] = {},
+		["@lsp.type.enum"] = { link = "Type" },
+		["@lsp.type.interface"] = { link = "@interface" },
+		["@lsp.type.keyword"] = { link = "Keyword" },
+		["@lsp.type.namespace"] = { link = "@namespace" },
+		["@lsp.type.parameter"] = { link = "@parameter" },
+		["@lsp.type.property"] = { link = "@property" },
+		["@lsp.type.variable"] = {},
+		["@lsp.typemod.function.defaultLibrary"] = { link = "Special" },
+		["@lsp.typemod.operator.injected"] = { link = "Operator" },
+		["@lsp.typemod.string.injected"] = { link = "String" },
+		["@lsp.typemod.variable.defaultLibrary"] = { link = "@variable.builtin" },
+		["@lsp.typemod.variable.injected"] = { link = "@variable" },
+		["@macro"] = { link = "Macro" },
+		["@method"] = { fg = palette.rose },
+		["@namespace"] = { link = "Include" },
+		["@number"] = { link = "Number" },
+		["@operator"] = { link = "Operator" },
+		["@parameter"] = { fg = palette.iris, italic = styles.italic },
+		["@preproc"] = { link = "PreProc" },
+		["@property"] = { fg = palette.foam, italic = styles.italic },
+		["@punctuation"] = { fg = palette.subtle },
+		["@punctuation.bracket"] = { link = "@punctuation" },
+		["@punctuation.delimiter"] = { link = "@punctuation" },
+		["@punctuation.special"] = { link = "@punctuation" },
+		["@regexp"] = { link = "String" },
+		["@repeat"] = { link = "Repeat" },
+		["@storageclass"] = { link = "StorageClass" },
+		["@string"] = { link = "String" },
+		["@string.escape"] = { fg = palette.pine },
+		["@string.special"] = { link = "String" },
+		["@symbol"] = { link = "Identifier" },
+		["@tag"] = { link = "Tag" },
+		["@tag.attribute"] = { fg = palette.iris },
+		["@tag.delimiter"] = { fg = palette.subtle },
+		["@text"] = { fg = palette.text },
+		["@text.danger"] = { fg = groups.error },
+		["@text.diff.add"] = { fg = groups.git_add, bg = groups.git_add, blend = 20 },
+		["@text.diff.delete"] = { fg = groups.git_delete, bg = groups.git_delete, blend = 20 },
+		["@text.emphasis"] = { italic = styles.italic },
+		["@text.environment"] = { link = "Macro" },
+		["@text.environment.name"] = { link = "Type" },
+		["@text.math"] = { link = "Special" },
+		["@text.note"] = { link = "SpecialComment" },
+		["@text.strike"] = { strikethrough = true },
+		["@text.strong"] = { bold = styles.bold },
+		["@text.title"] = { link = "Title" },
+		["@text.title.1.markdown"] = { link = "markdownH1" },
+		["@text.title.1.marker.markdown"] = { link = "markdownH1Delimiter" },
+		["@text.title.2.markdown"] = { link = "markdownH2" },
+		["@text.title.2.marker.markdown"] = { link = "markdownH2Delimiter" },
+		["@text.title.3.markdown"] = { link = "markdownH3" },
+		["@text.title.3.marker.markdown"] = { link = "markdownH3Delimiter" },
+		["@text.title.4.markdown"] = { link = "markdownH4" },
+		["@text.title.4.marker.markdown"] = { link = "markdownH4Delimiter" },
+		["@text.title.5.markdown"] = { link = "markdownH5" },
+		["@text.title.5.marker.markdown"] = { link = "markdownH5Delimiter" },
+		["@text.title.6.markdown"] = { link = "markdownH6" },
+		["@text.title.6.marker.markdown"] = { link = "markdownH6Delimiter" },
+		["@text.underline"] = { underline = true },
+		["@text.uri"] = { fg = groups.link },
+		["@text.warning"] = { fg = groups.warn },
+		["@todo"] = { link = "Todo" },
+		["@type"] = { link = "Type" },
+		["@variable"] = { fg = palette.text, italic = styles.italic },
+		["@variable.builtin"] = { fg = palette.love },
+
+		-- romgrk/barbar.nvim
+		BufferCurrent = { fg = palette.text, bg = palette.overlay },
+		BufferCurrentIndex = { fg = palette.text, bg = palette.overlay },
+		BufferCurrentMod = { fg = palette.foam, bg = palette.overlay },
+		BufferCurrentSign = { fg = palette.subtle, bg = palette.overlay },
+		BufferCurrentTarget = { fg = palette.gold, bg = palette.overlay },
+		BufferInactive = { fg = palette.subtle },
+		BufferInactiveIndex = { fg = palette.subtle },
+		BufferInactiveMod = { fg = palette.foam },
+		BufferInactiveSign = { fg = palette.muted },
+		BufferInactiveTarget = { fg = palette.gold },
+		BufferTabpageFill = { fg = "NONE", bg = "NONE" },
+		BufferVisible = { fg = palette.subtle },
+		BufferVisibleIndex = { fg = palette.subtle },
+		BufferVisibleMod = { fg = palette.foam },
+		BufferVisibleSign = { fg = palette.muted },
+		BufferVisibleTarget = { fg = palette.gold },
+
+		-- lewis6991/gitsigns.nvim
+		GitSignsAdd = { link = "SignAdd" },
+		GitSignsChange = { link = "SignChange" },
+		GitSignsDelete = { link = "SignDelete" },
+		SignAdd = { fg = groups.git_add, bg = "NONE" },
+		SignChange = { fg = groups.git_change, bg = "NONE" },
+		SignDelete = { fg = groups.git_delete, bg = "NONE" },
+
+		-- mvllow/modes.nvim
+		ModesCopy = { bg = palette.gold },
+		ModesDelete = { bg = palette.love },
+		ModesInsert = { bg = palette.foam },
+		ModesVisual = { bg = palette.iris },
+
+		-- kyazdani42/nvim-tree.lua
+		NvimTreeEmptyFolderName = { fg = palette.muted },
+		NvimTreeFileDeleted = { fg = groups.git_delete },
+		NvimTreeFileDirty = { fg = groups.git_dirty },
+		NvimTreeFileMerge = { fg = groups.git_merge },
+		NvimTreeFileNew = { fg = palette.foam },
+		NvimTreeFileRenamed = { fg = groups.git_rename },
+		NvimTreeFileStaged = { fg = groups.git_stage },
+		NvimTreeFolderIcon = { fg = palette.subtle },
+		NvimTreeFolderName = { fg = palette.foam },
+		NvimTreeGitDeleted = { fg = groups.git_delete },
+		NvimTreeGitDirty = { fg = groups.git_dirty },
+		NvimTreeGitIgnored = { fg = groups.git_ignore },
+		NvimTreeGitMerge = { fg = groups.git_merge },
+		NvimTreeGitNew = { fg = groups.git_add },
+		NvimTreeGitRenamed = { fg = groups.git_rename },
+		NvimTreeGitStaged = { fg = groups.git_stage },
+		NvimTreeImageFile = { fg = palette.text },
+		NvimTreeNormal = { link = "Normal" },
+		NvimTreeOpenedFile = { fg = palette.text, bg = palette.overlay },
+		NvimTreeOpenedFolderName = { link = "NvimTreeFolderName" },
+		NvimTreeRootFolder = make_title(),
+		NvimTreeSpecialFile = { link = "NvimTreeNormal" },
+		NvimTreeWindowPicker = { link = "StatusLineTerm" },
+
+		-- nvim-neo-tree/neo-tree.nvim
+		NeoTreeGitAdded = { fg = groups.git_add },
+		NeoTreeGitConflict = { fg = groups.git_merge },
+		NeoTreeGitDeleted = { fg = groups.git_delete },
+		NeoTreeGitIgnored = { fg = groups.git_ignore },
+		NeoTreeGitModified = { fg = groups.git_dirty },
+		NeoTreeGitRenamed = { fg = groups.git_rename },
+		NeoTreeGitUntracked = { fg = groups.git_untracked },
+		NeoTreeTitleBar = { link = "StatusLineTerm" },
+
+		-- folke/which-key.nvim
+		WhichKey = { fg = palette.iris },
+		WhichKeyDesc = { fg = palette.gold },
+		WhichKeyFloat = { bg = groups.panel },
+		WhichKeyGroup = { fg = palette.foam },
+		WhichKeySeparator = { fg = palette.subtle },
+		WhichKeyValue = { fg = palette.rose },
+
+		-- luka-reineke/indent-blankline.nvim
+		IndentBlanklineChar = { fg = palette.muted, nocombine = true },
+		IndentBlanklineSpaceChar = { fg = palette.muted, nocombine = true },
+		IndentBlanklineSpaceCharBlankline = { fg = palette.muted, nocombine = true },
+
+		-- hrsh7th/nvim-cmp
+		CmpItemAbbr = { fg = palette.subtle },
+		CmpItemAbbrDeprecated = { fg = palette.subtle, strikethrough = true },
+		CmpItemAbbrMatch = { fg = palette.text, bold = styles.bold },
+		CmpItemAbbrMatchFuzzy = { fg = palette.text, bold = styles.bold },
+		CmpItemKind = { fg = palette.subtle },
+		CmpItemKindClass = { link = "StorageClass" },
+		CmpItemKindFunction = { link = "Function" },
+		CmpItemKindInterface = { link = "Type" },
+		CmpItemKindMethod = { link = "PreProc" },
+		CmpItemKindSnippet = { link = "String" },
+		CmpItemKindVariable = { link = "Identifier" },
+
+		-- TimUntersberger/neogit
+		NeogitDiffAddHighlight = { link = "DiffAdd" },
+		NeogitDiffContextHighlight = { bg = palette.surface },
+		NeogitDiffDeleteHighlight = { link = "DiffDelete" },
+		NeogitHunkHeader = { bg = groups.panel },
+		NeogitHunkHeaderHighlight = { bg = groups.panel },
+
+		-- vimwiki/vimwiki
+		VimwikiHR = { fg = palette.subtle },
+		VimwikiHeader1 = { link = "markdownH1" },
+		VimwikiHeader2 = { link = "markdownH2" },
+		VimwikiHeader3 = { link = "markdownH3" },
+		VimwikiHeader4 = { link = "markdownH4" },
+		VimwikiHeader5 = { link = "markdownH5" },
+		VimwikiHeader6 = { link = "markdownH6" },
+		VimwikiHeaderChar = { fg = palette.subtle },
+		VimwikiLink = { link = "markdownUrl" },
+		VimwikiList = { fg = palette.iris },
+		VimwikiNoExistsLink = { fg = palette.love },
+
+		-- nvim-neorg/neorg
+		NeorgHeading1Prefix = { link = "markdownH1Delimiter" },
+		NeorgHeading1Title = { link = "markdownH1" },
+		NeorgHeading2Prefix = { link = "markdownH2Delimiter" },
+		NeorgHeading2Title = { link = "markdownH2" },
+		NeorgHeading3Prefix = { link = "markdownH3Delimiter" },
+		NeorgHeading3Title = { link = "markdownH3" },
+		NeorgHeading4Prefix = { link = "markdownH4Delimiter" },
+		NeorgHeading4Title = { link = "markdownH4" },
+		NeorgHeading5Prefix = { link = "markdownH5Delimiter" },
+		NeorgHeading5Title = { link = "markdownH5" },
+		NeorgHeading6Prefix = { link = "markdownH6Delimiter" },
+		NeorgHeading6Title = { link = "markdownH6" },
+		NeorgMarkerTitle = make_title(),
+
+		-- tami5/lspsaga.nvim (fork of glepnir/lspsaga.nvim)
+		DefinitionCount = { fg = palette.rose },
+		DefinitionIcon = { fg = palette.rose },
+		DefintionPreviewTitle = { fg = palette.rose, bold = styles.bold },
+		LspFloatWinBorder = make_border(),
+		LspFloatWinNormal = { bg = groups.panel },
+		LspSagaAutoPreview = { fg = palette.subtle },
+		LspSagaCodeActionBorder = make_border(palette.rose),
+		LspSagaCodeActionContent = { fg = palette.foam },
+		LspSagaCodeActionTitle = { fg = palette.gold, bold = styles.bold },
+		LspSagaCodeActionTruncateLine = { link = "LspSagaCodeActionBorder" },
+		LspSagaDefPreviewBorder = make_border(),
+		LspSagaDiagnosticBorder = make_border(palette.gold),
+		LspSagaDiagnosticHeader = make_title(),
+		LspSagaDiagnosticTruncateLine = { link = "LspSagaDiagnosticBorder" },
+		LspSagaDocTruncateLine = { link = "LspSagaHoverBorder" },
+		LspSagaFinderSelection = { fg = palette.gold },
+		LspSagaHoverBorder = { link = "LspFloatWinBorder" },
+		LspSagaLspFinderBorder = { link = "LspFloatWinBorder" },
+		LspSagaRenameBorder = make_border(palette.pine),
+		LspSagaRenamePromptPrefix = { fg = palette.love },
+		LspSagaShTruncateLine = { link = "LspSagaSignatureHelpBorder" },
+		LspSagaSignatureHelpBorder = make_border(palette.foam),
+		ReferencesCount = { fg = palette.rose },
+		ReferencesIcon = { fg = palette.rose },
+		SagaShadow = { bg = palette.overlay },
+		TargetWord = { fg = palette.iris },
+
+		-- ray-x/lsp_signature.nvim
+		LspSignatureActiveParameter = { bg = palette.overlay },
+
+		-- rlane/pounce.nvim
+		PounceAccept = { fg = palette.love, bg = palette.love, blend = 20 },
+		PounceAcceptBest = { fg = palette.gold, bg = palette.gold, blend = 20 },
+		PounceGap = { link = "Search" },
+		PounceMatch = { link = "Search" },
+
+		-- ggandor/leap.nvim
+		LeapLabelPrimary = { link = "IncSearch" },
+		LeapLabelSecondary = { link = "StatusLineTerm" },
+		LeapMatch = { link = "MatchParen" },
+
+		-- phaazon/hop.nvim
+		-- smoka7/hop.nvim
+		HopNextKey = { fg = palette.love, bg = palette.love, blend = 20 },
+		HopNextKey1 = { fg = palette.foam, bg = palette.foam, blend = 20 },
+		HopNextKey2 = { fg = palette.pine, bg = palette.pine, blend = 20 },
+		HopUnmatched = { fg = palette.muted },
+
+		-- nvim-telescope/telescope.nvim
+		TelescopeBorder = make_border(),
+		TelescopeMatching = { fg = palette.rose },
+		TelescopeNormal = { link = "NormalFloat" },
+		TelescopePromptNormal = { link = "TelescopeNormal" },
+		TelescopePromptPrefix = { fg = palette.subtle },
+		TelescopeSelection = { fg = palette.text, bg = palette.overlay },
+		TelescopeSelectionCaret = { fg = palette.rose, bg = palette.overlay },
+		TelescopeTitle = make_title(),
+
+		-- ibhagwan/fzf-lua
+		FzfLuaNormal = { link = "NormalFloat" },
+		FwzfLuaTitle = make_title(),
+		FzfLuaBorder = make_border(),
+		FzfLuaHeaderText = { fg = palette.love },
+		FzfLuaHeaderBind = { fg = palette.rose },
+		FzfLuaBufFlagCur = { fg = palette.subtle },
+		FzfLuaBufFlagAlt = { fg = palette.subtle },
+
+		-- rcarriga/nvim-notify
+		NotifyDEBUGBorder = make_border(),
+		NotifyDEBUGIcon = { link = "NotifyDEBUGTitle" },
+		NotifyDEBUGTitle = { fg = palette.muted },
+		NotifyERRORBorder = make_border(groups.error),
+		NotifyERRORIcon = { link = "NotifyERRORTitle" },
+		NotifyERRORTitle = { fg = groups.error },
+		NotifyINFOBorder = make_border(groups.info),
+		NotifyINFOIcon = { link = "NotifyINFOTitle" },
+		NotifyINFOTitle = { fg = groups.info },
+		NotifyTRACEBorder = make_border(palette.iris),
+		NotifyTRACEIcon = { link = "NotifyTRACETitle" },
+		NotifyTRACETitle = { fg = palette.iris },
+		NotifyWARNBorder = make_border(groups.warn),
+		NotifyWARNIcon = { link = "NotifyWARNTitle" },
+		NotifyWARNTitle = { fg = groups.warn },
+
+		-- rcarriga/nvim-dap-ui
+		DapUIBreakpointsCurrentLine = { fg = palette.gold, bold = styles.bold },
+		DapUIBreakpointsDisabledLine = { fg = palette.muted },
+		DapUIBreakpointsInfo = { link = "DapUIThread" },
+		DapUIBreakpointsLine = { link = "DapUIBreakpointsPath" },
+		DapUIBreakpointsPath = { fg = palette.foam },
+		DapUIDecoration = { link = "DapUIBreakpointsPath" },
+		DapUIFloatBorder = make_border(),
+		DapUIFrameName = { fg = palette.text },
+		DapUILineNumber = { link = "DapUIBreakpointsPath" },
+		DapUIModifiedValue = { fg = palette.foam, bold = styles.bold },
+		DapUIScope = { link = "DapUIBreakpointsPath" },
+		DapUISource = { fg = palette.iris },
+		DapUIStoppedThread = { link = "DapUIBreakpointsPath" },
+		DapUIThread = { fg = palette.gold },
+		DapUIValue = { fg = palette.text },
+		DapUIVariable = { fg = palette.text },
+		DapUIWatchesEmpty = { fg = palette.love },
+		DapUIWatchesError = { link = "DapUIWatchesEmpty" },
+		DapUIWatchesValue = { link = "DapUIThread" },
+
+		-- glepnir/dashboard-nvim
+		DashboardCenter = { fg = palette.gold },
+		DashboardFooter = { fg = palette.iris },
+		DashboardHeader = { fg = palette.pine },
+		DashboardShortcut = { fg = palette.love },
+
+		-- SmiteshP/nvim-navic
+		NavicIconsArray = { fg = palette.gold },
+		NavicIconsBoolean = { fg = palette.rose },
+		NavicIconsClass = { fg = palette.foam },
+		NavicIconsConstant = { fg = palette.gold },
+		NavicIconsConstructor = { fg = palette.gold },
+		NavicIconsEnum = { fg = palette.gold },
+		NavicIconsEnumMember = { fg = palette.foam },
+		NavicIconsEvent = { fg = palette.gold },
+		NavicIconsField = { fg = palette.foam },
+		NavicIconsFile = { fg = palette.muted },
+		NavicIconsFunction = { fg = palette.pine },
+		NavicIconsInterface = { fg = palette.foam },
+		NavicIconsKey = { fg = palette.iris },
+		NavicIconsKeyword = { fg = palette.pine },
+		NavicIconsMethod = { fg = palette.iris },
+		NavicIconsModule = { fg = palette.rose },
+		NavicIconsNamespace = { fg = palette.muted },
+		NavicIconsNull = { fg = palette.love },
+		NavicIconsNumber = { fg = palette.gold },
+		NavicIconsObject = { fg = palette.gold },
+		NavicIconsOperator = { fg = palette.subtle },
+		NavicIconsPackage = { fg = palette.muted },
+		NavicIconsProperty = { fg = palette.foam },
+		NavicIconsString = { fg = palette.gold },
+		NavicIconsStruct = { fg = palette.foam },
+		NavicIconsTypeParameter = { fg = palette.foam },
+		NavicIconsVariable = { fg = palette.text },
+		NavicSeparator = { fg = palette.subtle },
+		NavicText = { fg = palette.subtle },
+
+		-- folke/noice.nvim
+		NoiceCursor = { fg = palette.highlight_high, bg = palette.text },
+
+		-- echasnovski/mini.indentscope
+		MiniIndentscopeSymbol = { fg = palette.muted },
+		MiniIndentscopeSymbolOff = { fg = palette.muted },
+
+		-- goolord/alpha-nvim
+		AlphaButtons = { fg = palette.foam },
+		AlphaFooter = { fg = palette.gold },
+		AlphaHeader = { fg = palette.pine },
+		AlphaShortcut = { fg = palette.rose },
+
+		-- github/copilot.vim
+		CopilotSuggestion = { fg = palette.muted, italic = styles.italic },
+	}
+
+	local transparency_highlights = {
+		DiagnosticVirtualTextError = { fg = groups.error },
+		DiagnosticVirtualTextHint = { fg = groups.hint },
+		DiagnosticVirtualTextInfo = { fg = groups.info },
+		DiagnosticVirtualTextWarn = { fg = groups.warn },
+
+		FloatBorder = { fg = palette.muted, bg = "NONE" },
+		Folded = { fg = palette.text, bg = "NONE" },
+		NormalFloat = { bg = "NONE" },
+		NormalNC = { fg = palette.text, bg = config.options.dim_inactive_windows and palette._nc or "NONE" },
+		Pmenu = { fg = palette.subtle, bg = "NONE" },
+		PmenuKind = { fg = palette.foam, bg = "NONE" },
+		SignColumn = { fg = palette.text, bg = "NONE" },
+		StatusLine = { fg = palette.subtle, bg = "NONE" },
+		StatusLineNC = { fg = palette.muted, bg = "NONE" },
+		TabLineFill = { bg = "NONE" },
+		TabLineSel = { fg = palette.text, bg = "NONE", bold = styles.bold },
+
+		TelescopeNormal = { fg = palette.subtle, bg = "NONE" },
+		TelescopePromptNormal = { fg = palette.text, bg = "NONE" },
+		TelescopeSelection = { fg = palette.text, bg = "NONE", bold = styles.bold },
+		TelescopeSelectionCaret = { fg = palette.rose, bg = palette.rose },
+
+		WhichKeyFloat = { bg = "NONE" },
+	}
+
+	if styles.transparency then
+		for group, highlight in pairs(transparency_highlights) do
+			highlights[group] = highlight
+		end
+	end
+
+	for group, options in pairs(config.options.highlight_groups) do
+		highlights[group] = vim.tbl_extend("force", highlights[group] or {}, options)
+	end
+
+	for group, highlight in pairs(highlights) do
+		config.options.before_highlight(group, highlight, palette)
+		utilities.highlight(group, highlight)
+	end
+
+	if config.options.enable.terminal then
+		vim.g.terminal_color_0 = palette.overlay -- black
+		vim.g.terminal_color_8 = palette.subtle -- bright black
+		vim.g.terminal_color_1 = palette.love -- red
+		vim.g.terminal_color_9 = palette.love -- bright red
+		vim.g.terminal_color_2 = palette.pine -- green
+		vim.g.terminal_color_10 = palette.pine -- bright green
+		vim.g.terminal_color_3 = palette.gold -- yellow
+		vim.g.terminal_color_11 = palette.gold -- bright yellow
+		vim.g.terminal_color_4 = palette.foam -- blue
+		vim.g.terminal_color_12 = palette.foam -- bright blue
+		vim.g.terminal_color_5 = palette.iris -- magenta
+		vim.g.terminal_color_13 = palette.iris -- bright magenta
+		vim.g.terminal_color_6 = palette.rose -- cyan
+		vim.g.terminal_color_14 = palette.rose -- bright cyan
+		vim.g.terminal_color_7 = palette.text -- white
+		vim.g.terminal_color_15 = palette.text -- bright white
+
+		-- Support StatusLineTerm & StatusLineTermNC from vim
+		vim.cmd([[
+		autocmd TermOpen * if &buftype=='terminal'
+			\|setlocal winhighlight=StatusLine:StatusLineTerm,StatusLineNC:StatusLineTermNC
+			\|else|setlocal winhighlight=|endif
+		]])
+	end
+end
+
+---@param variant Variant | nil
 function M.colorscheme(variant)
-	config.extend({ variant = variant })
+	config.extend_options({ variant = variant })
 
 	vim.opt.termguicolors = true
 	if vim.g.colors_name then
-		vim.cmd('hi clear')
-		vim.cmd('syntax reset')
+		vim.cmd("hi clear")
+		vim.cmd("syntax reset")
 	end
-	vim.g.colors_name = 'rose-pine'
+	vim.g.colors_name = "rose-pine"
 
-	require('rose-pine.theme')._load(config.options)
+	set_highlights()
 end
 
+---@param options Options
 function M.setup(options)
-	config.extend(options)
+	config.extend_options(options or {})
 end
 
 return M
diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index 58674d7..6fc0774 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -1,68 +1,156 @@
 ---@alias Variant "main" | "moon" | "dawn"
----@alias Color { fg: string, bg: string, sp: string, bold: boolean, italic: boolean, undercurl: boolean, underline: boolean, underdouble: boolean, underdotted: boolean, underdashed: boolean, strikethrough: boolean }
+---@alias Palette { base: string, surface: string, overlay: string, muted: string, subtle: string, text: string, love: string, gold: string, rose: string, pine: string, foam: string, iris: string }
+---@alias PaletteColor "base" | "surface" | "overlay" | "muted" | "subtle" | "text" | "love" | "gold" | "rose" | "pine" | "foam" | "iris" | "highlight_low" | "highlight_med" | "highlight_high"
+---@alias Highlight { fg: string, bg: string, sp: string, bold: boolean, italic: boolean, undercurl: boolean, underline: boolean, underdouble: boolean, underdotted: boolean, underdashed: boolean, strikethrough: boolean }
 
-local M = {}
+local config = {}
 
 ---@class Options
-M.options = {
+config.options = {
 	---Set the desired variant: "auto" will follow the vim background,
-	---defaulting to "main" for dark and "dawn" for light. To change the dark
-	---variant, use `options.dark_variant = "moon"`.
+	---defaulting to `dark_variant` or "main" for dark and "dawn" for light.
 	---@type "auto" | Variant
-	variant = 'auto',
+	variant = "auto",
 
-	---Set the desired dark variant: applies when `options.variant` is set to
-	---"auto" to match `vim.o.background`.
+	---Set the desired dark variant when `options.variant` is set to "auto".
 	---@type Variant
-	dark_variant = 'main',
+	dark_variant = "main",
 
-	bold_vert_split = false,
+	---Differentiate between active and inactive windows and panels.
+	dim_inactive_windows = false,
 
-	dim_nc_background = false,
+	---Extend background behind borders. Appearance differs based on which
+	---border characters you are using.
+	extend_background_behind_borders = false,
 
-	disable_background = false,
-	disable_float_background = false,
-	disable_italics = false,
-
-	groups = {
-		background = 'base',
-		background_nc = 'nc',
-		panel = 'surface',
-		panel_nc = 'base',
-		border = 'highlight_med',
-		comment = 'muted',
-		link = 'iris',
-		punctuation = 'muted',
-		error = 'love',
-		hint = 'iris',
-		info = 'foam',
-		warn = 'gold',
-		git_add = 'foam',
-		git_change = 'rose',
-		git_delete = 'love',
-		git_dirty = 'rose',
-		git_ignore = 'muted',
-		git_merge = 'iris',
-		git_rename = 'pine',
-		git_stage = 'iris',
-		git_text = 'rose',
-		headings = {
-			h1 = 'iris',
-			h2 = 'foam',
-			h3 = 'rose',
-			h4 = 'gold',
-			h5 = 'pine',
-			h6 = 'foam',
-		},
+	enable = {
+		terminal = true,
+		migrations = true,
 	},
 
-	---@type table<string, Color>
+	styles = {
+		bold = true,
+		italic = true,
+		transparency = false,
+	},
+
+	---@type table<string, string | PaletteColor>
+	groups = {
+		border = "muted",
+		link = "iris",
+		panel = "surface",
+
+		error = "love",
+		hint = "iris",
+		info = "foam",
+		warn = "gold",
+
+		git_add = "foam",
+		git_change = "rose",
+		git_delete = "love",
+		git_dirty = "rose",
+		git_ignore = "muted",
+		git_merge = "iris",
+		git_rename = "pine",
+		git_stage = "iris",
+		git_text = "rose",
+		git_untracked = "subtle",
+
+		---@type string | PaletteColor | table<string, string | PaletteColor>
+		headings = {
+			h1 = "iris",
+			h2 = "foam",
+			h3 = "rose",
+			h4 = "gold",
+			h5 = "pine",
+			h6 = "foam",
+		},
+
+		---@deprecated Replaced by `options.highlight_groups["Normal"]`
+		-- background = "base",
+		---@deprecated Replaced by `options.highlight_groups["Comment"]`
+		-- comment = "subtle",
+		---@deprecated Replaced by `options.highlight_groups["@punctuation"]`
+		-- punctuation = "muted",
+	},
+
+	---@type table<string, Highlight>
 	highlight_groups = {},
+
+	---Called before each highlight group, before setting the highlight.
+	---@param group string
+	---@param highlight Highlight
+	---@param palette Palette
+	---@diagnostic disable-next-line: unused-local
+	before_highlight = function(group, highlight, palette) end,
+
+	---@deprecated Replaced by `options.dim_inactive_windows`
+	-- dim_nc_background = false,
+	---@deprecated Replaced by `options.enable.transparency`
+	-- disable_background = false,
+	---@deprecated Replaced by `options.highlight_groups["NormalFloat"]`
+	-- disable_float_background = false,
+	---@deprecated Replaced by `options.styles.italic`
+	-- disable_italics = false,
+	---@deprecated Replaced by `options.highlight_groups`
+	-- bold_vert_split = false
 }
 
----@param options Options|nil
-function M.extend(options)
-	M.options = vim.tbl_deep_extend('force', M.options, options or {})
+local function migrate(options)
+	if options.bold_vert_split then
+		options.highlight_groups["VertSplit"] = { fg = "muted", bg = "muted" }
+	end
+
+	if options.disable_float_background then
+		options.highlight_groups["NormalFloat"] = { bg = "NONE" }
+	end
+
+	options.dim_inactive_windows = options.dim_nc_background or options.dim_inactive_windows
+
+	if options.groups.background ~= nil then
+		options.highlight_groups["Normal"] = { bg = options.groups.background }
+	end
+
+	if options.groups.comment ~= nil then
+		options.highlight_groups["Comment"] = { fg = options.groups.comment }
+	end
+
+	if options.groups.punctuation ~= nil then
+		options.highlight_groups["@punctuation"] = { fg = options.groups.punctuation }
+	end
+
+	options.styles.transparency = options.disable_background or options.styles.transparency
+
+	-- These never actually existed, but may be set intuitively by the user
+	-- because of `disable_italics` existing.
+	options.styles.bold = (options.disable_bold or options.disable_bolds) and false or options.styles.bold
+
+	-- Similar to bold options, `disable_italic` never existed but could be a
+	-- common typo of the actual `disable_italics`.
+	options.styles.italic = (options.disable_italic or options.disable_italics) and false or options.styles.italic
+
+	-- Set h1 through h6 to the same color if only one is specified
+	if type(options.groups.headings) == "string" then
+		options.groups.headings = {
+			h1 = options.groups.headings,
+			h2 = options.groups.headings,
+			h3 = options.groups.headings,
+			h4 = options.groups.headings,
+			h5 = options.groups.headings,
+			h6 = options.groups.headings,
+		}
+	end
+
+	return options
 end
 
-return M
+---@param options Options | nil
+function config.extend_options(options)
+	config.options = vim.tbl_deep_extend("force", config.options, options or {})
+
+	if config.options.enable.migrations then
+		config.options = migrate(config.options)
+	end
+end
+
+return config
diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index 66d6438..6b49f68 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -1,68 +1,58 @@
-local options = require('rose-pine.config').options
-
+local options = require("rose-pine.config").options
 local variants = {
 	main = {
-		---@deprecated for backwards compatibility
-		_experimental_nc = '#16141f',
-		nc = '#16141f',
-		base = '#191724',
-		surface = '#1f1d2e',
-		overlay = '#26233a',
-		muted = '#6e6a86',
-		subtle = '#908caa',
-		text = '#e0def4',
-		love = '#eb6f92',
-		gold = '#f6c177',
-		rose = '#ebbcba',
-		pine = '#31748f',
-		foam = '#9ccfd8',
-		iris = '#c4a7e7',
-		highlight_low = '#21202e',
-		highlight_med = '#403d52',
-		highlight_high = '#524f67',
-		none = 'NONE',
+		_nc = "#16141f",
+		base = "#191724",
+		surface = "#1f1d2e",
+		overlay = "#26233a",
+		muted = "#6e6a86",
+		subtle = "#908caa",
+		text = "#e0def4",
+		love = "#eb6f92",
+		gold = "#f6c177",
+		rose = "#ebbcba",
+		pine = "#3e8fb0",
+		foam = "#9ccfd8",
+		iris = "#c4a7e7",
+		highlight_low = "#21202e",
+		highlight_med = "#403d52",
+		highlight_high = "#524f67",
 	},
 	moon = {
-		---@deprecated for backwards compatibility
-		_experimental_nc = '#1f1d30',
-		nc = '#1f1d30',
-		base = '#232136',
-		surface = '#2a273f',
-		overlay = '#393552',
-		muted = '#6e6a86',
-		subtle = '#908caa',
-		text = '#e0def4',
-		love = '#eb6f92',
-		gold = '#f6c177',
-		rose = '#ea9a97',
-		pine = '#3e8fb0',
-		foam = '#9ccfd8',
-		iris = '#c4a7e7',
-		highlight_low = '#2a283e',
-		highlight_med = '#44415a',
-		highlight_high = '#56526e',
-		none = 'NONE',
+		_nc = "#1f1d30",
+		base = "#232136",
+		surface = "#2a273f",
+		overlay = "#393552",
+		muted = "#6e6a86",
+		subtle = "#908caa",
+		text = "#e0def4",
+		love = "#eb6f92",
+		gold = "#f6c177",
+		rose = "#ea9a97",
+		pine = "#3e8fb0",
+		foam = "#9ccfd8",
+		iris = "#c4a7e7",
+		highlight_low = "#2a283e",
+		highlight_med = "#44415a",
+		highlight_high = "#56526e",
 	},
 	dawn = {
-		---@deprecated for backwards compatibility
-		_experimental_nc = '#f8f0e7',
-		nc = '#f8f0e7',
-		base = '#faf4ed',
-		surface = '#fffaf3',
-		overlay = '#f2e9e1',
-		muted = '#9893a5',
-		subtle = '#797593',
-		text = '#575279',
-		love = '#b4637a',
-		gold = '#ea9d34',
-		rose = '#d7827e',
-		pine = '#286983',
-		foam = '#56949f',
-		iris = '#907aa9',
-		highlight_low = '#f4ede8',
-		highlight_med = '#dfdad9',
-		highlight_high = '#cecacd',
-		none = 'NONE',
+		_nc = "#f8f0e7",
+		base = "#faf4ed",
+		surface = "#fffaf3",
+		overlay = "#f2e9e1",
+		muted = "#9893a5",
+		subtle = "#797593",
+		text = "#464261",
+		love = "#b4637a",
+		gold = "#ea9d34",
+		rose = "#d7827e",
+		pine = "#286983",
+		foam = "#56949f",
+		iris = "#907aa9",
+		highlight_low = "#f4ede8",
+		highlight_med = "#dfdad9",
+		highlight_high = "#cecacd",
 	},
 }
 
@@ -70,5 +60,4 @@ if variants[options.variant] ~= nil then
 	return variants[options.variant]
 end
 
-return vim.o.background == 'light' and variants.dawn
-	or variants[options.dark_variant or 'main']
+return vim.o.background == "light" and variants.dawn or variants[options.dark_variant or "main"]
diff --git a/lua/rose-pine/plugins/bufferline.lua b/lua/rose-pine/plugins/bufferline.lua
index 1a5eaac..9f85ccd 100644
--- a/lua/rose-pine/plugins/bufferline.lua
+++ b/lua/rose-pine/plugins/bufferline.lua
@@ -5,7 +5,7 @@
 --- local highlights = require('rose-pine.plugins.bufferline')
 --- require('bufferline').setup({ highlights = highlights })
 
-local p = require('rose-pine.palette')
+local p = require("rose-pine.palette")
 
 return {
 	-- fill = {
diff --git a/lua/rose-pine/plugins/galaxyline.lua b/lua/rose-pine/plugins/galaxyline.lua
index 348559a..f2c01ab 100644
--- a/lua/rose-pine/plugins/galaxyline.lua
+++ b/lua/rose-pine/plugins/galaxyline.lua
@@ -4,7 +4,7 @@
 --- @usage
 --- local highlights = require('rose-pine.plugins.galaxyline')
 
-local p = require('rose-pine.palette')
+local p = require("rose-pine.palette")
 
 return {
 	bg = p.surface,
diff --git a/lua/rose-pine/plugins/markid.lua b/lua/rose-pine/plugins/markid.lua
index 9279adb..2a7b273 100644
--- a/lua/rose-pine/plugins/markid.lua
+++ b/lua/rose-pine/plugins/markid.lua
@@ -5,6 +5,6 @@
 --- local highlights = require('rose-pine.plugins.markid')
 --- require("nvim-treesitter.configs").setup({ markid = { enable = true, colors = highlights } })
 
-local p = require('rose-pine.palette')
+local p = require("rose-pine.palette")
 
 return { p.foam, p.rose, p.iris }
diff --git a/lua/rose-pine/plugins/toggleterm.lua b/lua/rose-pine/plugins/toggleterm.lua
index 38924f9..87b0abc 100644
--- a/lua/rose-pine/plugins/toggleterm.lua
+++ b/lua/rose-pine/plugins/toggleterm.lua
@@ -6,10 +6,10 @@
 --- require('toggleterm').setup({ highlights = highlights })
 
 return {
-	Normal = { link = 'Normal' },
-	NormalFloat = { link = 'Normal' },
-	FloatBorder = { link = 'FloatBorder' },
-	SignColumn = { link = 'SignColumn' },
-	StatusLine = { link = 'StatusLine' },
-	StatusLineNC = { link = 'StatusLineNC' },
+	Normal = { link = "Normal" },
+	NormalFloat = { link = "Normal" },
+	FloatBorder = { link = "FloatBorder" },
+	SignColumn = { link = "SignColumn" },
+	StatusLine = { link = "StatusLine" },
+	StatusLineNC = { link = "StatusLineNC" },
 }
diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
deleted file mode 100644
index d5e4faf..0000000
--- a/lua/rose-pine/theme.lua
+++ /dev/null
@@ -1,629 +0,0 @@
-local M = {}
-
----@param options Options
-function M._load(options)
-	local h = require('rose-pine.util').highlight
-	local p = require('rose-pine.palette')
-
-	local groups = options.groups or {}
-	local maybe = {
-		base = (options.disable_background and p.none) or groups.background,
-		surface = (options.disable_float_background and p.none) or groups.panel,
-		italic = not options.disable_italics,
-	}
-	maybe.bold_vert_split = (options.bold_vert_split and groups.border)
-		or p.none
-	maybe.dim_nc_background = (
-		options.dim_nc_background and groups.background_nc
-	) or maybe.base
-
-	local float_background = options.dim_nc_background
-			and (options.disable_float_background and groups.panel_nc or groups.panel)
-		or maybe.surface
-
-	M.defaults = {
-		['ColorColumn'] = { bg = p.overlay },
-		['Conceal'] = { bg = p.none },
-		['CurSearch'] = { link = 'IncSearch' },
-		['Cursor'] = { fg = p.text, bg = p.highlight_high },
-		['CursorColumn'] = { bg = p.highlight_low },
-		-- CursorIM = {},
-		['CursorLine'] = { bg = p.highlight_low },
-		['CursorLineNr'] = { fg = p.text },
-		['DarkenedPanel'] = { bg = maybe.surface },
-		['DarkenedStatusline'] = { bg = maybe.surface },
-		['DiffAdd'] = { bg = groups.git_add, blend = 20 },
-
-		['DiffChange'] = { bg = p.overlay },
-		['DiffDelete'] = { bg = groups.git_delete, blend = 20 },
-		['DiffText'] = { bg = groups.git_text, blend = 20 },
-		['diffAdded'] = { link = 'DiffAdd' },
-		['diffChanged'] = { link = 'DiffChange' },
-		['diffRemoved'] = { link = 'DiffDelete' },
-		['Directory'] = { fg = p.foam, bg = p.none },
-		-- EndOfBuffer = {},
-		['ErrorMsg'] = { fg = p.love, bold = true },
-		['FloatBorder'] = { fg = groups.border, bg = maybe.surface },
-		['FloatTitle'] = { fg = p.muted },
-		['FoldColumn'] = { fg = p.muted },
-		['Folded'] = { fg = p.text, bg = maybe.surface },
-		['IncSearch'] = { fg = groups.background, bg = p.rose },
-		['LineNr'] = { fg = p.muted },
-		['MatchParen'] = { fg = p.text, bg = p.highlight_med },
-		['ModeMsg'] = { fg = p.subtle },
-		['MoreMsg'] = { fg = p.iris },
-		['NonText'] = { fg = p.muted },
-		['Normal'] = { fg = p.text, bg = maybe.base },
-		['NormalFloat'] = { fg = p.text, bg = maybe.surface },
-		['NormalNC'] = { fg = p.text, bg = maybe.dim_nc_background },
-		['NvimInternalError'] = { fg = '#ffffff', bg = p.love },
-		['Pmenu'] = { fg = p.subtle, bg = maybe.surface },
-		['PmenuSbar'] = { bg = p.highlight_low },
-		['PmenuSel'] = { fg = p.text, bg = p.overlay },
-		['PmenuThumb'] = { bg = p.highlight_med },
-		['Question'] = { fg = p.gold },
-		-- QuickFixLine = {},
-		-- RedrawDebugNormal = {}
-		['RedrawDebugClear'] = { fg = '#ffffff', bg = p.gold },
-		['RedrawDebugComposed'] = { fg = '#ffffff', bg = p.pine },
-		['RedrawDebugRecompose'] = { fg = '#ffffff', bg = p.love },
-		['Search'] = { bg = p.highlight_med },
-		['SpecialKey'] = { fg = p.foam },
-		['SpellBad'] = { sp = p.subtle, undercurl = true },
-		['SpellCap'] = { sp = p.subtle, undercurl = true },
-		['SpellLocal'] = { sp = p.subtle, undercurl = true },
-		['SpellRare'] = { sp = p.subtle, undercurl = true },
-		['SignColumn'] = {
-			fg = p.text,
-			bg = (options.dim_nc_background and p.none) or maybe.base,
-		},
-		['Substitute'] = { fg = p.base, bg = p.love },
-		['StatusLine'] = { fg = p.subtle, bg = groups.panel },
-		['StatusLineNC'] = { fg = p.muted, bg = groups.panel_nc },
-		['StatusLineTerm'] = { link = 'StatusLine' },
-		['StatusLineTermNC'] = { link = 'StatusLineNC' },
-		['TabLine'] = { fg = p.subtle, bg = groups.panel },
-		['TabLineFill'] = { bg = groups.panel },
-		['TabLineSel'] = { fg = p.text, bg = p.overlay },
-		['Title'] = { fg = p.text },
-		['VertSplit'] = { fg = groups.border, bg = maybe.bold_vert_split },
-		['Visual'] = { bg = p.highlight_med },
-		-- VisualNOS = {},
-		['WarningMsg'] = { fg = p.gold },
-		-- Whitespace = {},
-		['WildMenu'] = { link = 'IncSearch' },
-
-		['Boolean'] = { fg = p.rose },
-		['Character'] = { fg = p.gold },
-		['Comment'] = { fg = groups.comment, italic = maybe.italic },
-		['Conditional'] = { fg = p.pine },
-		['Constant'] = { fg = p.gold },
-		['Debug'] = { fg = p.rose },
-		['Define'] = { fg = p.iris },
-		['Delimiter'] = { fg = p.subtle },
-		['Error'] = { fg = p.love },
-		['Exception'] = { fg = p.pine },
-		['Float'] = { fg = p.gold },
-		['Function'] = { fg = p.rose },
-		['Identifier'] = { fg = p.rose },
-		-- Ignore = {},
-		['Include'] = { fg = p.pine },
-		['Keyword'] = { fg = p.pine },
-		['Label'] = { fg = p.foam },
-		['Macro'] = { fg = p.iris },
-		['Number'] = { fg = p.gold },
-		['Operator'] = { fg = p.subtle },
-		['PreCondit'] = { fg = p.iris },
-		['PreProc'] = { fg = p.iris },
-		['Repeat'] = { fg = p.pine },
-		['Special'] = { fg = p.rose },
-		['SpecialChar'] = { fg = p.rose },
-		['SpecialComment'] = { fg = p.iris },
-		['Statement'] = { fg = p.pine },
-		['StorageClass'] = { fg = p.foam },
-		['String'] = { fg = p.gold },
-		['Structure'] = { fg = p.foam },
-		['Tag'] = { fg = p.foam },
-		['Todo'] = { fg = p.iris },
-		['Type'] = { fg = p.foam },
-		['Typedef'] = { link = 'Type' },
-		['Underlined'] = { underline = true },
-
-		['htmlArg'] = { fg = p.iris },
-		['htmlBold'] = { bold = true },
-		['htmlEndTag'] = { fg = p.subtle },
-		['htmlH1'] = { fg = groups.headings.h1, bold = true },
-		['htmlH2'] = { fg = groups.headings.h2, bold = true },
-		['htmlH3'] = { fg = groups.headings.h3, bold = true },
-		['htmlH4'] = { fg = groups.headings.h4, bold = true },
-		['htmlH5'] = { fg = groups.headings.h5, bold = true },
-		['htmlItalic'] = { italic = maybe.italic },
-		['htmlLink'] = { fg = groups.link },
-		['htmlTag'] = { fg = p.subtle },
-		['htmlTagN'] = { fg = p.text },
-		['htmlTagName'] = { fg = p.foam },
-
-		['markdownDelimiter'] = { fg = p.subtle },
-		['markdownH1'] = { fg = groups.headings.h1, bold = true },
-		['markdownH1Delimiter'] = { link = 'markdownH1' },
-		['markdownH2'] = { fg = groups.headings.h2, bold = true },
-		['markdownH2Delimiter'] = { link = 'markdownH2' },
-		['markdownH3'] = { fg = groups.headings.h3, bold = true },
-		['markdownH3Delimiter'] = { link = 'markdownH3' },
-		['markdownH4'] = { fg = groups.headings.h4, bold = true },
-		['markdownH4Delimiter'] = { link = 'markdownH4' },
-		['markdownH5'] = { fg = groups.headings.h5, bold = true },
-		['markdownH5Delimiter'] = { link = 'markdownH5' },
-		['markdownH6'] = { fg = groups.headings.h6, bold = true },
-		['markdownH6Delimiter'] = { link = 'markdownH6' },
-		['markdownLinkText'] = { fg = groups.link, sp = groups.link, underline = true },
-		['markdownUrl'] = { link = 'markdownLinkText' },
-
-		['mkdCode'] = { fg = p.foam, italic = maybe.italic },
-		['mkdCodeDelimiter'] = { fg = p.rose },
-		['mkdCodeEnd'] = { fg = p.foam },
-		['mkdCodeStart'] = { fg = p.foam },
-		['mkdFootnotes'] = { fg = p.foam },
-		['mkdID'] = { fg = p.foam, underline = true },
-		['mkdInlineURL'] = { fg = groups.link, underline = true },
-		['mkdLink'] = { link = 'mkdInlineURL' },
-		['mkdLinkDef'] = { link = 'mkdInlineURL' },
-		['mkdListItemLine'] = { fg = p.text },
-		['mkdRule'] = { fg = p.subtle },
-		['mkdURL'] = { link = 'mkdInlineURL' },
-
-		['DiagnosticError'] = { fg = groups.error },
-		['DiagnosticHint'] = { fg = groups.hint },
-		['DiagnosticInfo'] = { fg = groups.info },
-		['DiagnosticWarn'] = { fg = groups.warn },
-		['DiagnosticDefaultError'] = { fg = groups.error },
-		['DiagnosticDefaultHint'] = { fg = groups.hint },
-		['DiagnosticDefaultInfo'] = { fg = groups.info },
-		['DiagnosticDefaultWarn'] = { fg = groups.warn },
-		['DiagnosticFloatingError'] = { fg = groups.error },
-		['DiagnosticFloatingHint'] = { fg = groups.hint },
-		['DiagnosticFloatingInfo'] = { fg = groups.info },
-		['DiagnosticFloatingWarn'] = { fg = groups.warn },
-		['DiagnosticSignError'] = { fg = groups.error },
-		['DiagnosticSignHint'] = { fg = groups.hint },
-		['DiagnosticSignInfo'] = { fg = groups.info },
-		['DiagnosticSignWarn'] = { fg = groups.warn },
-		['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, undercurl = true },
-		['DiagnosticUnderlineHint'] = { sp = groups.hint, undercurl = true },
-		['DiagnosticUnderlineInfo'] = { sp = groups.info, undercurl = true },
-		['DiagnosticUnderlineWarn'] = { sp = groups.warn, undercurl = true },
-		['DiagnosticVirtualTextError'] = { fg = groups.error },
-		['DiagnosticVirtualTextHint'] = { fg = groups.hint },
-		['DiagnosticVirtualTextInfo'] = { fg = groups.info },
-		['DiagnosticVirtualTextWarn'] = { fg = groups.warn },
-
-		-- healthcheck
-		['healthError'] = { fg = groups.error },
-		['healthSuccess'] = { fg = groups.info },
-		['healthWarning'] = { fg = groups.warn },
-
-		-- Treesitter
-		['@boolean'] = { link = 'Boolean' },
-		['@character'] = { link = 'Character' },
-		['@character.special'] = { link = '@character' },
-		['@class'] = { fg = p.foam },
-		['@comment'] = { link = 'Comment' },
-		['@conditional'] = { link = 'Conditional' },
-		['@constant'] = { link = 'Constant' },
-		['@constant.builtin'] = { fg = p.love },
-		['@constant.macro'] = { link = '@constant' },
-		['@constructor'] = { fg = p.foam },
-		['@field'] = { fg = p.foam },
-		['@function'] = { link = 'Function' },
-		['@function.builtin'] = { fg = p.love },
-		['@function.macro'] = { link = '@function' },
-		['@include'] = { link = 'Include' },
-		['@interface'] = { fg = p.foam },
-		['@keyword'] = { link = 'Keyword' },
-		['@keyword.operator'] = { fg = p.subtle },
-		['@label'] = { link = 'Label' },
-		['@macro'] = { link = 'Macro' },
-		['@method'] = { fg = p.rose },
-		['@number'] = { link = 'Number' },
-		['@operator'] = { link = 'Operator' },
-		['@parameter'] = { fg = p.iris, italic = maybe.italic },
-		['@preproc'] = { link = 'PreProc' },
-		['@property'] = { fg = p.foam, italic = maybe.italic },
-		['@punctuation'] = { fg = groups.punctuation },
-		['@punctuation.bracket'] = { link = '@punctuation' },
-		['@punctuation.delimiter'] = { link = '@punctuation' },
-		['@punctuation.special'] = { link = '@punctuation' },
-		['@regexp'] = { link = 'String' },
-		['@repeat'] = { link = 'Repeat' },
-		['@storageclass'] = { link = 'StorageClass' },
-		['@string'] = { link = 'String' },
-		['@string.escape'] = { fg = p.pine },
-		['@string.special'] = { link = '@string' },
-		['@symbol'] = { link = 'Identifier' },
-		['@tag'] = { link = 'Tag' },
-		['@tag.attribute'] = { fg = p.iris },
-		['@tag.delimiter'] = { fg = p.subtle },
-		['@text'] = { fg = p.text },
-		['@text.strong'] = { bold = true },
-		['@text.emphasis'] = { italic = true },
-		['@text.underline'] = { underline = true },
-		['@text.strike'] = { strikethrough = true },
-		['@text.math'] = { link = 'Special' },
-		['@text.environment'] = { link = 'Macro' },
-		['@text.environment.name'] = { link = 'Type' },
-		['@text.title'] = { link = 'Title' },
-		['@text.uri'] = { fg = groups.link },
-		['@text.note'] = { link = 'SpecialComment' },
-		['@text.warning'] = { fg = groups.warn },
-		['@text.danger'] = { fg = groups.error },
-		['@todo'] = { link = 'Todo' },
-		['@type'] = { link = 'Type' },
-		['@variable'] = { fg = p.text, italic = maybe.italic },
-		['@variable.builtin'] = { fg = p.love },
-		['@namespace'] = { link = '@include' },
-
-		-- LSP Semantic Token Groups
-		['@lsp.type.comment'] = {},
-		['@lsp.type.enum'] = { link = '@type' },
-		['@lsp.type.keyword'] = { link = '@keyword' },
-		['@lsp.type.interface'] = { link = '@interface' },
-		['@lsp.type.namespace'] = { link = '@namespace' },
-		['@lsp.type.parameter'] = { link = '@parameter' },
-		['@lsp.type.property'] = { link = '@property' },
-		['@lsp.type.variable'] = {}, -- use treesitter styles for regular variables
-		['@lsp.typemod.function.defaultLibrary'] = { link = 'Special' },
-		['@lsp.typemod.variable.defaultLibrary'] = { link = '@variable.builtin' },
-
-		-- LSP Injected Groups
-		['@lsp.typemod.operator.injected'] = { link = '@operator' },
-		['@lsp.typemod.string.injected'] = { link = '@string' },
-		['@lsp.typemod.variable.injected'] = { link = '@variable' },
-
-		-- nvim-treesitter Markdown Headings
-		['@text.title.1.markdown'] = { link = 'markdownH1' },
-		['@text.title.1.marker.markdown'] = { link = 'markdownH1Delimiter' },
-		['@text.title.2.markdown'] = { link = 'markdownH2' },
-		['@text.title.2.marker.markdown'] = { link = 'markdownH2Delimiter' },
-		['@text.title.3.markdown'] = { link = 'markdownH3' },
-		['@text.title.3.marker.markdown'] = { link = 'markdownH3Delimiter' },
-		['@text.title.4.markdown'] = { link = 'markdownH4' },
-		['@text.title.4.marker.markdown'] = { link = 'markdownH4Delimiter' },
-		['@text.title.5.markdown'] = { link = 'markdownH5' },
-		['@text.title.5.marker.markdown'] = { link = 'markdownH5Delimiter' },
-		['@text.title.6.markdown'] = { link = 'markdownH6' },
-		['@text.title.6.marker.markdown'] = { link = 'markdownH6Delimiter' },
-
-		-- vim.lsp.buf.document_highlight()
-		['LspReferenceText'] = { bg = p.highlight_med },
-		['LspReferenceRead'] = { bg = p.highlight_med },
-		['LspReferenceWrite'] = { bg = p.highlight_med },
-
-		-- lsp-highlight-codelens
-		['LspCodeLens'] = { fg = p.subtle }, -- virtual text of code len
-		['LspCodeLensSeparator'] = { fg = p.highlight_high }, -- separator between two or more code len
-
-		-- romgrk/barbar.nvim
-		['BufferCurrent'] = { fg = p.text, bg = p.overlay },
-		['BufferCurrentIndex'] = { fg = p.text, bg = p.overlay },
-		['BufferCurrentMod'] = { fg = p.foam, bg = p.overlay },
-		['BufferCurrentSign'] = { fg = p.subtle, bg = p.overlay },
-		['BufferCurrentTarget'] = { fg = p.gold, bg = p.overlay },
-		['BufferInactive'] = { fg = p.subtle },
-		['BufferInactiveIndex'] = { fg = p.subtle },
-		['BufferInactiveMod'] = { fg = p.foam },
-		['BufferInactiveSign'] = { fg = p.muted },
-		['BufferInactiveTarget'] = { fg = p.gold },
-		['BufferTabpageFill'] = { fg = groups.background, bg = groups.background },
-		['BufferVisible'] = { fg = p.subtle },
-		['BufferVisibleIndex'] = { fg = p.subtle },
-		['BufferVisibleMod'] = { fg = p.foam },
-		['BufferVisibleSign'] = { fg = p.muted },
-		['BufferVisibleTarget'] = { fg = p.gold },
-
-		-- lewis6991/gitsigns.nvim
-		['GitSignsAdd'] = { fg = groups.git_add, bg = groups.background },
-		['GitSignsChange'] = { fg = groups.git_change, bg = groups.background },
-		['GitSignsDelete'] = { fg = groups.git_delete, bg = groups.background },
-		['SignAdd'] = { link = 'GitSignsAdd' },
-		['SignChange'] = { link = 'GitSignsChange' },
-		['SignDelete'] = { link = 'GitSignsDelete' },
-
-		-- mvllow/modes.nvim
-		['ModesCopy'] = { bg = p.gold },
-		['ModesDelete'] = { bg = p.love },
-		['ModesInsert'] = { bg = p.foam },
-		['ModesVisual'] = { bg = p.iris },
-
-		-- kyazdani42/nvim-tree.lua
-		['NvimTreeEmptyFolderName'] = { fg = p.muted },
-		['NvimTreeFileDeleted'] = { fg = p.love },
-		['NvimTreeFileDirty'] = { fg = p.rose },
-		['NvimTreeFileMerge'] = { fg = p.iris },
-		['NvimTreeFileNew'] = { fg = p.foam },
-		['NvimTreeFileRenamed'] = { fg = p.pine },
-		['NvimTreeFileStaged'] = { fg = p.iris },
-		['NvimTreeFolderIcon'] = { fg = p.subtle },
-		['NvimTreeFolderName'] = { fg = p.foam },
-		['NvimTreeGitDeleted'] = { fg = groups.git_delete },
-		['NvimTreeGitDirty'] = { fg = groups.git_dirty },
-		['NvimTreeGitIgnored'] = { fg = groups.git_ignore },
-		['NvimTreeGitMerge'] = { fg = groups.git_merge },
-		['NvimTreeGitNew'] = { fg = groups.git_add },
-		['NvimTreeGitRenamed'] = { fg = groups.git_rename },
-		['NvimTreeGitStaged'] = { fg = groups.git_stage },
-		['NvimTreeImageFile'] = { fg = p.text },
-		['NvimTreeNormal'] = { fg = p.text },
-		['NvimTreeOpenedFile'] = { fg = p.text, bg = p.highlight_med },
-		['NvimTreeOpenedFolderName'] = { link = 'NvimTreeFolderName' },
-		['NvimTreeRootFolder'] = { fg = p.iris },
-		['NvimTreeSpecialFile'] = { link = 'NvimTreeNormal' },
-		['NvimTreeWindowPicker'] = { fg = p.love, bg = p.love, blend = 10 },
-
-		-- nvim-neo-tree/neo-tree.nvim
-		['NeoTreeTitleBar'] = { fg = p.surface, bg = p.pine },
-		['NeoTreeGitAdded'] = { fg = p.foam },
-		['NeoTreeGitModified'] = { fg = p.rose },
-		['NeoTreeGitDeleted'] = { fg = p.love },
-		['NeoTreeGitRenamed'] = { fg = p.pine },
-		['NeoTreeGitIgnored'] = { fg = p.muted },
-		['NeoTreeGitUntracked'] = { fg = p.gold },
-		['NeoTreeGitConflict'] = { fg = p.iris },
-
-		-- folke/which-key.nvim
-		['WhichKey'] = { fg = p.iris },
-		['WhichKeyGroup'] = { fg = p.foam },
-		['WhichKeySeparator'] = { fg = p.subtle },
-		['WhichKeyDesc'] = { fg = p.gold },
-		['WhichKeyFloat'] = { bg = maybe.surface },
-		['WhichKeyValue'] = { fg = p.rose },
-
-		-- luka-reineke/indent-blankline.nvim
-		['IndentBlanklineChar'] = { fg = p.muted, nocombine = true },
-		['IndentBlanklineSpaceChar'] = { fg = p.muted, nocombine = true },
-		['IndentBlanklineSpaceCharBlankline'] = { fg = p.muted, nocombine = true },
-
-		-- hrsh7th/nvim-cmp
-		['CmpItemAbbr'] = { fg = p.subtle },
-		['CmpItemAbbrDeprecated'] = { fg = p.subtle, strikethrough = true },
-		['CmpItemAbbrMatch'] = { fg = p.text, bold = true },
-		['CmpItemAbbrMatchFuzzy'] = { fg = p.text, bold = true },
-		['CmpItemKind'] = { fg = p.subtle },
-		['CmpItemKindClass'] = { fg = p.pine },
-		['CmpItemKindFunction'] = { fg = p.rose },
-		['CmpItemKindInterface'] = { fg = p.foam },
-		['CmpItemKindMethod'] = { fg = p.iris },
-		['CmpItemKindSnippet'] = { fg = p.gold },
-		['CmpItemKindVariable'] = { fg = p.text },
-
-		-- TimUntersberger/neogit
-		['NeogitDiffAddHighlight'] = { fg = p.foam, bg = p.highlight_med },
-		['NeogitDiffContextHighlight'] = { bg = p.highlight_low },
-		['NeogitDiffDeleteHighlight'] = { fg = p.love, bg = p.highlight_med },
-		['NeogitHunkHeader'] = { bg = p.highlight_low },
-		['NeogitHunkHeaderHighlight'] = { bg = p.highlight_low },
-
-		-- vimwiki/vimwiki
-		['VimwikiHR'] = { fg = p.subtle },
-		['VimwikiHeader1'] = { fg = groups.headings.h1, bold = true },
-		['VimwikiHeader2'] = { fg = groups.headings.h2, bold = true },
-		['VimwikiHeader3'] = { fg = groups.headings.h3, bold = true },
-		['VimwikiHeader4'] = { fg = groups.headings.h4, bold = true },
-		['VimwikiHeader5'] = { fg = groups.headings.h5, bold = true },
-		['VimwikiHeader6'] = { fg = groups.headings.h6, bold = true },
-		['VimwikiHeaderChar'] = { fg = p.pine },
-		['VimwikiLink'] = { fg = groups.link, underline = true },
-		['VimwikiList'] = { fg = p.iris },
-		['VimwikiNoExistsLink'] = { fg = p.love },
-
-		-- nvim-neorg/neorg
-		['NeorgHeading1Prefix'] = { fg = groups.headings.h1, bold = true },
-		['NeorgHeading1Title'] = { link = 'NeorgHeading1Prefix' },
-		['NeorgHeading2Prefix'] = { fg = groups.headings.h2, bold = true },
-		['NeorgHeading2Title'] = { link = 'NeorgHeading2Prefix' },
-		['NeorgHeading3Prefix'] = { fg = groups.headings.h3, bold = true },
-		['NeorgHeading3Title'] = { link = 'NeorgHeading3Prefix' },
-		['NeorgHeading4Prefix'] = { fg = groups.headings.h4, bold = true },
-		['NeorgHeading4Title'] = { link = 'NeorgHeading4Prefix' },
-		['NeorgHeading5Prefix'] = { fg = groups.headings.h5, bold = true },
-		['NeorgHeading5Title'] = { link = 'NeorgHeading5Prefix' },
-		['NeorgHeading6Prefix'] = { fg = groups.headings.h6, bold = true },
-		['NeorgHeading6Title'] = { link = 'NeorgHeading6Prefix' },
-		['NeorgMarkerTitle'] = { fg = p.text, bold = true },
-
-		-- tami5/lspsaga.nvim (fork of glepnir/lspsaga.nvim)
-		['DefinitionCount'] = { fg = p.rose },
-		['DefinitionIcon'] = { fg = p.rose },
-		['DefintionPreviewTitle'] = { fg = p.rose, bold = true },
-		['LspFloatWinBorder'] = { fg = groups.border },
-		['LspFloatWinNormal'] = { bg = maybe.surface },
-		['LspSagaAutoPreview'] = { fg = p.subtle },
-		['LspSagaCodeActionBorder'] = { fg = groups.border },
-		['LspSagaCodeActionContent'] = { fg = p.foam },
-		['LspSagaCodeActionTitle'] = { fg = p.gold, bold = true },
-		['LspSagaCodeActionTruncateLine'] = { link = 'LspSagaCodeActionBorder' },
-		['LspSagaDefPreviewBorder'] = { fg = groups.border },
-		['LspSagaDiagnosticBorder'] = { fg = groups.border },
-		['LspSagaDiagnosticHeader'] = { fg = p.gold, bold = true },
-		['LspSagaDiagnosticTruncateLine'] = { link = 'LspSagaDiagnosticBorder' },
-		['LspSagaDocTruncateLine'] = { link = 'LspSagaHoverBorder' },
-		['LspSagaFinderSelection'] = { fg = p.gold },
-		['LspSagaHoverBorder'] = { fg = groups.border },
-		['LspSagaLspFinderBorder'] = { fg = groups.border },
-		['LspSagaRenameBorder'] = { fg = p.pine },
-		['LspSagaRenamePromptPrefix'] = { fg = p.love },
-		['LspSagaShTruncateLine'] = { link = 'LspSagaSignatureHelpBorder' },
-		['LspSagaSignatureHelpBorder'] = { fg = p.pine },
-		['ReferencesCount'] = { fg = p.rose },
-		['ReferencesIcon'] = { fg = p.rose },
-		['SagaShadow'] = { bg = p.overlay },
-		['TargetWord'] = { fg = p.iris },
-
-		-- ray-x/lsp_signature.nvim
-		['LspSignatureActiveParameter'] = { bg = p.overlay },
-
-		-- rlane/pounce.nvim
-		['PounceAccept'] = { fg = p.love, bg = p.highlight_high },
-		['PounceAcceptBest'] = { fg = p.base, bg = p.gold },
-		['PounceGap'] = { link = 'Search' },
-		['PounceMatch'] = { link = 'Search' },
-
-		-- ggandor/leap.nvim
-		['LeapMatch'] = { link = 'MatchParen' },
-		['LeapLabelPrimary'] = { link = 'IncSearch' },
-		['LeapLabelSecondary'] = { fg = p.base, bg = p.pine },
-
-		-- phaazon/hop.nvim
-		['HopNextKey'] = { fg = p.love },
-		['HopNextKey1'] = { fg = p.foam },
-		['HopNextKey2'] = { fg = p.pine },
-		['HopUnmatched'] = { fg = p.highlight_high },
-
-		-- nvim-telescope/telescope.nvim
-		['TelescopeBorder'] = { fg = groups.border, bg = float_background },
-		['TelescopeMatching'] = { fg = p.rose },
-		['TelescopeNormal'] = { fg = p.subtle, bg = float_background },
-		['TelescopePromptNormal'] = { fg = p.text, bg = float_background },
-		['TelescopePromptPrefix'] = { fg = p.subtle },
-		['TelescopeSelection'] = { fg = p.text, bg = p.overlay },
-		['TelescopeSelectionCaret'] = { fg = p.rose, bg = p.overlay },
-		['TelescopeTitle'] = { fg = p.subtle },
-
-		-- ibhagwan/fzf-lua
-		['FzfLuaNormal'] = { fg = p.subtle, bg = float_background },
-		['FzfLuaTitle'] = { fg = p.subtle },
-		['FzfLuaBorder'] = { fg = groups.border, bg = float_background },
-		['FzfLuaHeaderText'] = { fg = p.love },
-		['FzfLuaHeaderBind'] = { fg = p.rose },
-		['FzfLuaBufFlagCur'] = { fg = p.subtle },
-		['FzfLuaBufFlagAlt'] = { fg = p.subtle },
-
-		-- rcarriga/nvim-notify
-		['NotifyINFOBorder'] = { fg = p.foam },
-		['NotifyINFOTitle'] = { link = 'NotifyINFOBorder' },
-		['NotifyINFOIcon'] = { link = 'NotifyINFOBorder' },
-		['NotifyWARNBorder'] = { fg = p.gold },
-		['NotifyWARNTitle'] = { link = 'NotifyWARNBorder' },
-		['NotifyWARNIcon'] = { link = 'NotifyWARNBorder' },
-		['NotifyDEBUGBorder'] = { fg = p.muted },
-		['NotifyDEBUGTitle'] = { link = 'NotifyDEBUGBorder' },
-		['NotifyDEBUGIcon'] = { link = 'NotifyDEBUGBorder' },
-		['NotifyTRACEBorder'] = { fg = p.iris },
-		['NotifyTRACETitle'] = { link = 'NotifyTRACEBorder' },
-		['NotifyTRACEIcon'] = { link = 'NotifyTRACEBorder' },
-		['NotifyERRORBorder'] = { fg = p.love },
-		['NotifyERRORTitle'] = { link = 'NotifyERRORBorder' },
-		['NotifyERRORIcon'] = { link = 'NotifyERRORBorder' },
-
-		-- rcarriga/nvim-dap-ui
-		['DapUIVariable'] = { link = 'Normal' },
-		['DapUIValue'] = { link = 'Normal' },
-		['DapUIFrameName'] = { link = 'Normal' },
-		['DapUIThread'] = { fg = p.gold },
-		['DapUIWatchesValue'] = { link = 'DapUIThread' },
-		['DapUIBreakpointsInfo'] = { link = 'DapUIThread' },
-		['DapUIBreakpointsCurrentLine'] = { fg = p.gold, bold = true },
-		['DapUIWatchesEmpty'] = { fg = p.love },
-		['DapUIWatchesError'] = { link = 'DapUIWatchesEmpty' },
-		['DapUIBreakpointsDisabledLine'] = { fg = p.muted },
-		['DapUISource'] = { fg = p.iris },
-		['DapUIBreakpointsPath'] = { fg = p.foam },
-		['DapUIScope'] = { link = 'DapUIBreakpointsPath' },
-		['DapUILineNumber'] = { link = 'DapUIBreakpointsPath' },
-		['DapUIBreakpointsLine'] = { link = 'DapUIBreakpointsPath' },
-		['DapUIFloatBorder'] = { link = 'DapUIBreakpointsPath' },
-		['DapUIStoppedThread'] = { link = 'DapUIBreakpointsPath' },
-		['DapUIDecoration'] = { link = 'DapUIBreakpointsPath' },
-		['DapUIModifiedValue'] = { fg = p.foam, bold = true },
-
-		-- glepnir/dashboard-nvim
-		['DashboardShortcut'] = { fg = p.love },
-		['DashboardHeader'] = { fg = p.pine },
-		['DashboardCenter'] = { fg = p.gold },
-		['DashboardFooter'] = { fg = p.iris },
-
-		-- SmiteshP/nvim-navic
-		['NavicIconsFile'] = { fg = p.base },
-		['NavicIconsModule'] = { fg = p.rose },
-		['NavicIconsNamespace'] = { fg = p.base },
-		['NavicIconsPackage'] = { fg = p.base },
-		['NavicIconsClass'] = { fg = p.foam },
-		['NavicIconsMethod'] = { fg = p.iris },
-		['NavicIconsProperty'] = { fg = p.foam },
-		['NavicIconsField'] = { fg = p.foam },
-		['NavicIconsConstructor'] = { fg = p.gold },
-		['NavicIconsEnum'] = { fg = p.gold },
-		['NavicIconsInterface'] = { fg = p.foam },
-		['NavicIconsFunction'] = { fg = p.pine },
-		['NavicIconsVariable'] = { fg = p.text },
-		['NavicIconsConstant'] = { fg = p.gold },
-		['NavicIconsString'] = { fg = p.gold },
-		['NavicIconsNumber'] = { fg = p.gold },
-		['NavicIconsBoolean'] = { fg = p.rose },
-		['NavicIconsArray'] = { fg = p.gold },
-		['NavicIconsObject'] = { fg = p.gold },
-		['NavicIconsKey'] = { fg = p.iris },
-		['NavicIconsKeyword'] = { fg = p.pine },
-		['NavicIconsNull'] = { fg = p.love },
-		['NavicIconsEnumMember'] = { fg = p.foam },
-		['NavicIconsStruct'] = { fg = p.foam },
-		['NavicIconsEvent'] = { fg = p.gold },
-		['NavicIconsOperator'] = { fg = p.subtle },
-		['NavicIconsTypeParameter'] = { fg = p.foam },
-		['NavicText'] = { fg = p.subtle },
-		['NavicSeparator'] = { fg = p.subtle },
-
-		-- folke/noice.nvim
-		['NoiceCursor'] = { fg = p.highlight_high, bg = p.text },
-
-		-- echasnovski/mini.indentscope
-		['MiniIndentscopeSymbol'] = { fg = p.highlight_med },
-		['MiniIndentscopeSymbolOff'] = { fg = p.highlight_med },
-
-		-- goolord/alpha-nvim
-		['AlphaHeader'] = { fg = p.pine },
-		['AlphaButtons'] = { fg = p.foam },
-		['AlphaShortcut'] = { fg = p.rose },
-		['AlphaFooter'] = { fg = p.gold },
-	}
-
-	vim.g.terminal_color_0 = p.overlay -- black
-	vim.g.terminal_color_8 = p.subtle -- bright black
-	vim.g.terminal_color_1 = p.love -- red
-	vim.g.terminal_color_9 = p.love -- bright red
-	vim.g.terminal_color_2 = p.pine -- green
-	vim.g.terminal_color_10 = p.pine -- bright green
-	vim.g.terminal_color_3 = p.gold -- yellow
-	vim.g.terminal_color_11 = p.gold -- bright yellow
-	vim.g.terminal_color_4 = p.foam -- blue
-	vim.g.terminal_color_12 = p.foam -- bright blue
-	vim.g.terminal_color_5 = p.iris -- magenta
-	vim.g.terminal_color_13 = p.iris -- bright magenta
-	vim.g.terminal_color_6 = p.rose -- cyan
-	vim.g.terminal_color_14 = p.rose -- bright cyan
-	vim.g.terminal_color_7 = p.text -- white
-	vim.g.terminal_color_15 = p.text -- bright white
-
-	-- Set users highlight_group customisations.
-	for group, opts in pairs(options.highlight_groups) do
-		local default_opts = M.defaults[group]
-
-		if (opts.inherit == nil or opts.inherit) and default_opts ~= nil then -- On merge.
-			opts.inherit = nil -- Don't add this key to the highlight_group after merge.
-			M.defaults[group] = vim.tbl_extend('force', default_opts, opts)
-		else -- On overwrite.
-			opts.inherit = nil -- Don't add this key to the highlight_group.
-			M.defaults[group] = opts
-		end
-	end
-
-	-- Set highlights.
-	for group, color in pairs(M.defaults) do
-		h(group, color)
-	end
-end
-
-return M
diff --git a/lua/rose-pine/util.lua b/lua/rose-pine/util.lua
deleted file mode 100644
index f8b84f9..0000000
--- a/lua/rose-pine/util.lua
+++ /dev/null
@@ -1,71 +0,0 @@
-local util = {}
-
-local function byte(value, offset)
-	return bit.band(bit.rshift(value, offset), 0xFF)
-end
-
-local function rgb(color)
-	color = vim.api.nvim_get_color_by_name(color)
-
-	if color == -1 then
-		color = vim.opt.background:get() == 'dark' and 000 or 255255255
-	end
-
-	return { byte(color, 16), byte(color, 8), byte(color, 0) }
-end
-
-local function parse_color(color)
-	if color == nil then
-		return print('invalid color')
-	end
-
-	color = color:lower()
-
-	if not color:find('#') and color ~= 'none' then
-		color = require('rose-pine.palette')[color]
-			or vim.api.nvim_get_color_by_name(color)
-	end
-
-	return color
-end
-
----@param fg string foreground color
----@param bg string background color
----@param alpha number number between 0 (background) and 1 (foreground)
-util.blend = function(fg, bg, alpha)
-	local fg_rgb = rgb(parse_color(fg))
-	local bg_rgb = rgb(parse_color(bg))
-
-	local function blend_channel(i)
-		local ret = (alpha * fg_rgb[i] + ((1 - alpha) * bg_rgb[i]))
-		return math.floor(math.min(math.max(0, ret), 255) + 0.5)
-	end
-
-	return string.format(
-		'#%02X%02X%02X',
-		blend_channel(1),
-		blend_channel(2),
-		blend_channel(3)
-	)
-end
-
----@param group string
----@param color table<string, any>
-util.highlight = function(group, color)
-	local fg = color.fg and parse_color(color.fg) or 'none'
-	local bg = color.bg and parse_color(color.bg) or 'none'
-	local sp = color.sp and parse_color(color.sp) or ''
-
-	if
-		color.blend ~= nil
-		and (color.blend >= 0 or color.blend <= 100)
-		and bg ~= nil
-	then
-		bg = util.blend(bg, parse_color('base') or '', color.blend / 100)
-	end
-
-	color = vim.tbl_extend('force', color, { fg = fg, bg = bg, sp = sp })
-	vim.api.nvim_set_hl(0, group, color)
-end
-
-return util
diff --git a/lua/rose-pine/utilities.lua b/lua/rose-pine/utilities.lua
new file mode 100644
index 0000000..e4c72cc
--- /dev/null
+++ b/lua/rose-pine/utilities.lua
@@ -0,0 +1,66 @@
+local utilities = {}
+
+---@param color string
+local function color_to_rgb(color)
+	local function byte(value, offset)
+		return bit.band(bit.rshift(value, offset), 0xFF)
+	end
+
+	local new_color = vim.api.nvim_get_color_by_name(color)
+	if new_color == -1 then
+		new_color = vim.opt.background:get() == "dark" and 000 or 255255255
+	end
+
+	return { byte(new_color, 16), byte(new_color, 8), byte(new_color, 0) }
+end
+
+---@param color string Palette key or hex value
+local function parse_color(color)
+	if color == nil then
+		return print("Invalid color")
+	end
+
+	color = color:lower()
+
+	if not color:find("#") and color ~= "NONE" then
+		color = require("rose-pine.palette")[color] or vim.api.nvim_get_color_by_name(color)
+	end
+
+	return color
+end
+
+---@param fg string Foreground color
+---@param bg string Background color
+---@param alpha number Between 0 (background) and 1 (foreground)
+local function blend(fg, bg, alpha)
+	local fg_rgb = color_to_rgb(fg)
+	local bg_rgb = color_to_rgb(bg)
+
+	local function blend_channel(i)
+		local ret = (alpha * fg_rgb[i] + ((1 - alpha) * bg_rgb[i]))
+		return math.floor(math.min(math.max(0, ret), 255) + 0.5)
+	end
+
+	return string.format("#%02X%02X%02X", blend_channel(1), blend_channel(2), blend_channel(3))
+end
+
+---@param group string
+---@param highlight table<string, any>
+function utilities.highlight(group, highlight, blend_on)
+	local fg = highlight.fg and parse_color(highlight.fg) or "NONE"
+	local bg = highlight.bg and parse_color(highlight.bg) or "NONE"
+	local sp = highlight.sp and parse_color(highlight.sp) or "NONE"
+
+	if highlight.blend ~= nil and (highlight.blend >= 0 and highlight.blend <= 100) and bg ~= nil then
+		bg = blend(bg, blend_on or require("rose-pine.palette").base, highlight.blend / 100)
+	end
+
+	highlight.fg = fg
+	highlight.bg = bg
+	highlight.sp = sp
+	-- highlight = vim.tbl_extend("force", highlight, { fg = fg, bg = bg, sp = sp })
+
+	vim.api.nvim_set_hl(0, group, highlight)
+end
+
+return utilities
diff --git a/readme.md b/readme.md
index ed6d466..343a587 100644
--- a/readme.md
+++ b/readme.md
@@ -11,30 +11,20 @@
     </a>
 </p>
 
-## Install
+## Getting started
 
-**[Paq](https://github.com/savq/paq-nvim)**
+Install `rose-pine/neovim` using your favourite plugin manager:
+
+**paq-nvim**
 
 ```lua
-require('paq')({
-  { 'rose-pine/neovim', as = 'rose-pine' }
-})
+{ 'rose-pine/neovim', as = 'rose-pine' }
 ```
 
-**[lazy.nvim](https://github.com/folke/lazy.nvim)**
+**lazy.nvim**
 
 ```lua
-require("lazy").setup({
-  { 'rose-pine/neovim', name = 'rose-pine' }
-})
-```
-
-**[packer.nvim](https://github.com/wbthomason/packer.nvim)**
-
-```lua
-require('packer').startup(function(use)
-  use({ 'rose-pine/neovim', as = 'rose-pine' })
-end)
+{ 'rose-pine/neovim', name = 'rose-pine' }
 ```
 
 ## Gallery
@@ -53,75 +43,88 @@ end)
 
 ## Options
 
-> [!NOTE]
-> Options should be set **before** colorscheme
+> [!IMPORTANT]
+> Configure options _before_ setting colorscheme.
 
-Variant respects `vim.o.background`, using dawn when light and `dark_variant` when dark
+Rosé Pine has three variants: main, moon, and dawn. By default, `vim.o.background` is followed, using dawn when light and `dark_variant` when dark.
+
+Colour values accept named colours from the [Rosé Pine palette](https://rosepinetheme.com/palette/ingredients/), e.g. "foam", or valid hex, e.g. "#fa8072".
 
 ```lua
 require('rose-pine').setup({
-	--- @usage 'auto'|'main'|'moon'|'dawn'
-	variant = 'auto',
-	--- @usage 'main'|'moon'|'dawn'
-	dark_variant = 'main',
-	bold_vert_split = false,
-	dim_nc_background = false,
-	disable_background = false,
-	disable_float_background = false,
-	disable_italics = false,
+    variant = "auto", -- auto, main, moon, or dawn
+    dark_variant = "main", -- main, moon, or dawn
+    dim_inactive_windows = false,
+    extend_background_behind_borders = false,
 
-	--- @usage string hex value or named color from rosepinetheme.com/palette
-	groups = {
-		background = 'base',
-		background_nc = '_experimental_nc',
-		panel = 'surface',
-		panel_nc = 'base',
-		border = 'highlight_med',
-		comment = 'muted',
-		link = 'iris',
-		punctuation = 'subtle',
+    styles = {
+        bold = true,
+        italic = true,
+        transparency = false,
+    },
 
-		error = 'love',
-		hint = 'iris',
-		info = 'foam',
-		warn = 'gold',
+    groups = {
+        border = "muted",
+        link = "iris",
+        panel = "surface",
 
-		headings = {
-			h1 = 'iris',
-			h2 = 'foam',
-			h3 = 'rose',
-			h4 = 'gold',
-			h5 = 'pine',
-			h6 = 'foam',
-		}
-		-- or set all headings at once
-		-- headings = 'subtle'
-	},
+        error = "love",
+        hint = "iris",
+        info = "foam",
+        warn = "gold",
 
-	-- Change specific vim highlight groups
-	-- https://github.com/rose-pine/neovim/wiki/Recipes
-	highlight_groups = {
-		ColorColumn = { bg = 'rose' },
+        git_add = "foam",
+        git_change = "rose",
+        git_delete = "love",
+        git_dirty = "rose",
+        git_ignore = "muted",
+        git_merge = "iris",
+        git_rename = "pine",
+        git_stage = "iris",
+        git_text = "rose",
+        git_untracked = "subtle",
 
-		-- Blend colours against the "base" background
-		CursorLine = { bg = 'foam', blend = 10 },
-		StatusLine = { fg = 'love', bg = 'love', blend = 10 },
+        headings = {
+            h1 = "iris",
+            h2 = "foam",
+            h3 = "rose",
+            h4 = "gold",
+            h5 = "pine",
+            h6 = "foam",
+        },
+        -- Alternatively, set all headings at once.
+        -- headings = "subtle",
+    },
 
-		-- By default each group adds to the existing config.
-		-- If you only want to set what is written in this config exactly,
-		-- you can set the inherit option:
-		Search = { bg = 'gold', inherit = false },
-	}
+    highlight_groups = {
+        -- Comment = { fg = "foam" },
+        -- VertSplit = { fg = "muted", bg = "muted" },
+    },
+
+    before_highlight = function(group, highlight, palette)
+        -- Disable all undercurls
+        -- if highlight.undercurl then
+        --     highlight.undercurl = false
+        -- end
+        --
+        -- Change palette colour
+        -- if highlight.fg == palette.pine then
+        --     highlight.fg = palette.foam
+        -- end
+    end,
 })
 
--- Set colorscheme after options
 vim.cmd('colorscheme rose-pine')
+-- vim.cmd('colorscheme rose-pine-main')
+-- vim.cmd('colorscheme rose-pine-moon')
+-- vim.cmd('colorscheme rose-pine-dawn')
 ```
 
+> [!NOTE]
+> Visit the [wiki](https://github.com/rose-pine/neovim/wiki) for [plugin configurations](https://github.com/rose-pine/neovim/wiki/Plugin-configurations) and [recipes](https://github.com/rose-pine/neovim/wiki/Recipes).
+
 ## Contributing
 
-We welcome and appreciate any help in creating a lovely experience for all.
+We welcome and appreciate contributions of any kind. Create an issue or start a discussion for any proposed changes. Pull requests are encouraged for supporting additional plugins.
 
-- Get highlight groups under cursor via `:Inspect` in Neovim 0.9 or [nvim-treesitter/playground](https://github.com/nvim-treesitter/playground#show-treesitter-and-syntax-highlight-groups-under-the-cursor)
-- [Adding new highlight groups](https://github.com/rose-pine/neovim/issues/6#issuecomment-962466323)
-- [Palette reference by name](https://rosepinetheme.com/palette)
+Feel free to update the [wiki](https://github.com/rose-pine/neovim/wiki/) with any [recipes](https://github.com/rose-pine/neovim/wiki/Recipes).

From 86fa83761e478e6293eadab60252a0e757136791 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sun, 7 Jan 2024 15:39:30 -0600
Subject: [PATCH 095/190] feat: re-add inherit option for custom highlight
 groups (#198)

---
 lua/rose-pine.lua | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index d45d4af..aae44bc 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -611,6 +611,16 @@ local function set_highlights()
 	end
 
 	for group, options in pairs(config.options.highlight_groups) do
+		local default_opts = highlights[group] or {}
+
+		if (options.inherit == nil or options.inherit) and default_opts ~= nil then -- On merge.
+			options.inherit = nil -- Don't add this key to the highlight_group after merge.
+			highlights[group] = vim.tbl_extend("force", default_opts, options)
+		else -- On overwrite.
+			options.inherit = nil -- Don't add this key to the highlight_group.
+			highlights[group] = options
+		end
+
 		highlights[group] = vim.tbl_extend("force", highlights[group] or {}, options)
 	end
 

From 82285ba9f13c5d89557b6a19c96cd14f561f389b Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sun, 7 Jan 2024 17:35:36 -0600
Subject: [PATCH 096/190] fix: none palette value (#200)

---
 lua/rose-pine/palette.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index 6b49f68..b995a9d 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -17,6 +17,7 @@ local variants = {
 		highlight_low = "#21202e",
 		highlight_med = "#403d52",
 		highlight_high = "#524f67",
+		none = "NONE",
 	},
 	moon = {
 		_nc = "#1f1d30",
@@ -35,6 +36,7 @@ local variants = {
 		highlight_low = "#2a283e",
 		highlight_med = "#44415a",
 		highlight_high = "#56526e",
+		none = "NONE",
 	},
 	dawn = {
 		_nc = "#f8f0e7",
@@ -53,6 +55,7 @@ local variants = {
 		highlight_low = "#f4ede8",
 		highlight_med = "#dfdad9",
 		highlight_high = "#cecacd",
+		none = "NONE",
 	},
 }
 

From 76b6d830f6c75f9eed80e561434c41eaef092517 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sun, 7 Jan 2024 17:55:48 -0600
Subject: [PATCH 097/190] feat!: enable `extend_background_behind_borders` by
 default (#201)

---
 lua/rose-pine/config.lua | 2 +-
 readme.md                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index 6fc0774..d5ef0d8 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -21,7 +21,7 @@ config.options = {
 
 	---Extend background behind borders. Appearance differs based on which
 	---border characters you are using.
-	extend_background_behind_borders = false,
+	extend_background_behind_borders = true,
 
 	enable = {
 		terminal = true,
diff --git a/readme.md b/readme.md
index 343a587..0c13fae 100644
--- a/readme.md
+++ b/readme.md
@@ -55,7 +55,7 @@ require('rose-pine').setup({
     variant = "auto", -- auto, main, moon, or dawn
     dark_variant = "main", -- main, moon, or dawn
     dim_inactive_windows = false,
-    extend_background_behind_borders = false,
+    extend_background_behind_borders = true,
 
     styles = {
         bold = true,

From 2c892088f9affecaa2a62b7fdd6bd265f07d160c Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sun, 7 Jan 2024 19:27:50 -0600
Subject: [PATCH 098/190] fix: transparency not affecting Normal background
 (#204)

---
 lua/rose-pine.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index aae44bc..55e4c4f 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -587,6 +587,7 @@ local function set_highlights()
 		FloatBorder = { fg = palette.muted, bg = "NONE" },
 		Folded = { fg = palette.text, bg = "NONE" },
 		NormalFloat = { bg = "NONE" },
+		Normal = { fg = palette.text, bg = "NONE" },
 		NormalNC = { fg = palette.text, bg = config.options.dim_inactive_windows and palette._nc or "NONE" },
 		Pmenu = { fg = palette.subtle, bg = "NONE" },
 		PmenuKind = { fg = palette.foam, bg = "NONE" },

From bfa2d2b2fb8b444cb3ff15792f14caaf3e9639e9 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sun, 7 Jan 2024 23:41:02 -0600
Subject: [PATCH 099/190] feat(transparency): remove more backgrounds (#205)

* feat(transparency): remove border background

* chore(transparency): remove telescope selection caret background
---
 lua/rose-pine.lua | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 55e4c4f..795b9a1 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -9,7 +9,11 @@ local function set_highlights()
 
 	local function make_border(fg)
 		fg = fg or groups.border
-		return { fg = fg, bg = config.options.extend_background_behind_borders and palette.surface or "NONE" }
+		return {
+			fg = fg,
+			bg = (config.options.extend_background_behind_borders and not styles.transparency) and palette.surface
+				or "NONE",
+		}
 	end
 
 	local function make_title(fg)
@@ -600,7 +604,7 @@ local function set_highlights()
 		TelescopeNormal = { fg = palette.subtle, bg = "NONE" },
 		TelescopePromptNormal = { fg = palette.text, bg = "NONE" },
 		TelescopeSelection = { fg = palette.text, bg = "NONE", bold = styles.bold },
-		TelescopeSelectionCaret = { fg = palette.rose, bg = palette.rose },
+		TelescopeSelectionCaret = { fg = palette.rose },
 
 		WhichKeyFloat = { bg = "NONE" },
 	}

From 188190f285e9f5c6753080b93e5dd802f04f6cfd Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Mon, 8 Jan 2024 09:27:46 -0600
Subject: [PATCH 100/190] revert: improve palette contrast (#207)

This commit restores the official palette colours. A future update will
address contrast.
---
 lua/rose-pine/palette.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index b995a9d..540625e 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -11,7 +11,7 @@ local variants = {
 		love = "#eb6f92",
 		gold = "#f6c177",
 		rose = "#ebbcba",
-		pine = "#3e8fb0",
+		pine = "#31748f",
 		foam = "#9ccfd8",
 		iris = "#c4a7e7",
 		highlight_low = "#21202e",
@@ -45,7 +45,7 @@ local variants = {
 		overlay = "#f2e9e1",
 		muted = "#9893a5",
 		subtle = "#797593",
-		text = "#464261",
+		text = "#575279",
 		love = "#b4637a",
 		gold = "#ea9d34",
 		rose = "#d7827e",

From 1edcf47562476cde5f9908b6601214048ed769e0 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Mon, 8 Jan 2024 09:43:57 -0600
Subject: [PATCH 101/190] fix: mismatched WinSeparator background (#208)

* fix: mismatched WinSeparator background

* feat: use border group for bolded vert split

* fix: Pmenu fg typo
---
 lua/rose-pine.lua        | 6 +++---
 lua/rose-pine/config.lua | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 795b9a1..7ea68a4 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -62,7 +62,7 @@ local function set_highlights()
 		PmenuKind = { fg = palette.foam, bg = groups.panel },
 		PmenuKindSel = { fg = palette.subtle, bg = palette.overlay },
 		PmenuSbar = { bg = groups.panel },
-		PmenuSel = { fg = palette.title, bg = palette.overlay },
+		PmenuSel = { fg = palette.text, bg = palette.overlay },
 		PmenuThumb = { bg = palette.muted },
 		Question = { fg = palette.gold },
 		-- QuickFixLink = {},
@@ -86,13 +86,13 @@ local function set_highlights()
 		TabLineFill = { bg = groups.panel },
 		TabLineSel = { fg = palette.text, bg = palette.overlay, bold = styles.bold },
 		Title = make_title(),
-		VertSplit = make_border(),
+		VertSplit = { fg = groups.border },
 		Visual = { bg = palette.highlight_med },
 		-- VisualNOS = {},
 		WarningMsg = { fg = groups.warn, bold = styles.bold },
 		-- Whitespace = {},
 		WildMenu = { link = "IncSearch" },
-		WinSeparator = make_border(),
+		WinSeparator = { fg = groups.border },
 
 		DiagnosticError = { fg = groups.error },
 		DiagnosticHint = { fg = groups.hint },
diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index d5ef0d8..beed052 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -98,7 +98,9 @@ config.options = {
 
 local function migrate(options)
 	if options.bold_vert_split then
-		options.highlight_groups["VertSplit"] = { fg = "muted", bg = "muted" }
+		local border = options.groups.border or "muted"
+		options.highlight_groups["VertSplit"] = { fg = border, bg = border }
+		options.highlight_groups["WinSeparator"] = { fg = border, bg = border }
 	end
 
 	if options.disable_float_background then

From 46044020c62de9ccd9cb5c591e065baabd0d94e2 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Tue, 9 Jan 2024 15:44:36 -0600
Subject: [PATCH 102/190] feat: improve neogit support (#209)

* feat: improve neogit support

* add change copied
---
 lua/rose-pine.lua | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 7ea68a4..1c97f22 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -387,10 +387,20 @@ local function set_highlights()
 		CmpItemKindSnippet = { link = "String" },
 		CmpItemKindVariable = { link = "Identifier" },
 
-		-- TimUntersberger/neogit
+		-- NeogitOrg/neogit
+		-- https://github.com/NeogitOrg/neogit/blob/master/lua/neogit/lib/hl.lua#L109-L198
+		NeogitChangeAdded = { fg = groups.git_add, bold = styles.bold, italic = styles.italic },
+		NeogitChangeBothModified = { fg = groups.git_change, bold = styles.bold, italic = styles.italic },
+		NeogitChangeCopied = { fg = groups.git_untracked, bold = styles.bold, italic = styles.italic },
+		NeogitChangeDeleted = { fg = groups.git_delete, bold = styles.bold, italic = styles.italic },
+		NeogitChangeModified = { fg = groups.git_change, bold = styles.bold, italic = styles.italic },
+		NeogitChangeNewFile = { fg = groups.git_stage, bold = styles.bold, italic = styles.italic },
+		NeogitChangeRenamed = { fg = groups.git_rename, bold = styles.bold, italic = styles.italic },
+		NeogitChangeUpdated = { fg = groups.git_change, bold = styles.bold, italic = styles.italic },
 		NeogitDiffAddHighlight = { link = "DiffAdd" },
 		NeogitDiffContextHighlight = { bg = palette.surface },
 		NeogitDiffDeleteHighlight = { link = "DiffDelete" },
+		NeogitFilePath = { fg = palette.foam, italic = styles.italic },
 		NeogitHunkHeader = { bg = groups.panel },
 		NeogitHunkHeaderHighlight = { bg = groups.panel },
 

From 79e0d756b97336a87b30dcc614779348b9e9d892 Mon Sep 17 00:00:00 2001
From: Robin Gruyters <2082795+rgruyters@users.noreply.github.com>
Date: Sat, 13 Jan 2024 03:39:12 +0100
Subject: [PATCH 103/190] chore: update highlights for indent-blanklines (#210)

---
 lua/rose-pine.lua | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 1c97f22..3deaebd 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -369,7 +369,12 @@ local function set_highlights()
 		WhichKeySeparator = { fg = palette.subtle },
 		WhichKeyValue = { fg = palette.rose },
 
-		-- luka-reineke/indent-blankline.nvim
+		-- lukas-reineke/indent-blankline.nvim
+		IblIndent = { fg = palette.overlay },
+		IblScope = { fg = palette.foam },
+		IblWhitespace = { fg = palette.overlay },
+
+		-- for legacy usage
 		IndentBlanklineChar = { fg = palette.muted, nocombine = true },
 		IndentBlanklineSpaceChar = { fg = palette.muted, nocombine = true },
 		IndentBlanklineSpaceCharBlankline = { fg = palette.muted, nocombine = true },
@@ -617,6 +622,10 @@ local function set_highlights()
 		TelescopeSelectionCaret = { fg = palette.rose },
 
 		WhichKeyFloat = { bg = "NONE" },
+
+		IblIndent = { fg = palette.overlay, bg = "NONE" },
+		IblScope = { fg = palette.foam, bg = "NONE" },
+		IblWhitespace = { fg = palette.overlay, bg = "NONE" },
 	}
 
 	if styles.transparency then

From e0674e5e5c0745631f5a2ffb1b77a38a2272fbdf Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Fri, 12 Jan 2024 20:46:04 -0600
Subject: [PATCH 104/190] feat: support folke/flash.nvim (#211)

---
 lua/rose-pine.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 3deaebd..c9ab80e 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -361,6 +361,9 @@ local function set_highlights()
 		NeoTreeGitUntracked = { fg = groups.git_untracked },
 		NeoTreeTitleBar = { link = "StatusLineTerm" },
 
+		-- folke/flash.nvim
+		FlashLabel = { fg = palette.base, bg = palette.love },
+
 		-- folke/which-key.nvim
 		WhichKey = { fg = palette.iris },
 		WhichKeyDesc = { fg = palette.gold },

From 1ffdf27819385fe1ee21232883986c39afd67c49 Mon Sep 17 00:00:00 2001
From: atinylittleshell <3233006+atinylittleshell@users.noreply.github.com>
Date: Sun, 14 Jan 2024 19:28:49 -0800
Subject: [PATCH 105/190] feat(transparency): remove lualine background (#212)

---
 lua/lualine/themes/rose-pine.lua | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/lua/lualine/themes/rose-pine.lua b/lua/lualine/themes/rose-pine.lua
index 96d6b92..4c2c9a6 100644
--- a/lua/lualine/themes/rose-pine.lua
+++ b/lua/lualine/themes/rose-pine.lua
@@ -1,34 +1,40 @@
 local p = require("rose-pine.palette")
+local config = require("rose-pine.config")
+
+local bg_base = p.base
+if config.options.styles.transparency then
+	bg_base = "NONE"
+end
 
 return {
 	normal = {
 		a = { bg = p.rose, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.rose },
-		c = { bg = p.base, fg = p.text },
+		c = { bg = bg_base, fg = p.text },
 	},
 	insert = {
 		a = { bg = p.foam, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.foam },
-		c = { bg = p.base, fg = p.text },
+		c = { bg = bg_base, fg = p.text },
 	},
 	visual = {
 		a = { bg = p.iris, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.iris },
-		c = { bg = p.base, fg = p.text },
+		c = { bg = bg_base, fg = p.text },
 	},
 	replace = {
 		a = { bg = p.pine, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.pine },
-		c = { bg = p.base, fg = p.text },
+		c = { bg = bg_base, fg = p.text },
 	},
 	command = {
 		a = { bg = p.love, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.love },
-		c = { bg = p.base, fg = p.text },
+		c = { bg = bg_base, fg = p.text },
 	},
 	inactive = {
-		a = { bg = p.base, fg = p.muted, gui = "bold" },
-		b = { bg = p.base, fg = p.muted },
-		c = { bg = p.base, fg = p.muted },
+		a = { bg = bg_base, fg = p.muted, gui = "bold" },
+		b = { bg = bg_base, fg = p.muted },
+		c = { bg = bg_base, fg = p.muted },
 	},
 }

From aa74893a06e1f5e45b42566eccc5fc4ddead194e Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Tue, 16 Jan 2024 08:31:18 -0600
Subject: [PATCH 106/190] fix: unlink TabLine from StatusLine (#214)

---
 lua/rose-pine.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index c9ab80e..d4dfc48 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -82,7 +82,7 @@ local function set_highlights()
 		StatusLineTerm = { fg = palette.base, bg = palette.pine },
 		StatusLineTermNC = { fg = palette.base, bg = palette.pine, blend = 60 },
 		Substitute = { link = "IncSearch" },
-		TabLine = { link = "StatusLine" },
+		TabLine = { fg = palette.subtle, bg = groups.panel },
 		TabLineFill = { bg = groups.panel },
 		TabLineSel = { fg = palette.text, bg = palette.overlay, bold = styles.bold },
 		Title = make_title(),

From f4d51d67ee1cf5526f60be3e61425cde82578254 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Thu, 18 Jan 2024 10:28:16 -0600
Subject: [PATCH 107/190] feat: add mini.clue and mini.pick (#215)

---
 lua/rose-pine.lua | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index d4dfc48..3eec3ff 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -586,6 +586,13 @@ local function set_highlights()
 		-- folke/noice.nvim
 		NoiceCursor = { fg = palette.highlight_high, bg = palette.text },
 
+		-- echasnovski/mini.clue
+		MiniClueTitle = { bg = groups.panel, bold = styles.bold },
+
+		-- echasnovski/mini.pick
+		MiniPickBorderText = { bg = groups.panel },
+		MiniPickPrompt = { bg = groups.panel, bold = styles.bold },
+
 		-- echasnovski/mini.indentscope
 		MiniIndentscopeSymbol = { fg = palette.muted },
 		MiniIndentscopeSymbolOff = { fg = palette.muted },
@@ -629,6 +636,11 @@ local function set_highlights()
 		IblIndent = { fg = palette.overlay, bg = "NONE" },
 		IblScope = { fg = palette.foam, bg = "NONE" },
 		IblWhitespace = { fg = palette.overlay, bg = "NONE" },
+
+		MiniClueTitle = { bg = "NONE", bold = styles.bold },
+
+		MiniPickBorderText = { bg = "NONE" },
+		MiniPickPrompt = { bg = "NONE", bold = styles.bold },
 	}
 
 	if styles.transparency then

From 7ed74e3f24405ab807b74aa81471c6c8e53250da Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Fri, 26 Jan 2024 14:12:54 -0600
Subject: [PATCH 108/190] feat: add new treesitter highlights (#217)

* feat: add WinBar and WinBarNC

* feat: add new treesitter highlight groups

* perf: parse necessary values upfront

This commit no longer parses each highlight group, but rather user
config values only.

* fix: titles are no longer dynamically coloured

Closes #216 #218 #219
---
 lua/rose-pine.lua           | 354 +++++++++++++++++++++++++-----------
 lua/rose-pine/config.lua    |  40 ++--
 lua/rose-pine/utilities.lua |  25 +--
 readme.md                   |  28 +--
 4 files changed, 291 insertions(+), 156 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 3eec3ff..9240a51 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -5,7 +5,11 @@ local function set_highlights()
 	local utilities = require("rose-pine.utilities")
 	local palette = require("rose-pine.palette")
 	local styles = config.options.styles
-	local groups = config.options.groups
+
+	local groups = {}
+	for group, color in pairs(config.options.groups) do
+		groups[group] = utilities.parse_color(color)
+	end
 
 	local function make_border(fg)
 		fg = fg or groups.border
@@ -16,12 +20,64 @@ local function set_highlights()
 		}
 	end
 
-	local function make_title(fg)
-		fg = fg or palette.foam
-		return { fg = styles.bold and palette.text or fg, bold = styles.bold }
-	end
+	local highlights = {}
+	local legacy_highlights = {
+		["@attribute.diff"] = { fg = palette.gold },
+		["@boolean"] = { link = "Boolean" },
+		["@class"] = { fg = palette.foam },
+		["@conditional"] = { link = "Conditional" },
+		["@field"] = { fg = palette.foam },
+		["@include"] = { link = "Include" },
+		["@interface"] = { fg = palette.foam },
+		["@macro"] = { link = "Macro" },
+		["@method"] = { fg = palette.rose },
+		["@namespace"] = { link = "Include" },
+		["@number"] = { link = "Number" },
+		["@parameter"] = { fg = palette.iris, italic = styles.italic },
+		["@preproc"] = { link = "PreProc" },
+		["@punctuation"] = { fg = palette.subtle },
+		["@punctuation.bracket"] = { link = "@punctuation" },
+		["@punctuation.delimiter"] = { link = "@punctuation" },
+		["@punctuation.special"] = { link = "@punctuation" },
+		["@regexp"] = { link = "String" },
+		["@repeat"] = { link = "Repeat" },
+		["@storageclass"] = { link = "StorageClass" },
+		["@symbol"] = { link = "Identifier" },
+		["@text"] = { fg = palette.text },
+		["@text.danger"] = { fg = groups.error },
+		["@text.diff.add"] = { fg = groups.git_add, bg = groups.git_add, blend = 20 },
+		["@text.diff.delete"] = { fg = groups.git_delete, bg = groups.git_delete, blend = 20 },
+		["@text.emphasis"] = { italic = styles.italic },
+		["@text.environment"] = { link = "Macro" },
+		["@text.environment.name"] = { link = "Type" },
+		["@text.math"] = { link = "Special" },
+		["@text.note"] = { link = "SpecialComment" },
+		["@text.strike"] = { strikethrough = true },
+		["@text.strong"] = { bold = styles.bold },
+		["@text.title"] = { link = "Title" },
+		["@text.title.1.markdown"] = { link = "markdownH1" },
+		["@text.title.1.marker.markdown"] = { link = "markdownH1Delimiter" },
+		["@text.title.2.markdown"] = { link = "markdownH2" },
+		["@text.title.2.marker.markdown"] = { link = "markdownH2Delimiter" },
+		["@text.title.3.markdown"] = { link = "markdownH3" },
+		["@text.title.3.marker.markdown"] = { link = "markdownH3Delimiter" },
+		["@text.title.4.markdown"] = { link = "markdownH4" },
+		["@text.title.4.marker.markdown"] = { link = "markdownH4Delimiter" },
+		["@text.title.5.markdown"] = { link = "markdownH5" },
+		["@text.title.5.marker.markdown"] = { link = "markdownH5Delimiter" },
+		["@text.title.6.markdown"] = { link = "markdownH6" },
+		["@text.title.6.marker.markdown"] = { link = "markdownH6Delimiter" },
+		["@text.underline"] = { underline = true },
+		["@text.uri"] = { fg = groups.link },
+		["@text.warning"] = { fg = groups.warn },
+		["@todo"] = { link = "Todo" },
 
-	local highlights = {
+		-- lukas-reineke/indent-blankline.nvim
+		IndentBlanklineChar = { fg = palette.muted, nocombine = true },
+		IndentBlanklineSpaceChar = { fg = palette.muted, nocombine = true },
+		IndentBlanklineSpaceCharBlankline = { fg = palette.muted, nocombine = true },
+	}
+	local default_highlights = {
 		ColorColumn = { bg = palette.surface },
 		Conceal = { bg = "NONE" },
 		CurSearch = { fg = palette.base, bg = palette.gold },
@@ -39,7 +95,7 @@ local function set_highlights()
 		diffAdded = { link = "DiffAdd" },
 		diffChanged = { link = "DiffChange" },
 		diffRemoved = { link = "DiffDelete" },
-		Directory = make_title(),
+		Directory = { fg = palette.foam, bold = styles.bold },
 		-- EndOfBuffer = {},
 		ErrorMsg = { fg = groups.error, bold = styles.bold },
 		FloatBorder = make_border(),
@@ -85,13 +141,15 @@ local function set_highlights()
 		TabLine = { fg = palette.subtle, bg = groups.panel },
 		TabLineFill = { bg = groups.panel },
 		TabLineSel = { fg = palette.text, bg = palette.overlay, bold = styles.bold },
-		Title = make_title(),
+		Title = { fg = palette.foam, bold = styles.bold },
 		VertSplit = { fg = groups.border },
 		Visual = { bg = palette.highlight_med },
 		-- VisualNOS = {},
 		WarningMsg = { fg = groups.warn, bold = styles.bold },
 		-- Whitespace = {},
 		WildMenu = { link = "IncSearch" },
+		WinBar = { fg = palette.subtle, bg = groups.panel },
+		WinBarNC = { fg = palette.muted, bg = groups.panel, blend = 60 },
 		WinSeparator = { fg = groups.border },
 
 		DiagnosticError = { fg = groups.error },
@@ -155,7 +213,7 @@ local function set_highlights()
 		String = { fg = palette.gold },
 		Structure = { fg = palette.foam },
 		Tag = { fg = palette.foam },
-		Todo = { fg = palette.iris, bg = palette.iris, blend = 20 },
+		Todo = { fg = palette.rose, bg = palette.rose, blend = 20 },
 		Type = { fg = palette.foam },
 		TypeDef = { link = "Type" },
 		Underlined = { fg = palette.iris, underline = true },
@@ -179,17 +237,17 @@ local function set_highlights()
 		htmlTagName = { fg = palette.foam },
 
 		markdownDelimiter = { fg = palette.subtle },
-		markdownH1 = { fg = groups.headings.h1, bold = styles.bold },
+		markdownH1 = { fg = groups.h1, bold = styles.bold },
 		markdownH1Delimiter = { link = "markdownH1" },
-		markdownH2 = { fg = groups.headings.h2, bold = styles.bold },
+		markdownH2 = { fg = groups.h2, bold = styles.bold },
 		markdownH2Delimiter = { link = "markdownH2" },
-		markdownH3 = { fg = groups.headings.h3, bold = styles.bold },
+		markdownH3 = { fg = groups.h3, bold = styles.bold },
 		markdownH3Delimiter = { link = "markdownH3" },
-		markdownH4 = { fg = groups.headings.h4, bold = styles.bold },
+		markdownH4 = { fg = groups.h4, bold = styles.bold },
 		markdownH4Delimiter = { link = "markdownH4" },
-		markdownH5 = { fg = groups.headings.h5, bold = styles.bold },
+		markdownH5 = { fg = groups.h5, bold = styles.bold },
 		markdownH5Delimiter = { link = "markdownH5" },
-		markdownH6 = { fg = groups.headings.h6, bold = styles.bold },
+		markdownH6 = { fg = groups.h6, bold = styles.bold },
 		markdownH6Delimiter = { link = "markdownH6" },
 		markdownLinkText = { link = "markdownUrl" },
 		markdownUrl = { fg = groups.link, sp = groups.link, underline = true },
@@ -207,93 +265,144 @@ local function set_highlights()
 		mkdRule = { fg = palette.subtle },
 		mkdURL = { link = "markdownUrl" },
 
-		["@attribute.diff"] = { fg = palette.gold },
-		["@boolean"] = { link = "Boolean" },
+		--- Identifiers
+		["@variable"] = { fg = palette.text, italic = styles.italic },
+		["@variable.builtin"] = { fg = palette.text, bold = styles.bold },
+		["@variable.parameter"] = { fg = palette.iris, italic = styles.italic },
+		["@variable.member"] = { fg = palette.foam },
+
+		["@constant"] = { fg = palette.gold },
+		["@constant.builtin"] = { fg = palette.gold, bold = styles.bold },
+		["@constant.macro"] = { fg = palette.gold },
+
+		["@module"] = { fg = palette.text },
+		["@module.builtin"] = { fg = palette.text, bold = styles.bold },
+		["@label"] = { link = "Label" },
+
+		--- Literals
+		["@string"] = { link = "String" },
+		-- ["@string.documentation"] = {},
+		["@string.regexp"] = { fg = palette.iris },
+		["@string.escape"] = { fg = palette.pine },
+		["@string.special"] = { link = "String" },
+		["@string.special.symbol"] = { link = "Identifier" },
+		["@string.special.url"] = { fg = groups.link },
+		-- ["@string.special.path"] = {},
+
 		["@character"] = { link = "Character" },
 		["@character.special"] = { link = "Character" },
-		["@class"] = { fg = palette.foam },
-		["@comment"] = { link = "Comment" },
-		["@conditional"] = { link = "Conditional" },
-		["@constant"] = { link = "Constant" },
-		["@constant.builtin"] = { fg = palette.love },
-		["@constant.macro"] = { link = "Constant" },
-		["@constructor"] = { fg = palette.foam },
-		["@field"] = { fg = palette.foam },
-		["@function"] = { link = "Function" },
-		["@function.builtin"] = { fg = palette.love },
+
+		["@boolean"] = { link = "Boolean" },
+		["@number"] = { link = "Number" },
+		["@number.float"] = { link = "Number" },
+
+		--- Types
+		["@type"] = { fg = palette.foam },
+		["@type.builtin"] = { fg = palette.foam, bold = styles.bold },
+		-- ["@type.definition"] = {},
+		-- ["@type.qualifier"] = {},
+
+		-- ["@attribute"] = {},
+		["@property"] = { fg = palette.foam, italic = styles.italic },
+
+		--- Functions
+		["@function"] = { fg = palette.rose },
+		["@function.builtin"] = { fg = palette.rose, bold = styles.bold },
+		-- ["@function.call"] = {},
 		["@function.macro"] = { link = "Function" },
-		["@include"] = { link = "Include" },
-		["@interface"] = { fg = palette.foam },
+		["@function.method"] = { fg = palette.rose },
+		["@function.method.call"] = { fg = palette.iris },
+
+		["@constructor"] = { fg = palette.foam },
+		["@operator"] = { link = "Operator" },
+
+		--- Keywords
 		["@keyword"] = { link = "Keyword" },
+		-- ["@keyword.coroutine"] = {},
+		-- ["@keyword.function"] = {},
 		["@keyword.operator"] = { fg = palette.subtle },
-		["@label"] = { link = "Label" },
+		["@keyword.import"] = { fg = palette.pine },
+		["@keyword.storage"] = { fg = palette.foam },
+		["@keyword.repeat"] = { fg = palette.pine },
+		["@keyword.return"] = { fg = palette.pine },
+		["@keyword.debug"] = { fg = palette.rose },
+		["@keyword.exception"] = { fg = palette.pine },
+		["@keyword.conditional"] = { fg = palette.pine },
+		["@keyword.conditional.ternary"] = { fg = palette.pine },
+		["@keyword.directive"] = { fg = palette.iris },
+		["@keyword.directive.define"] = { fg = palette.iris },
+
+		--- Punctuation
+		["@punctuation.delimiter"] = { fg = palette.subtle },
+		["@punctuation.bracket"] = { fg = palette.subtle },
+		["@punctuation.special"] = { fg = palette.subtle },
+
+		--- Comments
+		["@comment"] = { link = "Comment" },
+		-- ["@comment.documentation"] = {},
+
+		["@comment.error"] = { fg = groups.error },
+		["@comment.warning"] = { fg = groups.warn },
+		["@comment.todo"] = { fg = groups.todo, bg = groups.todo, blend = 20 },
+		["@comment.hint"] = { fg = groups.hint, bg = groups.hint, blend = 20 },
+		["@comment.info"] = { fg = groups.info, bg = groups.info, blend = 20 },
+		["@comment.note"] = { fg = groups.note, bg = groups.note, blend = 20 },
+
+		--- Markup
+		["@markup.strong"] = { bold = styles.bold },
+		["@markup.italic"] = { italic = styles.italic },
+		["@markup.strikethrough"] = { strikethrough = true },
+		["@markup.underline"] = { underline = true },
+
+		["@markup.heading"] = { fg = palette.foam, bold = styles.bold },
+
+		["@markup.quote"] = { fg = palette.subtle },
+		["@markup.math"] = { link = "Special" },
+		["@markup.environment"] = { link = "Macro" },
+		["@markup.environment.name"] = { link = "@type" },
+
+		-- ["@markup.link"] = {},
+		["@markup.link.label"] = { fg = palette.text },
+		["@markup.link.url"] = { fg = groups.link },
+
+		-- ["@markup.raw"] = { bg = palette.surface },
+		-- ["@markup.raw.block"] = { bg = palette.surface },
+
+		["@markup.list"] = { fg = palette.text },
+		["@markup.list.checked"] = { fg = palette.foam, bg = palette.foam, blend = 10 },
+		["@markup.list.unchecked"] = { fg = palette.text },
+
+		["@diff.plus"] = { fg = groups.git_add, bg = groups.git_add, blend = 20 },
+		["@diff.minus"] = { fg = groups.git_delete, bg = groups.git_delete, blend = 20 },
+		["@diff.delta"] = { bg = groups.git_change, blend = 20 },
+
+		["@tag"] = { link = "Tag" },
+		["@tag.attribute"] = { fg = palette.iris },
+		["@tag.delimiter"] = { fg = palette.subtle },
+
+		--- Non-highlighting captures
+		-- ["@none"] = {},
+		["@conceal"] = { link = "Conceal" },
+
+		-- ["@spell"] = {},
+		-- ["@nospell"] = {},
+
+		--- Semantic
 		["@lsp.type.comment"] = {},
-		["@lsp.type.enum"] = { link = "Type" },
+		["@lsp.type.enum"] = { link = "@type" },
 		["@lsp.type.interface"] = { link = "@interface" },
-		["@lsp.type.keyword"] = { link = "Keyword" },
+		["@lsp.type.keyword"] = { link = "@keyword" },
 		["@lsp.type.namespace"] = { link = "@namespace" },
 		["@lsp.type.parameter"] = { link = "@parameter" },
 		["@lsp.type.property"] = { link = "@property" },
 		["@lsp.type.variable"] = {},
-		["@lsp.typemod.function.defaultLibrary"] = { link = "Special" },
-		["@lsp.typemod.operator.injected"] = { link = "Operator" },
-		["@lsp.typemod.string.injected"] = { link = "String" },
+		["@lsp.typemod.function.defaultLibrary"] = { link = "@function.builtin" },
+		["@lsp.typemod.operator.injected"] = { link = "@operator" },
+		["@lsp.typemod.string.injected"] = { link = "@string" },
 		["@lsp.typemod.variable.defaultLibrary"] = { link = "@variable.builtin" },
 		["@lsp.typemod.variable.injected"] = { link = "@variable" },
-		["@macro"] = { link = "Macro" },
-		["@method"] = { fg = palette.rose },
-		["@namespace"] = { link = "Include" },
-		["@number"] = { link = "Number" },
-		["@operator"] = { link = "Operator" },
-		["@parameter"] = { fg = palette.iris, italic = styles.italic },
-		["@preproc"] = { link = "PreProc" },
-		["@property"] = { fg = palette.foam, italic = styles.italic },
-		["@punctuation"] = { fg = palette.subtle },
-		["@punctuation.bracket"] = { link = "@punctuation" },
-		["@punctuation.delimiter"] = { link = "@punctuation" },
-		["@punctuation.special"] = { link = "@punctuation" },
-		["@regexp"] = { link = "String" },
-		["@repeat"] = { link = "Repeat" },
-		["@storageclass"] = { link = "StorageClass" },
-		["@string"] = { link = "String" },
-		["@string.escape"] = { fg = palette.pine },
-		["@string.special"] = { link = "String" },
-		["@symbol"] = { link = "Identifier" },
-		["@tag"] = { link = "Tag" },
-		["@tag.attribute"] = { fg = palette.iris },
-		["@tag.delimiter"] = { fg = palette.subtle },
-		["@text"] = { fg = palette.text },
-		["@text.danger"] = { fg = groups.error },
-		["@text.diff.add"] = { fg = groups.git_add, bg = groups.git_add, blend = 20 },
-		["@text.diff.delete"] = { fg = groups.git_delete, bg = groups.git_delete, blend = 20 },
-		["@text.emphasis"] = { italic = styles.italic },
-		["@text.environment"] = { link = "Macro" },
-		["@text.environment.name"] = { link = "Type" },
-		["@text.math"] = { link = "Special" },
-		["@text.note"] = { link = "SpecialComment" },
-		["@text.strike"] = { strikethrough = true },
-		["@text.strong"] = { bold = styles.bold },
-		["@text.title"] = { link = "Title" },
-		["@text.title.1.markdown"] = { link = "markdownH1" },
-		["@text.title.1.marker.markdown"] = { link = "markdownH1Delimiter" },
-		["@text.title.2.markdown"] = { link = "markdownH2" },
-		["@text.title.2.marker.markdown"] = { link = "markdownH2Delimiter" },
-		["@text.title.3.markdown"] = { link = "markdownH3" },
-		["@text.title.3.marker.markdown"] = { link = "markdownH3Delimiter" },
-		["@text.title.4.markdown"] = { link = "markdownH4" },
-		["@text.title.4.marker.markdown"] = { link = "markdownH4Delimiter" },
-		["@text.title.5.markdown"] = { link = "markdownH5" },
-		["@text.title.5.marker.markdown"] = { link = "markdownH5Delimiter" },
-		["@text.title.6.markdown"] = { link = "markdownH6" },
-		["@text.title.6.marker.markdown"] = { link = "markdownH6Delimiter" },
-		["@text.underline"] = { underline = true },
-		["@text.uri"] = { fg = groups.link },
-		["@text.warning"] = { fg = groups.warn },
-		["@todo"] = { link = "Todo" },
-		["@type"] = { link = "Type" },
-		["@variable"] = { fg = palette.text, italic = styles.italic },
-		["@variable.builtin"] = { fg = palette.love },
 
+		--- Plugins
 		-- romgrk/barbar.nvim
 		BufferCurrent = { fg = palette.text, bg = palette.overlay },
 		BufferCurrentIndex = { fg = palette.text, bg = palette.overlay },
@@ -347,7 +456,7 @@ local function set_highlights()
 		NvimTreeNormal = { link = "Normal" },
 		NvimTreeOpenedFile = { fg = palette.text, bg = palette.overlay },
 		NvimTreeOpenedFolderName = { link = "NvimTreeFolderName" },
-		NvimTreeRootFolder = make_title(),
+		NvimTreeRootFolder = { fg = palette.foam, bold = styles.bold },
 		NvimTreeSpecialFile = { link = "NvimTreeNormal" },
 		NvimTreeWindowPicker = { link = "StatusLineTerm" },
 
@@ -377,11 +486,6 @@ local function set_highlights()
 		IblScope = { fg = palette.foam },
 		IblWhitespace = { fg = palette.overlay },
 
-		-- for legacy usage
-		IndentBlanklineChar = { fg = palette.muted, nocombine = true },
-		IndentBlanklineSpaceChar = { fg = palette.muted, nocombine = true },
-		IndentBlanklineSpaceCharBlankline = { fg = palette.muted, nocombine = true },
-
 		-- hrsh7th/nvim-cmp
 		CmpItemAbbr = { fg = palette.subtle },
 		CmpItemAbbrDeprecated = { fg = palette.subtle, strikethrough = true },
@@ -438,7 +542,7 @@ local function set_highlights()
 		NeorgHeading5Title = { link = "markdownH5" },
 		NeorgHeading6Prefix = { link = "markdownH6Delimiter" },
 		NeorgHeading6Title = { link = "markdownH6" },
-		NeorgMarkerTitle = make_title(),
+		NeorgMarkerTitle = { fg = palette.foam, bold = styles.bold },
 
 		-- tami5/lspsaga.nvim (fork of glepnir/lspsaga.nvim)
 		DefinitionCount = { fg = palette.rose },
@@ -453,7 +557,7 @@ local function set_highlights()
 		LspSagaCodeActionTruncateLine = { link = "LspSagaCodeActionBorder" },
 		LspSagaDefPreviewBorder = make_border(),
 		LspSagaDiagnosticBorder = make_border(palette.gold),
-		LspSagaDiagnosticHeader = make_title(),
+		LspSagaDiagnosticHeader = { fg = palette.foam, bold = styles.bold },
 		LspSagaDiagnosticTruncateLine = { link = "LspSagaDiagnosticBorder" },
 		LspSagaDocTruncateLine = { link = "LspSagaHoverBorder" },
 		LspSagaFinderSelection = { fg = palette.gold },
@@ -497,11 +601,11 @@ local function set_highlights()
 		TelescopePromptPrefix = { fg = palette.subtle },
 		TelescopeSelection = { fg = palette.text, bg = palette.overlay },
 		TelescopeSelectionCaret = { fg = palette.rose, bg = palette.overlay },
-		TelescopeTitle = make_title(),
+		TelescopeTitle = { fg = palette.foam, bold = styles.bold },
 
 		-- ibhagwan/fzf-lua
 		FzfLuaNormal = { link = "NormalFloat" },
-		FwzfLuaTitle = make_title(),
+		FwzfLuaTitle = { fg = palette.foam, bold = styles.bold },
 		FzfLuaBorder = make_border(),
 		FzfLuaHeaderText = { fg = palette.love },
 		FzfLuaHeaderBind = { fg = palette.rose },
@@ -606,7 +710,6 @@ local function set_highlights()
 		-- github/copilot.vim
 		CopilotSuggestion = { fg = palette.muted, italic = styles.italic },
 	}
-
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },
 		DiagnosticVirtualTextHint = { fg = groups.hint },
@@ -626,6 +729,9 @@ local function set_highlights()
 		TabLineFill = { bg = "NONE" },
 		TabLineSel = { fg = palette.text, bg = "NONE", bold = styles.bold },
 
+		-- ["@markup.raw"] = { bg = "none" },
+		-- ["@markup.raw.block"] = { bg = "none" },
+
 		TelescopeNormal = { fg = palette.subtle, bg = "NONE" },
 		TelescopePromptNormal = { fg = palette.text, bg = "NONE" },
 		TelescopeSelection = { fg = palette.text, bg = "NONE", bold = styles.bold },
@@ -643,31 +749,57 @@ local function set_highlights()
 		MiniPickPrompt = { bg = "NONE", bold = styles.bold },
 	}
 
+	if config.options.enable.legacy_highlights then
+		for group, highlight in pairs(legacy_highlights) do
+			highlights[group] = highlight
+		end
+	end
+	for group, highlight in pairs(default_highlights) do
+		highlights[group] = highlight
+	end
 	if styles.transparency then
 		for group, highlight in pairs(transparency_highlights) do
 			highlights[group] = highlight
 		end
 	end
 
-	for group, options in pairs(config.options.highlight_groups) do
-		local default_opts = highlights[group] or {}
+	-- Reconcile highlights with config
+	if config.options.highlight_groups ~= nil and next(config.options.highlight_groups) ~= nil then
+		for group, highlight in pairs(config.options.highlight_groups) do
+			local existing = highlights[group] or {}
+			local parsed = vim.tbl_extend("force", {}, highlight)
 
-		if (options.inherit == nil or options.inherit) and default_opts ~= nil then -- On merge.
-			options.inherit = nil -- Don't add this key to the highlight_group after merge.
-			highlights[group] = vim.tbl_extend("force", default_opts, options)
-		else -- On overwrite.
-			options.inherit = nil -- Don't add this key to the highlight_group.
-			highlights[group] = options
+			if highlight.fg ~= nil then
+				parsed.fg = utilities.parse_color(highlight.fg) or highlight.fg
+			end
+			if highlight.bg ~= nil then
+				parsed.bg = utilities.parse_color(highlight.bg) or highlight.bg
+			end
+			if highlight.sp ~= nil then
+				parsed.sp = utilities.parse_color(highlight.sp) or highlight.sp
+			end
+
+			if (highlight.inherit == nil or highlight.inherit) and existing ~= nil then
+				highlight.inherit = nil
+				highlights[group] = vim.tbl_extend("force", existing, parsed)
+			else
+				highlight.inherit = nil
+				highlights[group] = parsed
+			end
 		end
-
-		highlights[group] = vim.tbl_extend("force", highlights[group] or {}, options)
 	end
 
 	for group, highlight in pairs(highlights) do
-		config.options.before_highlight(group, highlight, palette)
-		utilities.highlight(group, highlight)
+		if config.options.before_highlight ~= nil then
+			config.options.before_highlight(group, highlight, palette)
+		end
+		if highlight.blend ~= nil and (highlight.blend >= 0 and highlight.blend <= 100) and highlight.bg ~= nil then
+			highlight.bg = utilities.blend(highlight.bg, highlight.blend_on or palette.base, highlight.blend / 100)
+		end
+		vim.api.nvim_set_hl(0, group, highlight)
 	end
 
+	--- Terminal
 	if config.options.enable.terminal then
 		vim.g.terminal_color_0 = palette.overlay -- black
 		vim.g.terminal_color_8 = palette.subtle -- bright black
diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index beed052..f127e33 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -1,7 +1,7 @@
 ---@alias Variant "main" | "moon" | "dawn"
 ---@alias Palette { base: string, surface: string, overlay: string, muted: string, subtle: string, text: string, love: string, gold: string, rose: string, pine: string, foam: string, iris: string }
 ---@alias PaletteColor "base" | "surface" | "overlay" | "muted" | "subtle" | "text" | "love" | "gold" | "rose" | "pine" | "foam" | "iris" | "highlight_low" | "highlight_med" | "highlight_high"
----@alias Highlight { fg: string, bg: string, sp: string, bold: boolean, italic: boolean, undercurl: boolean, underline: boolean, underdouble: boolean, underdotted: boolean, underdashed: boolean, strikethrough: boolean }
+---@alias Highlight { fg: string, bg: string, sp: string, bold: boolean, italic: boolean, undercurl: boolean, underline: boolean, underdouble: boolean, underdotted: boolean, underdashed: boolean, strikethrough: boolean, inherit: boolean }
 
 local config = {}
 
@@ -24,8 +24,9 @@ config.options = {
 	extend_background_behind_borders = true,
 
 	enable = {
-		terminal = true,
+		legacy_highlights = true,
 		migrations = true,
+		terminal = true,
 	},
 
 	styles = {
@@ -43,6 +44,8 @@ config.options = {
 		error = "love",
 		hint = "iris",
 		info = "foam",
+		note = "pine",
+		todo = "rose",
 		warn = "gold",
 
 		git_add = "foam",
@@ -56,15 +59,13 @@ config.options = {
 		git_text = "rose",
 		git_untracked = "subtle",
 
-		---@type string | PaletteColor | table<string, string | PaletteColor>
-		headings = {
-			h1 = "iris",
-			h2 = "foam",
-			h3 = "rose",
-			h4 = "gold",
-			h5 = "pine",
-			h6 = "foam",
-		},
+		---@type string | PaletteColor
+		h1 = "iris",
+		h2 = "foam",
+		h3 = "rose",
+		h4 = "gold",
+		h5 = "pine",
+		h6 = "foam",
 
 		---@deprecated Replaced by `options.highlight_groups["Normal"]`
 		-- background = "base",
@@ -72,6 +73,8 @@ config.options = {
 		-- comment = "subtle",
 		---@deprecated Replaced by `options.highlight_groups["@punctuation"]`
 		-- punctuation = "muted",
+		---@deprecated Expects a table with values h1...h6
+		-- headings = "text",
 	},
 
 	---@type table<string, Highlight>
@@ -103,6 +106,10 @@ local function migrate(options)
 		options.highlight_groups["WinSeparator"] = { fg = border, bg = border }
 	end
 
+	if options.disable_background then
+		options.highlight_groups["Normal"] = { bg = "NONE" }
+	end
+
 	if options.disable_float_background then
 		options.highlight_groups["NormalFloat"] = { bg = "NONE" }
 	end
@@ -121,7 +128,8 @@ local function migrate(options)
 		options.highlight_groups["@punctuation"] = { fg = options.groups.punctuation }
 	end
 
-	options.styles.transparency = options.disable_background or options.styles.transparency
+	options.styles.transparency = (options.disable_background and options.disable_float_background)
+		or options.styles.transparency
 
 	-- These never actually existed, but may be set intuitively by the user
 	-- because of `disable_italics` existing.
@@ -142,6 +150,14 @@ local function migrate(options)
 			h6 = options.groups.headings,
 		}
 	end
+	if type(options.groups.headings) == "table" then
+		options.groups.h1 = options.groups.headings.h1 or options.groups.h1
+		options.groups.h2 = options.groups.headings.h2 or options.groups.h2
+		options.groups.h3 = options.groups.headings.h3 or options.groups.h3
+		options.groups.h4 = options.groups.headings.h4 or options.groups.h4
+		options.groups.h5 = options.groups.headings.h5 or options.groups.h5
+		options.groups.h6 = options.groups.headings.h6 or options.groups.h6
+	end
 
 	return options
 end
diff --git a/lua/rose-pine/utilities.lua b/lua/rose-pine/utilities.lua
index e4c72cc..26e019e 100644
--- a/lua/rose-pine/utilities.lua
+++ b/lua/rose-pine/utilities.lua
@@ -15,9 +15,9 @@ local function color_to_rgb(color)
 end
 
 ---@param color string Palette key or hex value
-local function parse_color(color)
+function utilities.parse_color(color)
 	if color == nil then
-		return print("Invalid color")
+		return print("Invalid color: " .. color)
 	end
 
 	color = color:lower()
@@ -32,7 +32,7 @@ end
 ---@param fg string Foreground color
 ---@param bg string Background color
 ---@param alpha number Between 0 (background) and 1 (foreground)
-local function blend(fg, bg, alpha)
+function utilities.blend(fg, bg, alpha)
 	local fg_rgb = color_to_rgb(fg)
 	local bg_rgb = color_to_rgb(bg)
 
@@ -44,23 +44,4 @@ local function blend(fg, bg, alpha)
 	return string.format("#%02X%02X%02X", blend_channel(1), blend_channel(2), blend_channel(3))
 end
 
----@param group string
----@param highlight table<string, any>
-function utilities.highlight(group, highlight, blend_on)
-	local fg = highlight.fg and parse_color(highlight.fg) or "NONE"
-	local bg = highlight.bg and parse_color(highlight.bg) or "NONE"
-	local sp = highlight.sp and parse_color(highlight.sp) or "NONE"
-
-	if highlight.blend ~= nil and (highlight.blend >= 0 and highlight.blend <= 100) and bg ~= nil then
-		bg = blend(bg, blend_on or require("rose-pine.palette").base, highlight.blend / 100)
-	end
-
-	highlight.fg = fg
-	highlight.bg = bg
-	highlight.sp = sp
-	-- highlight = vim.tbl_extend("force", highlight, { fg = fg, bg = bg, sp = sp })
-
-	vim.api.nvim_set_hl(0, group, highlight)
-end
-
 return utilities
diff --git a/readme.md b/readme.md
index 0c13fae..7a4a93d 100644
--- a/readme.md
+++ b/readme.md
@@ -57,6 +57,14 @@ require('rose-pine').setup({
     dim_inactive_windows = false,
     extend_background_behind_borders = true,
 
+    enable = {
+        terminal = true,
+        -- Improve compatibility for previous versions of Neovim
+        legacy_highlights = true,
+	-- Handle deprecated options automatically
+        migrations = true,
+    },
+
     styles = {
         bold = true,
         italic = true,
@@ -71,6 +79,8 @@ require('rose-pine').setup({
         error = "love",
         hint = "iris",
         info = "foam",
+        note = "pine",
+        todo = "rose",
         warn = "gold",
 
         git_add = "foam",
@@ -84,16 +94,12 @@ require('rose-pine').setup({
         git_text = "rose",
         git_untracked = "subtle",
 
-        headings = {
-            h1 = "iris",
-            h2 = "foam",
-            h3 = "rose",
-            h4 = "gold",
-            h5 = "pine",
-            h6 = "foam",
-        },
-        -- Alternatively, set all headings at once.
-        -- headings = "subtle",
+        h1 = "iris",
+        h2 = "foam",
+        h3 = "rose",
+        h4 = "gold",
+        h5 = "pine",
+        h6 = "foam",
     },
 
     highlight_groups = {
@@ -125,6 +131,6 @@ vim.cmd('colorscheme rose-pine')
 
 ## Contributing
 
-We welcome and appreciate contributions of any kind. Create an issue or start a discussion for any proposed changes. Pull requests are encouraged for supporting additional plugins.
+We welcome and appreciate contributions of any kind. Create an issue or start a discussion for any proposed changes. Pull requests are encouraged for supporting additional plugins or [treesitter improvements](https://github.com/nvim-treesitter/nvim-treesitter/blob/master/CONTRIBUTING.md#highlights).
 
 Feel free to update the [wiki](https://github.com/rose-pine/neovim/wiki/) with any [recipes](https://github.com/rose-pine/neovim/wiki/Recipes).

From e62a61166ebfa2e5fdad4993310b290ac9b905c1 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Fri, 26 Jan 2024 21:43:53 -0600
Subject: [PATCH 109/190] fix: regression in options (#221)

* fix: headings not migrating to flat options

* fix: invalid key when using inherit
---
 lua/rose-pine.lua        |  4 ++--
 lua/rose-pine/config.lua | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 9240a51..c546297 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -780,10 +780,10 @@ local function set_highlights()
 			end
 
 			if (highlight.inherit == nil or highlight.inherit) and existing ~= nil then
-				highlight.inherit = nil
+				parsed.inherit = nil
 				highlights[group] = vim.tbl_extend("force", existing, parsed)
 			else
-				highlight.inherit = nil
+				parsed.inherit = nil
 				highlights[group] = parsed
 			end
 		end
diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index f127e33..cb99137 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -141,16 +141,13 @@ local function migrate(options)
 
 	-- Set h1 through h6 to the same color if only one is specified
 	if type(options.groups.headings) == "string" then
-		options.groups.headings = {
-			h1 = options.groups.headings,
-			h2 = options.groups.headings,
-			h3 = options.groups.headings,
-			h4 = options.groups.headings,
-			h5 = options.groups.headings,
-			h6 = options.groups.headings,
-		}
-	end
-	if type(options.groups.headings) == "table" then
+		options.groups.h1 = options.groups.headings
+		options.groups.h2 = options.groups.headings
+		options.groups.h3 = options.groups.headings
+		options.groups.h4 = options.groups.headings
+		options.groups.h5 = options.groups.headings
+		options.groups.h6 = options.groups.headings
+	elseif options.groups.headings == "table" then
 		options.groups.h1 = options.groups.headings.h1 or options.groups.h1
 		options.groups.h2 = options.groups.headings.h2 or options.groups.h2
 		options.groups.h3 = options.groups.headings.h3 or options.groups.h3
@@ -158,6 +155,7 @@ local function migrate(options)
 		options.groups.h5 = options.groups.headings.h5 or options.groups.h5
 		options.groups.h6 = options.groups.headings.h6 or options.groups.h6
 	end
+	options.groups.headings = nil
 
 	return options
 end

From 8514c638bce309dbfc5bd42de4e1f8fb5622875a Mon Sep 17 00:00:00 2001
From: Wahyu Wiyoko <137708513+wahyuwiyoko@users.noreply.github.com>
Date: Sat, 27 Jan 2024 23:43:15 +0800
Subject: [PATCH 110/190] fix: misspelled highlight group name (#223)

---
 lua/rose-pine.lua                    |   8 +-
 lua/rose-pine/plugins/bufferline.lua | 190 +++++++++++++--------------
 lua/rose-pine/plugins/galaxyline.lua |   2 +-
 lua/rose-pine/plugins/markid.lua     |   2 +-
 lua/rose-pine/plugins/toggleterm.lua |   4 +-
 readme.md                            |  20 ++-
 6 files changed, 112 insertions(+), 114 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index c546297..fe5f331 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -202,8 +202,8 @@ local function set_highlights()
 		Macro = { fg = palette.iris },
 		Number = { fg = palette.gold },
 		Operator = { fg = palette.subtle },
-		PreConduit = { fg = palette.iris },
-		PreProc = { link = "PreConduit" },
+		PreCondit = { fg = palette.iris },
+		PreProc = { link = "PreCondit" },
 		Repeat = { fg = palette.pine },
 		Special = { fg = palette.foam },
 		SpecialChar = { link = "Special" },
@@ -547,7 +547,7 @@ local function set_highlights()
 		-- tami5/lspsaga.nvim (fork of glepnir/lspsaga.nvim)
 		DefinitionCount = { fg = palette.rose },
 		DefinitionIcon = { fg = palette.rose },
-		DefintionPreviewTitle = { fg = palette.rose, bold = styles.bold },
+		DefinitionPreviewTitle = { fg = palette.rose, bold = styles.bold },
 		LspFloatWinBorder = make_border(),
 		LspFloatWinNormal = { bg = groups.panel },
 		LspSagaAutoPreview = { fg = palette.subtle },
@@ -605,7 +605,7 @@ local function set_highlights()
 
 		-- ibhagwan/fzf-lua
 		FzfLuaNormal = { link = "NormalFloat" },
-		FwzfLuaTitle = { fg = palette.foam, bold = styles.bold },
+		FzfLuaTitle = { fg = palette.foam, bold = styles.bold },
 		FzfLuaBorder = make_border(),
 		FzfLuaHeaderText = { fg = palette.love },
 		FzfLuaHeaderBind = { fg = palette.rose },
diff --git a/lua/rose-pine/plugins/bufferline.lua b/lua/rose-pine/plugins/bufferline.lua
index 9f85ccd..7a96026 100644
--- a/lua/rose-pine/plugins/bufferline.lua
+++ b/lua/rose-pine/plugins/bufferline.lua
@@ -2,43 +2,43 @@
 --- https://github.com/akinsho/bufferline.nvim
 ---
 --- @usage
---- local highlights = require('rose-pine.plugins.bufferline')
---- require('bufferline').setup({ highlights = highlights })
+--- local highlights = require("rose-pine.plugins.bufferline")
+--- require("bufferline").setup({ highlights = highlights })
 
 local p = require("rose-pine.palette")
 
 return {
 	-- fill = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- background = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- tab = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	tab_selected = {
 		fg = p.text,
 		bg = p.overlay,
 	},
 	-- tab_close = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- close_button = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- close_button_visible = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- close_button_selected = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	buffer_visible = {
 		fg = p.subtle,
@@ -51,172 +51,172 @@ return {
 		italic = true,
 	},
 	-- diagnostic = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- diagnostic_visible = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- diagnostic_selected = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- 	bold = true,
 	-- 	italic = true,
 	-- },
 	-- info = {
-	-- 	fg = '<color-value-here>',
-	-- 	sp = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	sp = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- info_visible = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- info_selected = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- 	bold = true,
 	-- 	italic = true,
-	-- 	sp = '<color-value-here>',
+	-- 	sp = "<color-value-here>",
 	-- },
 	-- info_diagnostic = {
-	-- 	fg = '<color-value-here>',
-	-- 	sp = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	sp = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- info_diagnostic_visible = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- info_diagnostic_selected = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- 	bold = true,
 	-- 	italic = true,
-	-- 	sp = '<color-value-here>',
+	-- 	sp = "<color-value-here>",
 	-- },
 	-- warning = {
-	-- 	fg = '<color-value-here>',
-	-- 	sp = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	sp = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- warning_visible = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- warning_selected = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- 	bold = true,
 	-- 	italic = true,
-	-- 	sp = '<color-value-here>',
+	-- 	sp = "<color-value-here>",
 	-- },
 	-- warning_diagnostic = {
-	-- 	fg = '<color-value-here>',
-	-- 	sp = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	sp = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- warning_diagnostic_visible = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- warning_diagnostic_selected = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- 	bold = true,
 	-- 	italic = true,
 	-- 	sp = warning_diagnostic_fg,
 	-- },
 	-- error = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
-	-- 	sp = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
+	-- 	sp = "<color-value-here>",
 	-- },
 	-- error_visible = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- error_selected = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- 	bold = true,
 	-- 	italic = true,
-	-- 	sp = '<color-value-here>',
+	-- 	sp = "<color-value-here>",
 	-- },
 	-- error_diagnostic = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
-	-- 	sp = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
+	-- 	sp = "<color-value-here>",
 	-- },
 	-- error_diagnostic_visible = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- error_diagnostic_selected = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- 	bold = true,
 	-- 	italic = true,
-	-- 	sp = '<color-value-here>',
+	-- 	sp = "<color-value-here>",
 	-- },
 	-- modified = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- modified_visible = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- modified_selected = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- duplicate_selected = {
-	-- 	fg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
 	-- 	italic = true,
-	-- 	bg = '<color-value-here>',
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- duplicate_visible = {
-	-- 	fg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
 	-- 	italic = true,
-	-- 	bg = '<color-value-here>',
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- duplicate = {
-	-- 	fg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
 	-- 	italic = true,
-	-- 	bg = '<color-value-here>',
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- separator_selected = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- separator_visible = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- separator = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- indicator_selected = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- },
 	-- pick_selected = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- 	italic = true,
 	-- },
 	-- pick_visible = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- 	bold = true,
 	-- 	italic = true,
 	-- },
 	-- pick = {
-	-- 	fg = '<color-value-here>',
-	-- 	bg = '<color-value-here>',
+	-- 	fg = "<color-value-here>",
+	-- 	bg = "<color-value-here>",
 	-- 	bold = true,
 	-- 	italic = true,
 	-- },
diff --git a/lua/rose-pine/plugins/galaxyline.lua b/lua/rose-pine/plugins/galaxyline.lua
index f2c01ab..05d9b28 100644
--- a/lua/rose-pine/plugins/galaxyline.lua
+++ b/lua/rose-pine/plugins/galaxyline.lua
@@ -2,7 +2,7 @@
 --- https://github.com/NTBBloodbath/galaxyline.nvim
 ---
 --- @usage
---- local highlights = require('rose-pine.plugins.galaxyline')
+--- local highlights = require("rose-pine.plugins.galaxyline")
 
 local p = require("rose-pine.palette")
 
diff --git a/lua/rose-pine/plugins/markid.lua b/lua/rose-pine/plugins/markid.lua
index 2a7b273..3d6d8f9 100644
--- a/lua/rose-pine/plugins/markid.lua
+++ b/lua/rose-pine/plugins/markid.lua
@@ -2,7 +2,7 @@
 --- https://github.com/David-Kunz/markid
 ---
 --- @usage
---- local highlights = require('rose-pine.plugins.markid')
+--- local highlights = require("rose-pine.plugins.markid")
 --- require("nvim-treesitter.configs").setup({ markid = { enable = true, colors = highlights } })
 
 local p = require("rose-pine.palette")
diff --git a/lua/rose-pine/plugins/toggleterm.lua b/lua/rose-pine/plugins/toggleterm.lua
index 87b0abc..7f808eb 100644
--- a/lua/rose-pine/plugins/toggleterm.lua
+++ b/lua/rose-pine/plugins/toggleterm.lua
@@ -2,8 +2,8 @@
 --- https://github.com/akinsho/toggleterm.nvim
 ---
 --- @usage
---- local highlights = require('rose-pine.plugins.toggleterm')
---- require('toggleterm').setup({ highlights = highlights })
+--- local highlights = require("rose-pine.plugins.toggleterm")
+--- require("toggleterm").setup({ highlights = highlights })
 
 return {
 	Normal = { link = "Normal" },
diff --git a/readme.md b/readme.md
index 7a4a93d..7c1ac9b 100644
--- a/readme.md
+++ b/readme.md
@@ -18,13 +18,13 @@ Install `rose-pine/neovim` using your favourite plugin manager:
 **paq-nvim**
 
 ```lua
-{ 'rose-pine/neovim', as = 'rose-pine' }
+{ "rose-pine/neovim", as = "rose-pine" }
 ```
 
 **lazy.nvim**
 
 ```lua
-{ 'rose-pine/neovim', name = 'rose-pine' }
+{ "rose-pine/neovim", name = "rose-pine" }
 ```
 
 ## Gallery
@@ -51,7 +51,7 @@ Rosé Pine has three variants: main, moon, and dawn. By default, `vim.o.backgrou
 Colour values accept named colours from the [Rosé Pine palette](https://rosepinetheme.com/palette/ingredients/), e.g. "foam", or valid hex, e.g. "#fa8072".
 
 ```lua
-require('rose-pine').setup({
+require("rose-pine").setup({
     variant = "auto", -- auto, main, moon, or dawn
     dark_variant = "main", -- main, moon, or dawn
     dim_inactive_windows = false,
@@ -59,10 +59,8 @@ require('rose-pine').setup({
 
     enable = {
         terminal = true,
-        -- Improve compatibility for previous versions of Neovim
-        legacy_highlights = true,
-	-- Handle deprecated options automatically
-        migrations = true,
+        legacy_highlights = true, -- Improve compatibility for previous versions of Neovim
+        migrations = true, -- Handle deprecated options automatically
     },
 
     styles = {
@@ -120,10 +118,10 @@ require('rose-pine').setup({
     end,
 })
 
-vim.cmd('colorscheme rose-pine')
--- vim.cmd('colorscheme rose-pine-main')
--- vim.cmd('colorscheme rose-pine-moon')
--- vim.cmd('colorscheme rose-pine-dawn')
+vim.cmd("colorscheme rose-pine")
+-- vim.cmd("colorscheme rose-pine-main")
+-- vim.cmd("colorscheme rose-pine-moon")
+-- vim.cmd("colorscheme rose-pine-dawn")
 ```
 
 > [!NOTE]

From 0b77ef0e7ba20f6de9efb991bd46379144b534ba Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sat, 27 Jan 2024 20:34:00 -0600
Subject: [PATCH 111/190] chore: update variable highlights (#226)

---
 lua/rose-pine.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index fe5f331..82c7c15 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -267,7 +267,7 @@ local function set_highlights()
 
 		--- Identifiers
 		["@variable"] = { fg = palette.text, italic = styles.italic },
-		["@variable.builtin"] = { fg = palette.text, bold = styles.bold },
+		["@variable.builtin"] = { fg = palette.love, bold = styles.bold },
 		["@variable.parameter"] = { fg = palette.iris, italic = styles.italic },
 		["@variable.member"] = { fg = palette.foam },
 
@@ -395,7 +395,7 @@ local function set_highlights()
 		["@lsp.type.namespace"] = { link = "@namespace" },
 		["@lsp.type.parameter"] = { link = "@parameter" },
 		["@lsp.type.property"] = { link = "@property" },
-		["@lsp.type.variable"] = {},
+		["@lsp.type.variable"] = { link = "@variable" },
 		["@lsp.typemod.function.defaultLibrary"] = { link = "@function.builtin" },
 		["@lsp.typemod.operator.injected"] = { link = "@operator" },
 		["@lsp.typemod.string.injected"] = { link = "@string" },

From 4452ecd14092c7d9be3ae584611e539a03d6b09a Mon Sep 17 00:00:00 2001
From: Eric Milford <github@heyheyhey.email>
Date: Sat, 27 Jan 2024 21:02:37 -0600
Subject: [PATCH 112/190] feat: Add support for Neotest (#225)

https://github.com/nvim-neotest/neotest/
---
 lua/rose-pine.lua | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 82c7c15..0a8081a 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -460,6 +460,26 @@ local function set_highlights()
 		NvimTreeSpecialFile = { link = "NvimTreeNormal" },
 		NvimTreeWindowPicker = { link = "StatusLineTerm" },
 
+		-- nvim-neotest/neotest
+		NeotestAdapterName = { fg = palette.iris },
+		NeotestBorder = { fg = palette.highlight_med },
+		NeotestDir = { fg = palette.foam },
+		NeotestExpandMarker = { fg = palette.highlight_med },
+		NeotestFailed = { fg = palette.love },
+		NeotestFile = { fg = palette.text },
+		NeotestFocused = { fg = palette.gold, bg = palette.highlight_med },
+		NeotestIndent = { fg = "" },
+		NeotestMarked = { fg = palette.rose, bold = styles.bold },
+		NeotestNamespace = { fg = palette.gold },
+		NeotestPassed = { fg = palette.pine },
+		NeotestRunning = { fg = palette.gold },
+		NeotestWinSelect = { fg = palette.muted },
+		NeotestSkipped = { fg = palette.subtle },
+		NeotestTarget = { fg = palette.love },
+		NeotestTest = { fg = palette.gold },
+		NeotestUnknown = { fg = palette.subtle },
+		NeotestWatching = { fg = palette.iris },
+
 		-- nvim-neo-tree/neo-tree.nvim
 		NeoTreeGitAdded = { fg = groups.git_add },
 		NeoTreeGitConflict = { fg = groups.git_merge },

From 75d145fa0880294c78ca946247bdbc8dd2d309d1 Mon Sep 17 00:00:00 2001
From: Maxim Kozhukh <89997671+nicejji@users.noreply.github.com>
Date: Mon, 29 Jan 2024 18:48:02 +0300
Subject: [PATCH 113/190] fix: unable to override linked groups (#230)

---
 lua/rose-pine.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 0a8081a..d0b2324 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -787,6 +787,12 @@ local function set_highlights()
 	if config.options.highlight_groups ~= nil and next(config.options.highlight_groups) ~= nil then
 		for group, highlight in pairs(config.options.highlight_groups) do
 			local existing = highlights[group] or {}
+			-- Traverse link due to
+			-- "If link is used in combination with other attributes; only the link will take effect"
+			-- see: https://neovim.io/doc/user/api.html#nvim_set_hl()
+			while existing.link ~= nil do
+				existing = highlights[existing.link] or {}
+			end
 			local parsed = vim.tbl_extend("force", {}, highlight)
 
 			if highlight.fg ~= nil then

From 9d0e1b70d9de879be2dde1f2b1c69a6958d4083a Mon Sep 17 00:00:00 2001
From: Lin Tinusgrag <l2441473911@163.com>
Date: Mon, 29 Jan 2024 23:54:19 +0800
Subject: [PATCH 114/190] feat: make markdown headings distinguishable with
 treesitter (#232)

---
 lua/rose-pine.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index d0b2324..a965c28 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -372,6 +372,20 @@ local function set_highlights()
 		["@markup.list.checked"] = { fg = palette.foam, bg = palette.foam, blend = 10 },
 		["@markup.list.unchecked"] = { fg = palette.text },
 
+		-- Markdown headings
+		["@markup.heading.1.markdown"] = { link = "markdownH1" },
+		["@markup.heading.2.markdown"] = { link = "markdownH2" },
+		["@markup.heading.3.markdown"] = { link = "markdownH3" },
+		["@markup.heading.4.markdown"] = { link = "markdownH4" },
+		["@markup.heading.5.markdown"] = { link = "markdownH5" },
+		["@markup.heading.6.markdown"] = { link = "markdownH6" },
+		["@markup.heading.1.marker.markdown"] = { link = "markdownH1Delimiter" },
+		["@markup.heading.2.marker.markdown"] = { link = "markdownH2Delimiter" },
+		["@markup.heading.3.marker.markdown"] = { link = "markdownH3Delimiter" },
+		["@markup.heading.4.marker.markdown"] = { link = "markdownH4Delimiter" },
+		["@markup.heading.5.marker.markdown"] = { link = "markdownH5Delimiter" },
+		["@markup.heading.6.marker.markdown"] = { link = "markdownH6Delimiter" },
+
 		["@diff.plus"] = { fg = groups.git_add, bg = groups.git_add, blend = 20 },
 		["@diff.minus"] = { fg = groups.git_delete, bg = groups.git_delete, blend = 20 },
 		["@diff.delta"] = { bg = groups.git_change, blend = 20 },

From 95e97671656fe69e91eb77d6585fc3565773e4d5 Mon Sep 17 00:00:00 2001
From: Maxim Kozhukh <89997671+nicejji@users.noreply.github.com>
Date: Mon, 29 Jan 2024 18:57:21 +0300
Subject: [PATCH 115/190] feat: use treesitter highlights for
 @lsp.type.variable (#233)

---
 lua/rose-pine.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index a965c28..bd21454 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -409,7 +409,7 @@ local function set_highlights()
 		["@lsp.type.namespace"] = { link = "@namespace" },
 		["@lsp.type.parameter"] = { link = "@parameter" },
 		["@lsp.type.property"] = { link = "@property" },
-		["@lsp.type.variable"] = { link = "@variable" },
+		["@lsp.type.variable"] = {}, -- use treesitter styles for regular variables
 		["@lsp.typemod.function.defaultLibrary"] = { link = "@function.builtin" },
 		["@lsp.typemod.operator.injected"] = { link = "@operator" },
 		["@lsp.typemod.string.injected"] = { link = "@string" },

From 4372c4eb4970fc30a213d1fd2363d30df23386c8 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Thu, 8 Feb 2024 13:42:03 -0600
Subject: [PATCH 116/190] feat: improve markdown syntax (#237)

* types: update highlight type

* feat: improve markdown highlighting
---
 lua/rose-pine.lua        | 6 +++++-
 lua/rose-pine/config.lua | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index bd21454..60b3e3c 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -362,11 +362,13 @@ local function set_highlights()
 		["@markup.environment.name"] = { link = "@type" },
 
 		-- ["@markup.link"] = {},
-		["@markup.link.label"] = { fg = palette.text },
+		["@markup.link.markdown_inline"] = { fg = palette.subtle },
+		["@markup.link.label.markdown_inline"] = { fg = palette.foam },
 		["@markup.link.url"] = { fg = groups.link },
 
 		-- ["@markup.raw"] = { bg = palette.surface },
 		-- ["@markup.raw.block"] = { bg = palette.surface },
+		["@markup.raw.delimiter.markdown"] = { bg = palette.subtle },
 
 		["@markup.list"] = { fg = palette.text },
 		["@markup.list.checked"] = { fg = palette.foam, bg = palette.foam, blend = 10 },
@@ -397,6 +399,7 @@ local function set_highlights()
 		--- Non-highlighting captures
 		-- ["@none"] = {},
 		["@conceal"] = { link = "Conceal" },
+		["@conceal.markdown"] = { fg = palette.subtle },
 
 		-- ["@spell"] = {},
 		-- ["@nospell"] = {},
@@ -764,6 +767,7 @@ local function set_highlights()
 		TabLineSel = { fg = palette.text, bg = "NONE", bold = styles.bold },
 
 		-- ["@markup.raw"] = { bg = "none" },
+		["@markup.raw.markdown_inline"] = { fg = palette.gold },
 		-- ["@markup.raw.block"] = { bg = "none" },
 
 		TelescopeNormal = { fg = palette.subtle, bg = "NONE" },
diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index cb99137..7b6f8aa 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -1,7 +1,7 @@
 ---@alias Variant "main" | "moon" | "dawn"
 ---@alias Palette { base: string, surface: string, overlay: string, muted: string, subtle: string, text: string, love: string, gold: string, rose: string, pine: string, foam: string, iris: string }
 ---@alias PaletteColor "base" | "surface" | "overlay" | "muted" | "subtle" | "text" | "love" | "gold" | "rose" | "pine" | "foam" | "iris" | "highlight_low" | "highlight_med" | "highlight_high"
----@alias Highlight { fg: string, bg: string, sp: string, bold: boolean, italic: boolean, undercurl: boolean, underline: boolean, underdouble: boolean, underdotted: boolean, underdashed: boolean, strikethrough: boolean, inherit: boolean }
+---@alias Highlight { link: string, inherit: boolean } | { fg: string, bg: string, sp: string, bold: boolean, italic: boolean, undercurl: boolean, underline: boolean, underdouble: boolean, underdotted: boolean, underdashed: boolean, strikethrough: boolean, inherit: boolean }
 
 local config = {}
 

From ea3f15ca95f0c22632b2ed7093b8440c16efd26c Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Thu, 8 Feb 2024 13:44:50 -0600
Subject: [PATCH 117/190] fix: markdown delimiter (#238)

---
 lua/rose-pine.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 60b3e3c..2085b4d 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -368,7 +368,7 @@ local function set_highlights()
 
 		-- ["@markup.raw"] = { bg = palette.surface },
 		-- ["@markup.raw.block"] = { bg = palette.surface },
-		["@markup.raw.delimiter.markdown"] = { bg = palette.subtle },
+		["@markup.raw.delimiter.markdown"] = { fg = palette.subtle },
 
 		["@markup.list"] = { fg = palette.text },
 		["@markup.list.checked"] = { fg = palette.foam, bg = palette.foam, blend = 10 },

From e28cda232b7571e0c97cd079bb8a8429d7f7a47c Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sun, 11 Feb 2024 20:11:47 -0600
Subject: [PATCH 118/190] feat: prioritise semantic variable highlighting
 (#240)

---
 lua/rose-pine.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 2085b4d..40ba83e 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -412,7 +412,7 @@ local function set_highlights()
 		["@lsp.type.namespace"] = { link = "@namespace" },
 		["@lsp.type.parameter"] = { link = "@parameter" },
 		["@lsp.type.property"] = { link = "@property" },
-		["@lsp.type.variable"] = {}, -- use treesitter styles for regular variables
+		["@lsp.type.variable"] = { link = "@variable" },
 		["@lsp.typemod.function.defaultLibrary"] = { link = "@function.builtin" },
 		["@lsp.typemod.operator.injected"] = { link = "@operator" },
 		["@lsp.typemod.string.injected"] = { link = "@string" },

From 12ace889a0f65d4b8eb49dd286ff76947d24fbe1 Mon Sep 17 00:00:00 2001
From: Fitrah <fitrahm17h@student.unhas.ac.id>
Date: Wed, 14 Feb 2024 23:58:18 +0800
Subject: [PATCH 119/190] fix(migrate): avoid ternary 'falls through' state
 (#242)

See: https://riptutorial.com/lua/example/26503/emulating-ternary-operator-with--and---or--logical-operators-#undefined
---
 lua/rose-pine/config.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index 7b6f8aa..562d2a4 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -133,11 +133,11 @@ local function migrate(options)
 
 	-- These never actually existed, but may be set intuitively by the user
 	-- because of `disable_italics` existing.
-	options.styles.bold = (options.disable_bold or options.disable_bolds) and false or options.styles.bold
+	options.styles.bold = not (options.disable_bold or options.disable_bolds) and options.styles.bold or false
 
 	-- Similar to bold options, `disable_italic` never existed but could be a
 	-- common typo of the actual `disable_italics`.
-	options.styles.italic = (options.disable_italic or options.disable_italics) and false or options.styles.italic
+	options.styles.italic = not (options.disable_italic or options.disable_italics) and options.styles.italic or false
 
 	-- Set h1 through h6 to the same color if only one is specified
 	if type(options.groups.headings) == "string" then

From c8e97915d1d8be4371803a8077fd2b1ecdba44ca Mon Sep 17 00:00:00 2001
From: Andrew <63322884+winter-again@users.noreply.github.com>
Date: Tue, 5 Mar 2024 09:47:17 -0500
Subject: [PATCH 120/190] feat: add highlight groups for folke/trouble.nvim
 (#248)

---
 lua/rose-pine.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 40ba83e..649fa99 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -727,6 +727,11 @@ local function set_highlights()
 		-- folke/noice.nvim
 		NoiceCursor = { fg = palette.highlight_high, bg = palette.text },
 
+		-- folke/trouble.nvim
+		TroubleText = { fg = palette.subtle },
+		TroubleCount = { fg = palette.iris, bg = palette.surface },
+		TroubleNormal = { fg = palette.text, bg = groups.panel },
+
 		-- echasnovski/mini.clue
 		MiniClueTitle = { bg = groups.panel, bold = styles.bold },
 

From e901a53e41928b1134fa73f8ad3761e4b9d2137f Mon Sep 17 00:00:00 2001
From: James Knight <61782266+James-Kni@users.noreply.github.com>
Date: Fri, 15 Mar 2024 17:08:52 +0000
Subject: [PATCH 121/190] feat: add mini.statusline highlights (#250)

---
 lua/rose-pine.lua | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 649fa99..14d6bb8 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -743,6 +743,18 @@ local function set_highlights()
 		MiniIndentscopeSymbol = { fg = palette.muted },
 		MiniIndentscopeSymbolOff = { fg = palette.muted },
 
+		-- echasnovski/mini.statusline
+		MiniStatuslineDevinfo = { fg = palette.subtle, bg = palette.overlay },
+		MiniStatuslineFileinfo = { link = "MiniStatuslineDevinfo" },
+		MiniStatuslineFilename = { fg = palette.muted, bg = palette.surface },
+		MiniStatuslineInactive = { link = "MiniStatuslineFilename" },
+		MiniStatuslineModeCommand = { fg = palette.base, bg = palette.love, bold = styles.bold },
+		MiniStatuslineModeInsert = { fg = palette.base, bg = palette.foam, bold = styles.bold },
+		MiniStatuslineModeNormal = { fg = palette.base, bg = palette.rose, bold = styles.bold },
+		MiniStatuslineModeOther = { fg = palette.base, bg = palette.rose, bold = styles.bold },
+		MiniStatuslineModeReplace = { fg = palette.base, bg = palette.pine, bold = styles.bold },
+		MiniStatuslineModeVisual = { fg = palette.base, bg = palette.iris, bold = styles.bold },
+
 		-- goolord/alpha-nvim
 		AlphaButtons = { fg = palette.foam },
 		AlphaFooter = { fg = palette.gold },

From 3dbb8a99bd72a3d916f5e9749f86d45dd37d0f1e Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Tue, 19 Mar 2024 18:51:46 -0500
Subject: [PATCH 122/190] feat: highlight lsp variable constant (#246)

Closes #245
---
 lua/rose-pine.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 14d6bb8..85a39f3 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -416,6 +416,7 @@ local function set_highlights()
 		["@lsp.typemod.function.defaultLibrary"] = { link = "@function.builtin" },
 		["@lsp.typemod.operator.injected"] = { link = "@operator" },
 		["@lsp.typemod.string.injected"] = { link = "@string" },
+		["@lsp.typemod.variable.constant"] = { link = "@constant" },
 		["@lsp.typemod.variable.defaultLibrary"] = { link = "@variable.builtin" },
 		["@lsp.typemod.variable.injected"] = { link = "@variable" },
 

From a959c739103085c8383c1f6f0f6be9d888b6141f Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sun, 24 Mar 2024 03:53:11 +0900
Subject: [PATCH 123/190] fix: clear autocmd when changing colorscheme (#254)

---
 lua/rose-pine.lua | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 85a39f3..ffdebe0 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -882,9 +882,13 @@ local function set_highlights()
 
 		-- Support StatusLineTerm & StatusLineTermNC from vim
 		vim.cmd([[
-		autocmd TermOpen * if &buftype=='terminal'
-			\|setlocal winhighlight=StatusLine:StatusLineTerm,StatusLineNC:StatusLineTermNC
-			\|else|setlocal winhighlight=|endif
+		augroup rose-pine
+			autocmd!
+			autocmd TermOpen * if &buftype=='terminal'
+				\|setlocal winhighlight=StatusLine:StatusLineTerm,StatusLineNC:StatusLineTermNC
+				\|else|setlocal winhighlight=|endif
+			autocmd ColorSchemePre * autocmd! rose-pine
+		augroup END
 		]])
 	end
 end

From 1f22d4e97eb584281f0f76b2961f72615ff9e634 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Thu, 28 Mar 2024 19:32:00 -0500
Subject: [PATCH 124/190] feat: add mini.diff (#259)

---
 lua/rose-pine.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index ffdebe0..db6cdba 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -736,6 +736,15 @@ local function set_highlights()
 		-- echasnovski/mini.clue
 		MiniClueTitle = { bg = groups.panel, bold = styles.bold },
 
+		-- echasnovski/mini.diff
+		MiniDiffOverAdd = { fg = groups.git_add, bg = groups.git_add, blend = 20 },
+		MiniDiffOverChange = { fg = groups.git_change, bg = groups.git_change, blend = 20 },
+		MiniDiffOverContext = { bg = palette.surface },
+		MiniDiffOverDelete = { fg = groups.git_delete, bg = groups.git_delete, blend = 20 },
+		MiniDiffSignAdd = { fg = groups.git_add },
+		MiniDiffSignChange = { fg = groups.git_change },
+		MiniDiffSignDelete = { fg = groups.git_delete },
+
 		-- echasnovski/mini.pick
 		MiniPickBorderText = { bg = groups.panel },
 		MiniPickPrompt = { bg = groups.panel, bold = styles.bold },

From 63f461336532a9b48241ac9fdea59f085c287b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20R=C3=BCberg?= <julius.rueberg@protonmail.ch>
Date: Sat, 30 Mar 2024 01:51:22 +0100
Subject: [PATCH 125/190] feat: add highlights for nvim-treesitter-context
 (#260)

---
 lua/rose-pine.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index db6cdba..554dcf3 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -773,6 +773,10 @@ local function set_highlights()
 
 		-- github/copilot.vim
 		CopilotSuggestion = { fg = palette.muted, italic = styles.italic },
+
+		-- nvim-treesitter/nvim-treesitter-context
+		TreesitterContext = { bg = "overlay" },
+		TreesitterContextLineNumber = { fg = "rose", bg = "overlay" }
 	}
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },

From 01dc90af2f7bc85581741bd9dae1ce1ab6282e2d Mon Sep 17 00:00:00 2001
From: Dave Greene <davepgreene@users.noreply.github.com>
Date: Fri, 29 Mar 2024 23:39:26 -0400
Subject: [PATCH 126/190] Fixed enum use vs magic string (#261)

---
 lua/rose-pine.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 554dcf3..184ef6f 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -775,8 +775,8 @@ local function set_highlights()
 		CopilotSuggestion = { fg = palette.muted, italic = styles.italic },
 
 		-- nvim-treesitter/nvim-treesitter-context
-		TreesitterContext = { bg = "overlay" },
-		TreesitterContextLineNumber = { fg = "rose", bg = "overlay" }
+		TreesitterContext = { bg = palette.overlay },
+		TreesitterContextLineNumber = { fg = palette.rose, bg = palette.overlay }
 	}
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },

From e4c22a91633f2280f166306c2e14cee087a65914 Mon Sep 17 00:00:00 2001
From: Adam K <105152139+akthe-at@users.noreply.github.com>
Date: Tue, 9 Apr 2024 12:56:29 -0500
Subject: [PATCH 127/190] fix(python): import semantic_tokens from basedpyright
 (#257)

* fix(python): import semantic_tokens from basedpyright

* fix: restores svelte string highlights
---
 lua/rose-pine.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 184ef6f..ce67514 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -412,13 +412,15 @@ local function set_highlights()
 		["@lsp.type.namespace"] = { link = "@namespace" },
 		["@lsp.type.parameter"] = { link = "@parameter" },
 		["@lsp.type.property"] = { link = "@property" },
-		["@lsp.type.variable"] = { link = "@variable" },
+		["@lsp.type.variable"] = {}, --defer to treesitter for regular variables
+		["@lsp.type.variable.svelte"] = { link = "@variable" },
 		["@lsp.typemod.function.defaultLibrary"] = { link = "@function.builtin" },
 		["@lsp.typemod.operator.injected"] = { link = "@operator" },
 		["@lsp.typemod.string.injected"] = { link = "@string" },
 		["@lsp.typemod.variable.constant"] = { link = "@constant" },
 		["@lsp.typemod.variable.defaultLibrary"] = { link = "@variable.builtin" },
 		["@lsp.typemod.variable.injected"] = { link = "@variable" },
+		["@lsp.type.namespace.python"] = { link = "@variable" },
 
 		--- Plugins
 		-- romgrk/barbar.nvim

From 465b7dc6233bc02b8869a6ebd617cd6181fd295d Mon Sep 17 00:00:00 2001
From: Dhruvin Shah <33428164+dhruvinsh@users.noreply.github.com>
Date: Tue, 9 Apr 2024 13:57:04 -0400
Subject: [PATCH 128/190] feat: adding vim-illuminate highlights (#262)

---
 lua/rose-pine.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index ce67514..9cce6b8 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -818,6 +818,10 @@ local function set_highlights()
 
 		MiniPickBorderText = { bg = "NONE" },
 		MiniPickPrompt = { bg = "NONE", bold = styles.bold },
+
+		IlluminatedWordText = { link = "LspReferenceText" },
+		IlluminatedWordRead = { link = "LspReferenceRead" },
+		IlluminatedWordWrite = { link = "LspReferenceWrite" },
 	}
 
 	if config.options.enable.legacy_highlights then

From 8d9c83d145ebf6bce7555d87448c1fc0b66cd4a9 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Tue, 9 Apr 2024 13:00:32 -0500
Subject: [PATCH 129/190] format (#264)

---
 lua/rose-pine.lua | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 9cce6b8..514ba50 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -410,9 +410,10 @@ local function set_highlights()
 		["@lsp.type.interface"] = { link = "@interface" },
 		["@lsp.type.keyword"] = { link = "@keyword" },
 		["@lsp.type.namespace"] = { link = "@namespace" },
+		["@lsp.type.namespace.python"] = { link = "@variable" },
 		["@lsp.type.parameter"] = { link = "@parameter" },
 		["@lsp.type.property"] = { link = "@property" },
-		["@lsp.type.variable"] = {}, --defer to treesitter for regular variables
+		["@lsp.type.variable"] = {}, -- defer to treesitter for regular variables
 		["@lsp.type.variable.svelte"] = { link = "@variable" },
 		["@lsp.typemod.function.defaultLibrary"] = { link = "@function.builtin" },
 		["@lsp.typemod.operator.injected"] = { link = "@operator" },
@@ -420,7 +421,6 @@ local function set_highlights()
 		["@lsp.typemod.variable.constant"] = { link = "@constant" },
 		["@lsp.typemod.variable.defaultLibrary"] = { link = "@variable.builtin" },
 		["@lsp.typemod.variable.injected"] = { link = "@variable" },
-		["@lsp.type.namespace.python"] = { link = "@variable" },
 
 		--- Plugins
 		-- romgrk/barbar.nvim
@@ -778,7 +778,12 @@ local function set_highlights()
 
 		-- nvim-treesitter/nvim-treesitter-context
 		TreesitterContext = { bg = palette.overlay },
-		TreesitterContextLineNumber = { fg = palette.rose, bg = palette.overlay }
+		TreesitterContextLineNumber = { fg = palette.rose, bg = palette.overlay },
+
+		-- RRethy/vim-illuminate
+		IlluminatedWordRead = { link = "LspReferenceRead" },
+		IlluminatedWordText = { link = "LspReferenceText" },
+		IlluminatedWordWrite = { link = "LspReferenceWrite" },
 	}
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },
@@ -818,10 +823,6 @@ local function set_highlights()
 
 		MiniPickBorderText = { bg = "NONE" },
 		MiniPickPrompt = { bg = "NONE", bold = styles.bold },
-
-		IlluminatedWordText = { link = "LspReferenceText" },
-		IlluminatedWordRead = { link = "LspReferenceRead" },
-		IlluminatedWordWrite = { link = "LspReferenceWrite" },
 	}
 
 	if config.options.enable.legacy_highlights then

From c8477ee9787f0e3a426646606416ba48a02551e4 Mon Sep 17 00:00:00 2001
From: Hayden Rouille <hayden@rouille.dev>
Date: Thu, 18 Apr 2024 15:48:05 +0100
Subject: [PATCH 130/190] For transparency, remove BG for buffers and gray out
 the text (#265)

---
 lua/rose-pine.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 514ba50..b980867 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -801,6 +801,7 @@ local function set_highlights()
 		SignColumn = { fg = palette.text, bg = "NONE" },
 		StatusLine = { fg = palette.subtle, bg = "NONE" },
 		StatusLineNC = { fg = palette.muted, bg = "NONE" },
+		TabLine = { bg = "NONE", fg = palette.subtle },
 		TabLineFill = { bg = "NONE" },
 		TabLineSel = { fg = palette.text, bg = "NONE", bold = styles.bold },
 

From cbc2064f4c2e6db97f3733e4c47f473f15706612 Mon Sep 17 00:00:00 2001
From: "PRIZ ;]" <danielpetrov@outlook.com>
Date: Fri, 10 May 2024 12:22:41 -0500
Subject: [PATCH 131/190] feat: new themes for lualine (#267)

---
 lua/lualine/themes/rose-pine-alt.lua     |  27 +----
 lua/lualine/themes/rose-pine-inv.lua     |   2 +
 lua/lualine/themes/rose-pine-neutral.lua |   2 +
 lua/lualine/themes/rose-pine.lua         |  41 +-------
 lua/rose-pine/palette.lua                |  11 +-
 lua/rose-pine/plugins/lualine.lua        | 125 +++++++++++++++++++++++
 6 files changed, 140 insertions(+), 68 deletions(-)
 create mode 100644 lua/lualine/themes/rose-pine-inv.lua
 create mode 100644 lua/lualine/themes/rose-pine-neutral.lua
 create mode 100644 lua/rose-pine/plugins/lualine.lua

diff --git a/lua/lualine/themes/rose-pine-alt.lua b/lua/lualine/themes/rose-pine-alt.lua
index 05d8af7..0248420 100644
--- a/lua/lualine/themes/rose-pine-alt.lua
+++ b/lua/lualine/themes/rose-pine-alt.lua
@@ -1,26 +1 @@
-local p = require("rose-pine.palette")
-
-return {
-	normal = {
-		a = { bg = p.surface, fg = p.rose, gui = "bold" },
-		b = { bg = p.surface, fg = p.text },
-		c = { bg = p.surface, fg = p.subtle, gui = "italic" },
-	},
-	insert = {
-		a = { bg = p.surface, fg = p.foam, gui = "bold" },
-	},
-	visual = {
-		a = { bg = p.surface, fg = p.iris, gui = "bold" },
-	},
-	replace = {
-		a = { bg = p.surface, fg = p.pine, gui = "bold" },
-	},
-	command = {
-		a = { bg = p.surface, fg = p.love, gui = "bold" },
-	},
-	inactive = {
-		a = { bg = p.base, fg = p.subtle, gui = "bold" },
-		b = { bg = p.base, fg = p.subtle },
-		c = { bg = p.base, fg = p.subtle, gui = "italic" },
-	},
-}
+return require("rose-pine.plugins.lualine").alternate
diff --git a/lua/lualine/themes/rose-pine-inv.lua b/lua/lualine/themes/rose-pine-inv.lua
new file mode 100644
index 0000000..9c13a1d
--- /dev/null
+++ b/lua/lualine/themes/rose-pine-inv.lua
@@ -0,0 +1,2 @@
+return require("rose-pine.plugins.lualine").inverse
+
diff --git a/lua/lualine/themes/rose-pine-neutral.lua b/lua/lualine/themes/rose-pine-neutral.lua
new file mode 100644
index 0000000..1459e84
--- /dev/null
+++ b/lua/lualine/themes/rose-pine-neutral.lua
@@ -0,0 +1,2 @@
+return require("rose-pine.plugins.lualine").neutral
+
diff --git a/lua/lualine/themes/rose-pine.lua b/lua/lualine/themes/rose-pine.lua
index 4c2c9a6..2d33786 100644
--- a/lua/lualine/themes/rose-pine.lua
+++ b/lua/lualine/themes/rose-pine.lua
@@ -1,40 +1 @@
-local p = require("rose-pine.palette")
-local config = require("rose-pine.config")
-
-local bg_base = p.base
-if config.options.styles.transparency then
-	bg_base = "NONE"
-end
-
-return {
-	normal = {
-		a = { bg = p.rose, fg = p.base, gui = "bold" },
-		b = { bg = p.overlay, fg = p.rose },
-		c = { bg = bg_base, fg = p.text },
-	},
-	insert = {
-		a = { bg = p.foam, fg = p.base, gui = "bold" },
-		b = { bg = p.overlay, fg = p.foam },
-		c = { bg = bg_base, fg = p.text },
-	},
-	visual = {
-		a = { bg = p.iris, fg = p.base, gui = "bold" },
-		b = { bg = p.overlay, fg = p.iris },
-		c = { bg = bg_base, fg = p.text },
-	},
-	replace = {
-		a = { bg = p.pine, fg = p.base, gui = "bold" },
-		b = { bg = p.overlay, fg = p.pine },
-		c = { bg = bg_base, fg = p.text },
-	},
-	command = {
-		a = { bg = p.love, fg = p.base, gui = "bold" },
-		b = { bg = p.overlay, fg = p.love },
-		c = { bg = bg_base, fg = p.text },
-	},
-	inactive = {
-		a = { bg = bg_base, fg = p.muted, gui = "bold" },
-		b = { bg = bg_base, fg = p.muted },
-		c = { bg = bg_base, fg = p.muted },
-	},
-}
+return require("rose-pine.plugins.lualine").normal
diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index 540625e..cb85e75 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -1,4 +1,5 @@
 local options = require("rose-pine.config").options
+
 local variants = {
 	main = {
 		_nc = "#16141f",
@@ -59,8 +60,14 @@ local variants = {
 	},
 }
 
+
+local chosen
 if variants[options.variant] ~= nil then
-	return variants[options.variant]
+	chosen = variants[options.variant]
+else
+	chosen = vim.o.background == "light" and variants.dawn or variants[options.dark_variant or "main"]
 end
 
-return vim.o.background == "light" and variants.dawn or variants[options.dark_variant or "main"]
+chosen.variants = variants
+
+return chosen
diff --git a/lua/rose-pine/plugins/lualine.lua b/lua/rose-pine/plugins/lualine.lua
new file mode 100644
index 0000000..eb59216
--- /dev/null
+++ b/lua/rose-pine/plugins/lualine.lua
@@ -0,0 +1,125 @@
+local palette = require("rose-pine.palette")
+
+local generator = {}
+
+function generator.alternate(p)
+	return {
+		normal = {
+			a = { bg = p.surface, fg = p.rose, gui = "bold" },
+			b = { bg = p.surface, fg = p.text },
+			c = { bg = p.surface, fg = p.subtle, gui = "italic" },
+		},
+		insert = {
+			a = { bg = p.surface, fg = p.foam, gui = "bold" },
+		},
+		visual = {
+			a = { bg = p.surface, fg = p.iris, gui = "bold" },
+		},
+		replace = {
+			a = { bg = p.surface, fg = p.pine, gui = "bold" },
+		},
+		command = {
+			a = { bg = p.surface, fg = p.love, gui = "bold" },
+		},
+		inactive = {
+			a = { bg = p.base, fg = p.subtle, gui = "bold" },
+			b = { bg = p.base, fg = p.subtle },
+			c = { bg = p.base, fg = p.subtle, gui = "italic" },
+		},
+		variants = {},
+	}
+end
+
+function generator.normal(p)
+	local config = require("rose-pine.config")
+
+	local bg_base = p.base
+	if config.options.styles.transparency then
+		bg_base = "NONE"
+	end
+
+	return {
+		normal = {
+			a = { bg = p.rose, fg = p.base, gui = "bold" },
+			b = { bg = p.overlay, fg = p.rose },
+			c = { bg = bg_base, fg = p.text },
+		},
+		insert = {
+			a = { bg = p.foam, fg = p.base, gui = "bold" },
+			b = { bg = p.overlay, fg = p.foam },
+		},
+		visual = {
+			a = { bg = p.iris, fg = p.base, gui = "bold" },
+			b = { bg = p.overlay, fg = p.iris },
+		},
+		replace = {
+			a = { bg = p.pine, fg = p.base, gui = "bold" },
+			b = { bg = p.overlay, fg = p.pine },
+		},
+		command = {
+			a = { bg = p.love, fg = p.base, gui = "bold" },
+			b = { bg = p.overlay, fg = p.love },
+		},
+		inactive = {
+			a = { bg = bg_base, fg = p.muted, gui = "bold" },
+			b = { bg = bg_base, fg = p.muted },
+			c = { bg = bg_base, fg = p.muted },
+		},
+		variants = {},
+	}
+end
+
+function generator.neutral(p)
+	return {
+		normal = {
+			a = { bg = p.rose, fg = p.base, gui = "bold" },
+			b = { bg = p.highlight_med, fg = p.rose },
+			c = { bg = p.highlight_high, fg = p.text },
+		},
+		insert = {
+			a = { bg = p.foam, fg = p.base, gui = "bold" },
+			b = { bg = p.highlight_med, fg = p.foam },
+		},
+		visual = {
+			a = { bg = p.iris, fg = p.base, gui = "bold" },
+			b = { bg = p.highlight_med, fg = p.iris },
+		},
+		replace = {
+			a = { bg = p.pine, fg = p.base, gui = "bold" },
+			b = { bg = p.highlight_med, fg = p.pine },
+		},
+		command = {
+			a = { bg = p.love, fg = p.base, gui = "bold" },
+			b = { bg = p.highlight_med, fg = p.love },
+		},
+		inactive = {
+			a = { bg = p.muted, fg = p.overlay, gui = "bold" },
+			b = { bg = p.muted, fg = p.overlay },
+			c = { bg = p.muted, fg = p.base },
+		},
+		variants = {}
+	}
+end
+
+function generator.inverse(p)
+	if p.base == palette.variants.moon.base then
+		return generator.normal(palette.variants.dawn)
+	elseif p.base == palette.variants.main.base then
+		return generator.normal(palette.variants.dawn)
+	elseif p.base == palette.variants.dawn.base then
+		return generator.normal(palette.variants.moon)
+	end
+end
+
+-- function generator.
+
+local default = {}
+
+for t, fn in pairs(generator) do
+	default[t] = fn(palette)
+	for k, v in pairs(palette.variants) do
+		default[t].variants[k] = fn(v)
+	end
+end
+
+return default

From f67828be44915a1aaf8d0f3abf47c0e1d91da4ef Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Tue, 14 May 2024 09:42:41 -0500
Subject: [PATCH 132/190] Revert "feat: new themes for lualine (#267)" (#269)

This reverts commit cbc2064f4c2e6db97f3733e4c47f473f15706612.
---
 lua/lualine/themes/rose-pine-alt.lua     |  27 ++++-
 lua/lualine/themes/rose-pine-inv.lua     |   2 -
 lua/lualine/themes/rose-pine-neutral.lua |   2 -
 lua/lualine/themes/rose-pine.lua         |  41 +++++++-
 lua/rose-pine/palette.lua                |  11 +-
 lua/rose-pine/plugins/lualine.lua        | 125 -----------------------
 6 files changed, 68 insertions(+), 140 deletions(-)
 delete mode 100644 lua/lualine/themes/rose-pine-inv.lua
 delete mode 100644 lua/lualine/themes/rose-pine-neutral.lua
 delete mode 100644 lua/rose-pine/plugins/lualine.lua

diff --git a/lua/lualine/themes/rose-pine-alt.lua b/lua/lualine/themes/rose-pine-alt.lua
index 0248420..05d8af7 100644
--- a/lua/lualine/themes/rose-pine-alt.lua
+++ b/lua/lualine/themes/rose-pine-alt.lua
@@ -1 +1,26 @@
-return require("rose-pine.plugins.lualine").alternate
+local p = require("rose-pine.palette")
+
+return {
+	normal = {
+		a = { bg = p.surface, fg = p.rose, gui = "bold" },
+		b = { bg = p.surface, fg = p.text },
+		c = { bg = p.surface, fg = p.subtle, gui = "italic" },
+	},
+	insert = {
+		a = { bg = p.surface, fg = p.foam, gui = "bold" },
+	},
+	visual = {
+		a = { bg = p.surface, fg = p.iris, gui = "bold" },
+	},
+	replace = {
+		a = { bg = p.surface, fg = p.pine, gui = "bold" },
+	},
+	command = {
+		a = { bg = p.surface, fg = p.love, gui = "bold" },
+	},
+	inactive = {
+		a = { bg = p.base, fg = p.subtle, gui = "bold" },
+		b = { bg = p.base, fg = p.subtle },
+		c = { bg = p.base, fg = p.subtle, gui = "italic" },
+	},
+}
diff --git a/lua/lualine/themes/rose-pine-inv.lua b/lua/lualine/themes/rose-pine-inv.lua
deleted file mode 100644
index 9c13a1d..0000000
--- a/lua/lualine/themes/rose-pine-inv.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-return require("rose-pine.plugins.lualine").inverse
-
diff --git a/lua/lualine/themes/rose-pine-neutral.lua b/lua/lualine/themes/rose-pine-neutral.lua
deleted file mode 100644
index 1459e84..0000000
--- a/lua/lualine/themes/rose-pine-neutral.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-return require("rose-pine.plugins.lualine").neutral
-
diff --git a/lua/lualine/themes/rose-pine.lua b/lua/lualine/themes/rose-pine.lua
index 2d33786..4c2c9a6 100644
--- a/lua/lualine/themes/rose-pine.lua
+++ b/lua/lualine/themes/rose-pine.lua
@@ -1 +1,40 @@
-return require("rose-pine.plugins.lualine").normal
+local p = require("rose-pine.palette")
+local config = require("rose-pine.config")
+
+local bg_base = p.base
+if config.options.styles.transparency then
+	bg_base = "NONE"
+end
+
+return {
+	normal = {
+		a = { bg = p.rose, fg = p.base, gui = "bold" },
+		b = { bg = p.overlay, fg = p.rose },
+		c = { bg = bg_base, fg = p.text },
+	},
+	insert = {
+		a = { bg = p.foam, fg = p.base, gui = "bold" },
+		b = { bg = p.overlay, fg = p.foam },
+		c = { bg = bg_base, fg = p.text },
+	},
+	visual = {
+		a = { bg = p.iris, fg = p.base, gui = "bold" },
+		b = { bg = p.overlay, fg = p.iris },
+		c = { bg = bg_base, fg = p.text },
+	},
+	replace = {
+		a = { bg = p.pine, fg = p.base, gui = "bold" },
+		b = { bg = p.overlay, fg = p.pine },
+		c = { bg = bg_base, fg = p.text },
+	},
+	command = {
+		a = { bg = p.love, fg = p.base, gui = "bold" },
+		b = { bg = p.overlay, fg = p.love },
+		c = { bg = bg_base, fg = p.text },
+	},
+	inactive = {
+		a = { bg = bg_base, fg = p.muted, gui = "bold" },
+		b = { bg = bg_base, fg = p.muted },
+		c = { bg = bg_base, fg = p.muted },
+	},
+}
diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index cb85e75..540625e 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -1,5 +1,4 @@
 local options = require("rose-pine.config").options
-
 local variants = {
 	main = {
 		_nc = "#16141f",
@@ -60,14 +59,8 @@ local variants = {
 	},
 }
 
-
-local chosen
 if variants[options.variant] ~= nil then
-	chosen = variants[options.variant]
-else
-	chosen = vim.o.background == "light" and variants.dawn or variants[options.dark_variant or "main"]
+	return variants[options.variant]
 end
 
-chosen.variants = variants
-
-return chosen
+return vim.o.background == "light" and variants.dawn or variants[options.dark_variant or "main"]
diff --git a/lua/rose-pine/plugins/lualine.lua b/lua/rose-pine/plugins/lualine.lua
deleted file mode 100644
index eb59216..0000000
--- a/lua/rose-pine/plugins/lualine.lua
+++ /dev/null
@@ -1,125 +0,0 @@
-local palette = require("rose-pine.palette")
-
-local generator = {}
-
-function generator.alternate(p)
-	return {
-		normal = {
-			a = { bg = p.surface, fg = p.rose, gui = "bold" },
-			b = { bg = p.surface, fg = p.text },
-			c = { bg = p.surface, fg = p.subtle, gui = "italic" },
-		},
-		insert = {
-			a = { bg = p.surface, fg = p.foam, gui = "bold" },
-		},
-		visual = {
-			a = { bg = p.surface, fg = p.iris, gui = "bold" },
-		},
-		replace = {
-			a = { bg = p.surface, fg = p.pine, gui = "bold" },
-		},
-		command = {
-			a = { bg = p.surface, fg = p.love, gui = "bold" },
-		},
-		inactive = {
-			a = { bg = p.base, fg = p.subtle, gui = "bold" },
-			b = { bg = p.base, fg = p.subtle },
-			c = { bg = p.base, fg = p.subtle, gui = "italic" },
-		},
-		variants = {},
-	}
-end
-
-function generator.normal(p)
-	local config = require("rose-pine.config")
-
-	local bg_base = p.base
-	if config.options.styles.transparency then
-		bg_base = "NONE"
-	end
-
-	return {
-		normal = {
-			a = { bg = p.rose, fg = p.base, gui = "bold" },
-			b = { bg = p.overlay, fg = p.rose },
-			c = { bg = bg_base, fg = p.text },
-		},
-		insert = {
-			a = { bg = p.foam, fg = p.base, gui = "bold" },
-			b = { bg = p.overlay, fg = p.foam },
-		},
-		visual = {
-			a = { bg = p.iris, fg = p.base, gui = "bold" },
-			b = { bg = p.overlay, fg = p.iris },
-		},
-		replace = {
-			a = { bg = p.pine, fg = p.base, gui = "bold" },
-			b = { bg = p.overlay, fg = p.pine },
-		},
-		command = {
-			a = { bg = p.love, fg = p.base, gui = "bold" },
-			b = { bg = p.overlay, fg = p.love },
-		},
-		inactive = {
-			a = { bg = bg_base, fg = p.muted, gui = "bold" },
-			b = { bg = bg_base, fg = p.muted },
-			c = { bg = bg_base, fg = p.muted },
-		},
-		variants = {},
-	}
-end
-
-function generator.neutral(p)
-	return {
-		normal = {
-			a = { bg = p.rose, fg = p.base, gui = "bold" },
-			b = { bg = p.highlight_med, fg = p.rose },
-			c = { bg = p.highlight_high, fg = p.text },
-		},
-		insert = {
-			a = { bg = p.foam, fg = p.base, gui = "bold" },
-			b = { bg = p.highlight_med, fg = p.foam },
-		},
-		visual = {
-			a = { bg = p.iris, fg = p.base, gui = "bold" },
-			b = { bg = p.highlight_med, fg = p.iris },
-		},
-		replace = {
-			a = { bg = p.pine, fg = p.base, gui = "bold" },
-			b = { bg = p.highlight_med, fg = p.pine },
-		},
-		command = {
-			a = { bg = p.love, fg = p.base, gui = "bold" },
-			b = { bg = p.highlight_med, fg = p.love },
-		},
-		inactive = {
-			a = { bg = p.muted, fg = p.overlay, gui = "bold" },
-			b = { bg = p.muted, fg = p.overlay },
-			c = { bg = p.muted, fg = p.base },
-		},
-		variants = {}
-	}
-end
-
-function generator.inverse(p)
-	if p.base == palette.variants.moon.base then
-		return generator.normal(palette.variants.dawn)
-	elseif p.base == palette.variants.main.base then
-		return generator.normal(palette.variants.dawn)
-	elseif p.base == palette.variants.dawn.base then
-		return generator.normal(palette.variants.moon)
-	end
-end
-
--- function generator.
-
-local default = {}
-
-for t, fn in pairs(generator) do
-	default[t] = fn(palette)
-	for k, v in pairs(palette.variants) do
-		default[t].variants[k] = fn(v)
-	end
-end
-
-return default

From 511e82e2724cd2adc172bcc5a9abdaa1c4837323 Mon Sep 17 00:00:00 2001
From: abvee <82954751+abvee@users.noreply.github.com>
Date: Sun, 26 May 2024 02:52:38 +0000
Subject: [PATCH 133/190] Added ["@float"] to default_highlights (#272) (#273)

---
 lua/rose-pine.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index b980867..5ac2234 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -295,6 +295,7 @@ local function set_highlights()
 		["@boolean"] = { link = "Boolean" },
 		["@number"] = { link = "Number" },
 		["@number.float"] = { link = "Number" },
+		["@float"] = { link = "Number" },
 
 		--- Types
 		["@type"] = { fg = palette.foam },

From 958dce3da98859900e27ce5918335106a8e6c9a1 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sun, 9 Jun 2024 10:48:51 -0500
Subject: [PATCH 134/190] feat: support upcoming modes.nvim update (#274)

[modes.nvim](https://github.com/mvllow/modes.nvim) is about to
incorporate replace mode.
---
 lua/rose-pine.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 5ac2234..5ac8e67 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -454,6 +454,7 @@ local function set_highlights()
 		ModesCopy = { bg = palette.gold },
 		ModesDelete = { bg = palette.love },
 		ModesInsert = { bg = palette.foam },
+		ModesReplace = { bg = palette.pine },
 		ModesVisual = { bg = palette.iris },
 
 		-- kyazdani42/nvim-tree.lua

From 6d476a5c64f6e712880d8ab5368f006011903eeb Mon Sep 17 00:00:00 2001
From: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date: Thu, 27 Jun 2024 20:51:35 +0300
Subject: [PATCH 135/190] feat: add explicit full 'mini.nvim' support (#279)

---
 lua/rose-pine.lua | 120 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 108 insertions(+), 12 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 5ac8e67..1b7da63 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -737,10 +737,34 @@ local function set_highlights()
 		TroubleCount = { fg = palette.iris, bg = palette.surface },
 		TroubleNormal = { fg = palette.text, bg = groups.panel },
 
-		-- echasnovski/mini.clue
+		-- echasnovski/mini.nvim
+		MiniAnimateCursor = { reverse = true, nocombine = true },
+		MiniAnimateNormalFloat = { link = "NormalFloat" },
+
+		MiniClueBorder = { link = "FloatBorder" },
+		MiniClueDescGroup = { link = "DiagnosticFloatingWarn" },
+		MiniClueDescSingle = { link = "NormalFloat" },
+		MiniClueNextKey = { link = "DiagnosticFloatingHint" },
+		MiniClueNextKeyWithPostkeys = { link = "DiagnosticFloatingError" },
+		MiniClueSeparator = { link = "DiagnosticFloatingInfo" },
 		MiniClueTitle = { bg = groups.panel, bold = styles.bold },
 
-		-- echasnovski/mini.diff
+		MiniCompletionActiveParameter = { underline = true },
+
+		MiniCursorword = { underline = true },
+		MiniCursorwordCurrent = { underline = true },
+
+		MiniDepsChangeAdded = { fg = groups.git_add },
+		MiniDepsChangeRemoved = { fg = groups.git_delete },
+		MiniDepsHint = { link = "DiagnosticHint" },
+		MiniDepsInfo = { link = "DiagnosticInfo" },
+		MiniDepsMsgBreaking = { link = "DiagnosticWarn" },
+		MiniDepsPlaceholder = { link = "Comment" },
+		MiniDepsTitle = { link = "Title" },
+		MiniDepsTitleError = { link = "DiffDelete" },
+		MiniDepsTitleSame = { link = "DiffText" },
+		MiniDepsTitleUpdate = { link = "DiffAdd" },
+
 		MiniDiffOverAdd = { fg = groups.git_add, bg = groups.git_add, blend = 20 },
 		MiniDiffOverChange = { fg = groups.git_change, bg = groups.git_change, blend = 20 },
 		MiniDiffOverContext = { bg = palette.surface },
@@ -749,15 +773,75 @@ local function set_highlights()
 		MiniDiffSignChange = { fg = groups.git_change },
 		MiniDiffSignDelete = { fg = groups.git_delete },
 
-		-- echasnovski/mini.pick
+		MiniFilesBorder = { link = "FloatBorder" },
+		MiniFilesBorderModified = { link = "DiagnosticFloatingWarn" },
+		MiniFilesCursorLine = { link = "CursorLine" },
+		MiniFilesDirectory = { link = "Directory" },
+		MiniFilesFile = { fg = palette.text },
+		MiniFilesNormal = { link = "NormalFloat" },
+		MiniFilesTitle = { link = "FloatTitle" },
+		MiniFilesTitleFocused = { fg = palette.rose, bold = styles.bold },
+
+		MiniHipatternsFixme = { fg = palette.base, bg = groups.error, bold = styles.bold },
+		MiniHipatternsHack = { fg = palette.base, bg = groups.warn, bold = styles.bold },
+		MiniHipatternsNote = { fg = palette.base, bg = groups.info, bold = styles.bold },
+		MiniHipatternsTodo = { fg = palette.base, bg = groups.hint, bold = styles.bold },
+
+		MiniIconsAzure = { fg = palette.foam },
+		MiniIconsBlue = { fg = palette.pine },
+		MiniIconsCyan = { fg = palette.pine },
+		MiniIconsGreen = { fg = palette.foam },
+		MiniIconsGrey = { fg = palette.text },
+		MiniIconsOrange = { fg = palette.gold },
+		MiniIconsPurple = { fg = palette.iris },
+		MiniIconsRed = { fg = palette.love },
+		MiniIconsYellow = { fg = palette.gold },
+
+		MiniIndentscopeSymbol = { fg = palette.muted },
+		MiniIndentscopeSymbolOff = { fg = palette.gold },
+
+		MiniJump = { sp = palette.gold, undercurl = true },
+
+		MiniJump2dDim = { fg = palette.subtle },
+		MiniJump2dSpot = { fg = palette.gold, bold = styles.bold, nocombine = true },
+		MiniJump2dSpotAhead = { fg = palette.foam, bg = palette.surface, nocombine = true },
+		MiniJump2dSpotUnique = { fg = palette.rose, bold = styles.bold, nocombine = true },
+
+		MiniMapNormal = { link = "NormalFloat" },
+		MiniMapSymbolCount = { link = "Special" },
+		MiniMapSymbolLine = { link = "Title" },
+		MiniMapSymbolView = { link = "Delimiter" },
+
+		MiniNotifyBorder = { link = "FloatBorder" },
+		MiniNotifyNormal = { link = "NormalFloat" },
+		MiniNotifyTitle = { link = "FloatTitle" },
+
+		MiniOperatorsExchangeFrom = { link = "IncSearch" },
+
+		MiniPickBorder = { link = "FloatBorder" },
+		MiniPickBorderBusy = { link = "DiagnosticFloatingWarn" },
 		MiniPickBorderText = { bg = groups.panel },
+		MiniPickIconDirectory = { link = "Directory" },
+		MiniPickIconFile = { link = "MiniPickNormal" },
+		MiniPickHeader = { link = "DiagnosticFloatingHint" },
+		MiniPickMatchCurrent = { link = "CursorLine" },
+		MiniPickMatchMarked = { link = "Visual" },
+		MiniPickMatchRanges = { fg = palette.foam },
+		MiniPickNormal = { link = "NormalFloat" },
+		MiniPickPreviewLine = { link = "CursorLine" },
+		MiniPickPreviewRegion = { link = "IncSearch" },
 		MiniPickPrompt = { bg = groups.panel, bold = styles.bold },
 
-		-- echasnovski/mini.indentscope
-		MiniIndentscopeSymbol = { fg = palette.muted },
-		MiniIndentscopeSymbolOff = { fg = palette.muted },
+		MiniStarterCurrent = { nocombine = true },
+		MiniStarterFooter = { fg = palette.subtle },
+		MiniStarterHeader = { link = "Title" },
+		MiniStarterInactive = { link = "Comment" },
+		MiniStarterItem = { link = "Normal" },
+		MiniStarterItemBullet = { link = "Delimiter" },
+		MiniStarterItemPrefix = { link = "WarningMsg" },
+		MiniStarterSection = { fg = palette.rose },
+		MiniStarterQuery = { link = "MoreMsg" },
 
-		-- echasnovski/mini.statusline
 		MiniStatuslineDevinfo = { fg = palette.subtle, bg = palette.overlay },
 		MiniStatuslineFileinfo = { link = "MiniStatuslineDevinfo" },
 		MiniStatuslineFilename = { fg = palette.muted, bg = palette.surface },
@@ -769,6 +853,23 @@ local function set_highlights()
 		MiniStatuslineModeReplace = { fg = palette.base, bg = palette.pine, bold = styles.bold },
 		MiniStatuslineModeVisual = { fg = palette.base, bg = palette.iris, bold = styles.bold },
 
+		MiniSurround = { link = "IncSearch" },
+
+		MiniTablineCurrent = { fg = palette.text, bg = palette.overlay, bold = styles.bold },
+		MiniTablineFill = { link = "TabLineFill" },
+		MiniTablineHidden = { fg = palette.subtle, bg = groups.panel },
+		MiniTablineModifiedCurrent = { fg = palette.overlay, bg = palette.text, bold = styles.bold },
+		MiniTablineModifiedHidden = { fg = groups.panel, bg = palette.subtle },
+		MiniTablineModifiedVisible = { fg = groups.panel, bg = palette.text },
+		MiniTablineTabpagesection = { link = "Search" },
+		MiniTablineVisible = { fg = palette.text, bg = groups.panel },
+
+		MiniTestEmphasis = { bold = styles.bold },
+		MiniTestFail = { fg = palette.love, bold = styles.bold },
+		MiniTestPass = { fg = palette.foam, bold = styles.bold },
+
+		MiniTrailspace = { bg = palette.love },
+
 		-- goolord/alpha-nvim
 		AlphaButtons = { fg = palette.foam },
 		AlphaFooter = { fg = palette.gold },
@@ -821,11 +922,6 @@ local function set_highlights()
 		IblIndent = { fg = palette.overlay, bg = "NONE" },
 		IblScope = { fg = palette.foam, bg = "NONE" },
 		IblWhitespace = { fg = palette.overlay, bg = "NONE" },
-
-		MiniClueTitle = { bg = "NONE", bold = styles.bold },
-
-		MiniPickBorderText = { bg = "NONE" },
-		MiniPickPrompt = { bg = "NONE", bold = styles.bold },
 	}
 
 	if config.options.enable.legacy_highlights then

From 71852123ccebf4f30cb1aaa69d0532b861b4728c Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Thu, 27 Jun 2024 12:55:27 -0500
Subject: [PATCH 136/190] feat: set matching background on MiniFilesTitle
 (#280)

---
 lua/rose-pine.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 1b7da63..159185c 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -779,8 +779,8 @@ local function set_highlights()
 		MiniFilesDirectory = { link = "Directory" },
 		MiniFilesFile = { fg = palette.text },
 		MiniFilesNormal = { link = "NormalFloat" },
-		MiniFilesTitle = { link = "FloatTitle" },
-		MiniFilesTitleFocused = { fg = palette.rose, bold = styles.bold },
+		MiniFilesTitle = { bg = groups.panel, fg = palette.foam, bold = styles.bold },
+		MiniFilesTitleFocused = { bg = groups.panel, fg = palette.rose, bold = styles.bold },
 
 		MiniHipatternsFixme = { fg = palette.base, bg = groups.error, bold = styles.bold },
 		MiniHipatternsHack = { fg = palette.base, bg = groups.warn, bold = styles.bold },

From 69b3aa9500058e6558c48f867939c2d87ce1856f Mon Sep 17 00:00:00 2001
From: Ilya Kuporosov <88616652+hansumane@users.noreply.github.com>
Date: Wed, 3 Jul 2024 14:23:19 -0700
Subject: [PATCH 137/190] fix: link `@lsp.type.comment.c`,
 `@lsp.type.comment.cpp` to `@comment` (#282)

It fixes branches of conditional directives like `#if` and `#ifdef` in C and C++
appearing as if they both are true, without breaking TODO comments.
---
 lua/rose-pine.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 159185c..0aa5c78 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -407,6 +407,8 @@ local function set_highlights()
 
 		--- Semantic
 		["@lsp.type.comment"] = {},
+		["@lsp.type.comment.c"] = { link = "@comment" },
+		["@lsp.type.comment.cpp"] = { link = "@comment" },
 		["@lsp.type.enum"] = { link = "@type" },
 		["@lsp.type.interface"] = { link = "@interface" },
 		["@lsp.type.keyword"] = { link = "@keyword" },

From fe5f4e11f72908ce3b528397757540ea9ec22823 Mon Sep 17 00:00:00 2001
From: Shaun Clayton <shaun.j.clayton@gmail.com>
Date: Mon, 15 Jul 2024 11:21:08 -0400
Subject: [PATCH 138/190] chore: update highlights for which-key.nvim (#287)

* chore: update highlights for which-key.nvim

* fix: revert placement of WhichKeyFloat hl group

* feat: add additional highlight groups for icons in which-key

* Revert "feat: add additional highlight groups for icons in which-key"

Need to come up with a different solution.

This reverts commit 18d70420a2a0ff9fa70a0ca88b84b147ff494a39.

* fix: use explicit fg and bg for WhichKeyTitle

* Revert "fix: use explicit fg and bg for WhichKeyTitle"

Breaks extend_background_behind_borders again... Oops

This reverts commit 1389556a198e88fd763f772dec4f4c95bf08ec1c.
---
 lua/rose-pine.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 0aa5c78..fbc5445 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -519,10 +519,13 @@ local function set_highlights()
 
 		-- folke/which-key.nvim
 		WhichKey = { fg = palette.iris },
+		WhichKeyBorder = make_border(),
 		WhichKeyDesc = { fg = palette.gold },
 		WhichKeyFloat = { bg = groups.panel },
 		WhichKeyGroup = { fg = palette.foam },
+		WhichKeyNormal = { link = "NormalFloat" },
 		WhichKeySeparator = { fg = palette.subtle },
+		WhichKeyTitle = make_border(palette.foam),
 		WhichKeyValue = { fg = palette.rose },
 
 		-- lukas-reineke/indent-blankline.nvim
@@ -920,6 +923,7 @@ local function set_highlights()
 		TelescopeSelectionCaret = { fg = palette.rose },
 
 		WhichKeyFloat = { bg = "NONE" },
+		WhichKeyNormal = { bg = "NONE" },
 
 		IblIndent = { fg = palette.overlay, bg = "NONE" },
 		IblScope = { fg = palette.foam, bg = "NONE" },

From c4b55e85fb8d04c8b7062c53034747448c07e901 Mon Sep 17 00:00:00 2001
From: Shaun Clayton <shaun.j.clayton@gmail.com>
Date: Sun, 21 Jul 2024 14:17:17 -0400
Subject: [PATCH 139/190] feat(palette): add initial support for new color
 `leaf` (#290)

* feat(palette): add new color 'leaf'

* feat: add  highlight groups to defaults
---
 lua/rose-pine.lua         | 7 +++++++
 lua/rose-pine/config.lua  | 3 ++-
 lua/rose-pine/palette.lua | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index fbc5445..73712cd 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -155,26 +155,32 @@ local function set_highlights()
 		DiagnosticError = { fg = groups.error },
 		DiagnosticHint = { fg = groups.hint },
 		DiagnosticInfo = { fg = groups.info },
+		DiagnosticOk = { fg = groups.ok },
 		DiagnosticWarn = { fg = groups.warn },
 		DiagnosticDefaultError = { link = "DiagnosticError" },
 		DiagnosticDefaultHint = { link = "DiagnosticHint" },
 		DiagnosticDefaultInfo = { link = "DiagnosticInfo" },
+		DiagnosticDefaultOk = { link = "DiagnosticOk" },
 		DiagnosticDefaultWarn = { link = "DiagnosticWarn" },
 		DiagnosticFloatingError = { link = "DiagnosticError" },
 		DiagnosticFloatingHint = { link = "DiagnosticHint" },
 		DiagnosticFloatingInfo = { link = "DiagnosticInfo" },
+		DiagnosticFloatingOk = { link = "DiagnosticOk" },
 		DiagnosticFloatingWarn = { link = "DiagnosticWarn" },
 		DiagnosticSignError = { link = "DiagnosticError" },
 		DiagnosticSignHint = { link = "DiagnosticHint" },
 		DiagnosticSignInfo = { link = "DiagnosticInfo" },
+		DiagnosticSignOk = { link = "DiagnosticOk" },
 		DiagnosticSignWarn = { link = "DiagnosticWarn" },
 		DiagnosticUnderlineError = { sp = groups.error, undercurl = true },
 		DiagnosticUnderlineHint = { sp = groups.hint, undercurl = true },
 		DiagnosticUnderlineInfo = { sp = groups.info, undercurl = true },
+		DiagnosticUnderlineOk = { sp = groups.ok, undercurl = true },
 		DiagnosticUnderlineWarn = { sp = groups.warn, undercurl = true },
 		DiagnosticVirtualTextError = { fg = groups.error, bg = groups.error, blend = 10 },
 		DiagnosticVirtualTextHint = { fg = groups.hint, bg = groups.hint, blend = 10 },
 		DiagnosticVirtualTextInfo = { fg = groups.info, bg = groups.info, blend = 10 },
+		DiagnosticVirtualTextOk = { fg = groups.ok, bg = groups.ok, blend = 10 },
 		DiagnosticVirtualTextWarn = { fg = groups.warn, bg = groups.warn, blend = 10 },
 
 		Boolean = { fg = palette.rose },
@@ -897,6 +903,7 @@ local function set_highlights()
 		DiagnosticVirtualTextError = { fg = groups.error },
 		DiagnosticVirtualTextHint = { fg = groups.hint },
 		DiagnosticVirtualTextInfo = { fg = groups.info },
+		DiagnosticVirtualTextOk = { fg = groups.ok },
 		DiagnosticVirtualTextWarn = { fg = groups.warn },
 
 		FloatBorder = { fg = palette.muted, bg = "NONE" },
diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index 562d2a4..cdbec69 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -44,9 +44,10 @@ config.options = {
 		error = "love",
 		hint = "iris",
 		info = "foam",
+		ok = "leaf",
+		warn = "gold",
 		note = "pine",
 		todo = "rose",
-		warn = "gold",
 
 		git_add = "foam",
 		git_change = "rose",
diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index 540625e..ffa5f81 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -14,6 +14,7 @@ local variants = {
 		pine = "#31748f",
 		foam = "#9ccfd8",
 		iris = "#c4a7e7",
+		leaf = "#95b1ac",
 		highlight_low = "#21202e",
 		highlight_med = "#403d52",
 		highlight_high = "#524f67",
@@ -33,6 +34,7 @@ local variants = {
 		pine = "#3e8fb0",
 		foam = "#9ccfd8",
 		iris = "#c4a7e7",
+		leaf = "#95b1ac",
 		highlight_low = "#2a283e",
 		highlight_med = "#44415a",
 		highlight_high = "#56526e",
@@ -52,6 +54,7 @@ local variants = {
 		pine = "#286983",
 		foam = "#56949f",
 		iris = "#907aa9",
+		leaf = "#6d8f89",
 		highlight_low = "#f4ede8",
 		highlight_med = "#dfdad9",
 		highlight_high = "#cecacd",

From 2f1733d36f7765d3f0bd99a9c4af482b8a9260eb Mon Sep 17 00:00:00 2001
From: Shaun Clayton <shaun.j.clayton@gmail.com>
Date: Sun, 21 Jul 2024 17:12:11 -0400
Subject: [PATCH 140/190] feat: add support for icons in which-key.nvim (#291)

* feat: add icon support for which-key.nvim

* fix: incorrect color reference

* feat: set WhichKeyIcon hl group to 'pine' by default

Used when the colors option is set to false.
---
 lua/rose-pine.lua | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 73712cd..afea3ea 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -529,6 +529,16 @@ local function set_highlights()
 		WhichKeyDesc = { fg = palette.gold },
 		WhichKeyFloat = { bg = groups.panel },
 		WhichKeyGroup = { fg = palette.foam },
+		WhichKeyIcon = { fg = palette.pine },
+		WhichKeyIconAzure = { fg = palette.pine },
+		WhichKeyIconBlue = { fg = palette.pine },
+		WhichKeyIconCyan = { fg = palette.foam },
+		WhichKeyIconGreen = { fg = palette.leaf },
+		WhichKeyIconGrey = { fg = palette.subtle },
+		WhichKeyIconOrange = { fg = palette.rose },
+		WhichKeyIconPurple = { fg = palette.iris },
+		WhichKeyIconRed = { fg = palette.love },
+		WhichKeyIconYellow = { fg = palette.gold },
 		WhichKeyNormal = { link = "NormalFloat" },
 		WhichKeySeparator = { fg = palette.subtle },
 		WhichKeyTitle = make_border(palette.foam),

From f2bf6e8d49ce1b1db22f8eb5798841f1f1ec8dca Mon Sep 17 00:00:00 2001
From: Shaun Clayton <shaun.j.clayton@gmail.com>
Date: Sun, 21 Jul 2024 17:39:15 -0400
Subject: [PATCH 141/190] feat: add support for rainbow-delimiters.nvim (#292)

---
 lua/rose-pine.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index afea3ea..fed2dc5 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -908,6 +908,15 @@ local function set_highlights()
 		IlluminatedWordRead = { link = "LspReferenceRead" },
 		IlluminatedWordText = { link = "LspReferenceText" },
 		IlluminatedWordWrite = { link = "LspReferenceWrite" },
+
+		-- HiPhish/rainbow-delimiters.nvim
+		RainbowDelimiterBlue = { fg = palette.pine },
+		RainbowDelimiterCyan = { fg = palette.foam },
+		RainbowDelimiterGreen = { fg = palette.leaf },
+		RainbowDelimiterOrange = { fg = palette.rose },
+		RainbowDelimiterRed = { fg = palette.love },
+		RainbowDelimiterViolet = { fg = palette.iris },
+		RainbowDelimiterYellow = { fg = palette.gold },
 	}
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },

From afb46f9b66260542a256bd4c3c3a6bffb62d15a0 Mon Sep 17 00:00:00 2001
From: Shaun Clayton <shaun.j.clayton@gmail.com>
Date: Mon, 22 Jul 2024 00:06:14 -0400
Subject: [PATCH 142/190] fix: add missing highlight (#293)

---
 lua/rose-pine.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index fed2dc5..6daf4b5 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -498,7 +498,7 @@ local function set_highlights()
 		NeotestFailed = { fg = palette.love },
 		NeotestFile = { fg = palette.text },
 		NeotestFocused = { fg = palette.gold, bg = palette.highlight_med },
-		NeotestIndent = { fg = "" },
+		NeotestIndent = { fg = palette.highlight_med },
 		NeotestMarked = { fg = palette.rose, bold = styles.bold },
 		NeotestNamespace = { fg = palette.gold },
 		NeotestPassed = { fg = palette.pine },

From 3bbd8a865c03992ad2ae93aa1d7961ecb66e75e1 Mon Sep 17 00:00:00 2001
From: Shaun Clayton <shaun.j.clayton@gmail.com>
Date: Mon, 22 Jul 2024 01:23:59 -0400
Subject: [PATCH 143/190] fix: broken transparency for treesitter-context
 (#294)

---
 lua/rose-pine.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 6daf4b5..d2eb951 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -954,6 +954,9 @@ local function set_highlights()
 		IblIndent = { fg = palette.overlay, bg = "NONE" },
 		IblScope = { fg = palette.foam, bg = "NONE" },
 		IblWhitespace = { fg = palette.overlay, bg = "NONE" },
+
+		TreesitterContext = { bg = "NONE" },
+		TreesitterContextLineNumber = { fg = palette.rose, bg = "NONE" },
 	}
 
 	if config.options.enable.legacy_highlights then

From bf7ceb32fa4febef3efc80b54288e6257bd242e4 Mon Sep 17 00:00:00 2001
From: Shaun Clayton <shaun.j.clayton@gmail.com>
Date: Mon, 22 Jul 2024 11:17:13 -0400
Subject: [PATCH 144/190] chore: update mini-icons highlights to use
 appropriate colors (#295)

---
 lua/rose-pine.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index d2eb951..3399fe5 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -810,10 +810,10 @@ local function set_highlights()
 
 		MiniIconsAzure = { fg = palette.foam },
 		MiniIconsBlue = { fg = palette.pine },
-		MiniIconsCyan = { fg = palette.pine },
-		MiniIconsGreen = { fg = palette.foam },
-		MiniIconsGrey = { fg = palette.text },
-		MiniIconsOrange = { fg = palette.gold },
+		MiniIconsCyan = { fg = palette.foam },
+		MiniIconsGreen = { fg = palette.leaf },
+		MiniIconsGrey = { fg = palette.subtle },
+		MiniIconsOrange = { fg = palette.rose },
 		MiniIconsPurple = { fg = palette.iris },
 		MiniIconsRed = { fg = palette.love },
 		MiniIconsYellow = { fg = palette.gold },

From 5929bc8683801aa9c74ff454fec91572b34de156 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Mon, 22 Jul 2024 11:12:10 -0500
Subject: [PATCH 145/190] feat: improve float transparency (#298)

---
 lua/rose-pine.lua | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 3399fe5..bf5ef79 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -99,7 +99,7 @@ local function set_highlights()
 		-- EndOfBuffer = {},
 		ErrorMsg = { fg = groups.error, bold = styles.bold },
 		FloatBorder = make_border(),
-		FloatTitle = { link = "Directory" },
+		FloatTitle = { fg = palette.foam, bg = groups.panel, bold = styles.bold },
 		FoldColumn = { fg = palette.muted },
 		Folded = { fg = palette.text, bg = groups.panel },
 		IncSearch = { link = "CurSearch" },
@@ -800,8 +800,8 @@ local function set_highlights()
 		MiniFilesDirectory = { link = "Directory" },
 		MiniFilesFile = { fg = palette.text },
 		MiniFilesNormal = { link = "NormalFloat" },
-		MiniFilesTitle = { bg = groups.panel, fg = palette.foam, bold = styles.bold },
-		MiniFilesTitleFocused = { bg = groups.panel, fg = palette.rose, bold = styles.bold },
+		MiniFilesTitle = { link = "FloatTitle" },
+		MiniFilesTitleFocused = { fg = palette.rose, bg = groups.panel, bold = styles.bold },
 
 		MiniHipatternsFixme = { fg = palette.base, bg = groups.error, bold = styles.bold },
 		MiniHipatternsHack = { fg = palette.base, bg = groups.warn, bold = styles.bold },
@@ -926,6 +926,7 @@ local function set_highlights()
 		DiagnosticVirtualTextWarn = { fg = groups.warn },
 
 		FloatBorder = { fg = palette.muted, bg = "NONE" },
+		FloatTitle = { fg = palette.foam, bg = "NONE", bold = styles.bold },
 		Folded = { fg = palette.text, bg = "NONE" },
 		NormalFloat = { bg = "NONE" },
 		Normal = { fg = palette.text, bg = "NONE" },
@@ -957,6 +958,11 @@ local function set_highlights()
 
 		TreesitterContext = { bg = "NONE" },
 		TreesitterContextLineNumber = { fg = palette.rose, bg = "NONE" },
+
+		MiniFilesTitleFocused = { fg = palette.rose, bg = "NONE", bold = styles.bold },
+
+		MiniPickPrompt = { bg = "NONE", bold = styles.bold },
+		MiniPickBorderText = { bg = "NONE" },
 	}
 
 	if config.options.enable.legacy_highlights then

From 656f360dedfb543d7d23cc65269a69b18dfce527 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Mon, 22 Jul 2024 16:07:45 -0500
Subject: [PATCH 146/190] feat: improve diff text (#297)

---
 lua/rose-pine.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index bf5ef79..57c0eab 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -91,7 +91,7 @@ local function set_highlights()
 		DiffAdd = { bg = groups.git_add, blend = 20 },
 		DiffChange = { bg = groups.git_change, blend = 20 },
 		DiffDelete = { bg = groups.git_delete, blend = 20 },
-		DiffText = { bg = groups.git_text, blend = 20 },
+		DiffText = { bg = groups.git_text, blend = 40 },
 		diffAdded = { link = "DiffAdd" },
 		diffChanged = { link = "DiffChange" },
 		diffRemoved = { link = "DiffDelete" },

From f7c01f07ee19562385e4915c3805e669db8d31a6 Mon Sep 17 00:00:00 2001
From: Shaun Clayton <shaun.j.clayton@gmail.com>
Date: Tue, 23 Jul 2024 17:56:40 -0400
Subject: [PATCH 147/190] fix: fzf-lua invisible selection (#299)

* fix: invisible text in selection in fzf-lua

* fix: correct bg color for FzfLuaNormal

* fix: invisible text in selection in fzf-lua

* fix: correct bg color for FzfLuaNormal

* fix: change linking and add highlight for FzfLuaFilePart

* fix: linking to 'FloatTitle' for WhichKeyTitle

This works the same as the original fix, confirmed by testing
against nvim 0.10.0 and nightly.

Prefer linking over previous solution.
---
 lua/rose-pine.lua | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 57c0eab..a79d08b 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -541,7 +541,7 @@ local function set_highlights()
 		WhichKeyIconYellow = { fg = palette.gold },
 		WhichKeyNormal = { link = "NormalFloat" },
 		WhichKeySeparator = { fg = palette.subtle },
-		WhichKeyTitle = make_border(palette.foam),
+		WhichKeyTitle = { link = "FloatTitle" },
 		WhichKeyValue = { fg = palette.rose },
 
 		-- lukas-reineke/indent-blankline.nvim
@@ -667,13 +667,15 @@ local function set_highlights()
 		TelescopeTitle = { fg = palette.foam, bold = styles.bold },
 
 		-- ibhagwan/fzf-lua
-		FzfLuaNormal = { link = "NormalFloat" },
-		FzfLuaTitle = { fg = palette.foam, bold = styles.bold },
 		FzfLuaBorder = make_border(),
-		FzfLuaHeaderText = { fg = palette.love },
-		FzfLuaHeaderBind = { fg = palette.rose },
-		FzfLuaBufFlagCur = { fg = palette.subtle },
 		FzfLuaBufFlagAlt = { fg = palette.subtle },
+		FzfLuaBufFlagCur = { fg = palette.subtle },
+		FzfLuaCursorLine = { fg = palette.text, bg = palette.overlay },
+		FzfLuaFilePart = { fg = palette.text },
+		FzfLuaHeaderBind = { fg = palette.rose },
+		FzfLuaHeaderText = { fg = palette.love },
+		FzfLuaNormal = { link = "NormalFloat" },
+		FzfLuaTitle = { link = "FloatTitle" },
 
 		-- rcarriga/nvim-notify
 		NotifyDEBUGBorder = make_border(),

From 535240c84679690953b0ef19bc9ad5a625266ddd Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Tue, 23 Jul 2024 19:17:59 -0500
Subject: [PATCH 148/190] feat: highlight neotree tabs (#300)

Fixes #263
---
 lua/rose-pine.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index a79d08b..3528227 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -518,6 +518,10 @@ local function set_highlights()
 		NeoTreeGitModified = { fg = groups.git_dirty },
 		NeoTreeGitRenamed = { fg = groups.git_rename },
 		NeoTreeGitUntracked = { fg = groups.git_untracked },
+		NeoTreeTabActive = { fg = palette.text, bg = palette.overlay },
+		NeoTreeTabInactive = { fg = palette.subtle },
+		NeoTreeTabSeparatorActive = { link = "WinSeparator" },
+		NeoTreeTabSeparatorInactive = { link = "WinSeparator" },
 		NeoTreeTitleBar = { link = "StatusLineTerm" },
 
 		-- folke/flash.nvim

From d6112a7c5632232f6057deebd13dcf912810ca83 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Tue, 23 Jul 2024 21:51:43 -0500
Subject: [PATCH 149/190] fix(transparency): lualine separator (#301)

Fixes #288
---
 lua/lualine/themes/rose-pine.lua | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/lua/lualine/themes/rose-pine.lua b/lua/lualine/themes/rose-pine.lua
index 4c2c9a6..96d6b92 100644
--- a/lua/lualine/themes/rose-pine.lua
+++ b/lua/lualine/themes/rose-pine.lua
@@ -1,40 +1,34 @@
 local p = require("rose-pine.palette")
-local config = require("rose-pine.config")
-
-local bg_base = p.base
-if config.options.styles.transparency then
-	bg_base = "NONE"
-end
 
 return {
 	normal = {
 		a = { bg = p.rose, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.rose },
-		c = { bg = bg_base, fg = p.text },
+		c = { bg = p.base, fg = p.text },
 	},
 	insert = {
 		a = { bg = p.foam, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.foam },
-		c = { bg = bg_base, fg = p.text },
+		c = { bg = p.base, fg = p.text },
 	},
 	visual = {
 		a = { bg = p.iris, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.iris },
-		c = { bg = bg_base, fg = p.text },
+		c = { bg = p.base, fg = p.text },
 	},
 	replace = {
 		a = { bg = p.pine, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.pine },
-		c = { bg = bg_base, fg = p.text },
+		c = { bg = p.base, fg = p.text },
 	},
 	command = {
 		a = { bg = p.love, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.love },
-		c = { bg = bg_base, fg = p.text },
+		c = { bg = p.base, fg = p.text },
 	},
 	inactive = {
-		a = { bg = bg_base, fg = p.muted, gui = "bold" },
-		b = { bg = bg_base, fg = p.muted },
-		c = { bg = bg_base, fg = p.muted },
+		a = { bg = p.base, fg = p.muted, gui = "bold" },
+		b = { bg = p.base, fg = p.muted },
+		c = { bg = p.base, fg = p.muted },
 	},
 }

From 8b1a2e73d28f331bc9ecdf5dd84242a6a8d235b7 Mon Sep 17 00:00:00 2001
From: Shaun Clayton <shaun.j.clayton@gmail.com>
Date: Wed, 24 Jul 2024 17:29:39 -0400
Subject: [PATCH 150/190] feat: add support for markdown.nvim (#303)

* feat: add support for markdown.nvim

* fix: tweaked some highlights to achieve better appearance

* fix: adjust heading highlights to use group linking
---
 lua/rose-pine.lua        | 22 ++++++++++++++++++++--
 lua/rose-pine/config.lua |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 3528227..e356688 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -363,7 +363,7 @@ local function set_highlights()
 
 		["@markup.heading"] = { fg = palette.foam, bold = styles.bold },
 
-		["@markup.quote"] = { fg = palette.subtle },
+		["@markup.quote"] = { fg = palette.text },
 		["@markup.math"] = { link = "Special" },
 		["@markup.environment"] = { link = "Macro" },
 		["@markup.environment.name"] = { link = "@type" },
@@ -377,7 +377,7 @@ local function set_highlights()
 		-- ["@markup.raw.block"] = { bg = palette.surface },
 		["@markup.raw.delimiter.markdown"] = { fg = palette.subtle },
 
-		["@markup.list"] = { fg = palette.text },
+		["@markup.list"] = { fg = palette.pine },
 		["@markup.list.checked"] = { fg = palette.foam, bg = palette.foam, blend = 10 },
 		["@markup.list.unchecked"] = { fg = palette.text },
 
@@ -923,6 +923,24 @@ local function set_highlights()
 		RainbowDelimiterRed = { fg = palette.love },
 		RainbowDelimiterViolet = { fg = palette.iris },
 		RainbowDelimiterYellow = { fg = palette.gold },
+
+		-- MeanderingProgrammer/markdown.nvim
+		RenderMarkdownBullet = { fg = palette.rose },
+		RenderMarkdownChecked = { fg = palette.foam },
+		RenderMarkdownCode = { bg = palette.overlay },
+		RenderMarkdownCodeInline = { fg = palette.text, bg = palette.overlay },
+		RenderMarkdownDash = { fg = palette.muted },
+		RenderMarkdownH1Bg = { bg = groups.h1, blend = 20 },
+		RenderMarkdownH2Bg = { bg = groups.h2, blend = 20 },
+		RenderMarkdownH3Bg = { bg = groups.h3, blend = 20 },
+		RenderMarkdownH4Bg = { bg = groups.h4, blend = 20 },
+		RenderMarkdownH5Bg = { bg = groups.h5, blend = 20 },
+		RenderMarkdownH6Bg = { bg = groups.h6, blend = 20 },
+		RenderMarkdownQuote = { fg = palette.subtle },
+		RenderMarkdownTableFill = { link = "Conceal" },
+		RenderMarkdownTableHead = { fg = palette.subtle },
+		RenderMarkdownTableRow = { fg = palette.subtle },
+		RenderMarkdownUnchecked = { fg = palette.subtle },
 	}
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },
diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index cdbec69..eb05330 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -66,7 +66,7 @@ config.options = {
 		h3 = "rose",
 		h4 = "gold",
 		h5 = "pine",
-		h6 = "foam",
+		h6 = "leaf",
 
 		---@deprecated Replaced by `options.highlight_groups["Normal"]`
 		-- background = "base",

From c14da532fae30f089ea6d47fcfe64b0ed1b9bd80 Mon Sep 17 00:00:00 2001
From: Shaun Clayton <shaun.j.clayton@gmail.com>
Date: Thu, 25 Jul 2024 17:47:21 -0400
Subject: [PATCH 151/190] feat: add support for grug-far.nvim (#304)

* feat: add support for grug-far.nvim

* fix: change link for results match to `CurSearch`

Co-authored-by: not <mvllow@icloud.com>

* fix: add highlights for line numbers

---------

Co-authored-by: not <mvllow@icloud.com>
---
 lua/rose-pine.lua | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index e356688..471e57e 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -126,7 +126,7 @@ local function set_highlights()
 		RedrawDebugClear = { fg = palette.base, bg = palette.gold },
 		RedrawDebugComposed = { fg = palette.base, bg = palette.pine },
 		RedrawDebugRecompose = { fg = palette.base, bg = palette.love },
-		Search = { fg = palette.base, bg = palette.text },
+		Search = { fg = palette.base, bg = palette.rose },
 		SignColumn = { fg = palette.text, bg = "NONE" },
 		SpecialKey = { fg = palette.foam },
 		SpellBad = { sp = palette.subtle, undercurl = true },
@@ -941,6 +941,24 @@ local function set_highlights()
 		RenderMarkdownTableHead = { fg = palette.subtle },
 		RenderMarkdownTableRow = { fg = palette.subtle },
 		RenderMarkdownUnchecked = { fg = palette.subtle },
+
+		-- MagicDuck/grug-far.nvim
+		GrugFarHelpHeader = { fg = palette.pine },
+		GrugFarHelpHeaderKey = { fg = palette.gold },
+		GrugFarHelpWinActionKey = { fg = palette.gold },
+		GrugFarHelpWinActionPrefix = { fg = palette.foam },
+		GrugFarHelpWinActionText = { fg = palette.pine },
+		GrugFarHelpWinHeader = { link = "FloatTitle" },
+		GrugFarInputLabel = { fg = palette.foam },
+		GrugFarInputPlaceholder = { link = "Comment" },
+		GrugFarResultsActionMessage = { fg = palette.foam },
+		GrugFarResultsChangeIndicator = { fg = groups.git_change },
+		GrugFarResultsHeader = { fg = palette.pine },
+		GrugFarResultsLineNo = { fg = palette.iris },
+		GrugFarResultsLineColumn = { link = "GrugFarResultsLineNo" },
+		GrugFarResultsMatch = { link = "CurSearch" },
+		GrugFarResultsPath = { fg = palette.foam },
+		GrugFarResultsStats = { fg = palette.iris },
 	}
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },

From 7f0b8c4c7f08ed24aeca9a3392f347964b7772dd Mon Sep 17 00:00:00 2001
From: Vlad <52591095+MeanderingProgrammer@users.noreply.github.com>
Date: Mon, 5 Aug 2024 13:59:59 -0700
Subject: [PATCH 152/190] chore: markdown.nvim renamed to render-markdown.nvim
 (#309)

Reference to change:
https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/aeb5cec617c3bd5738ab82ba2c3f9ccdc27656c2
---
 lua/rose-pine.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 471e57e..1573fa6 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -924,7 +924,7 @@ local function set_highlights()
 		RainbowDelimiterViolet = { fg = palette.iris },
 		RainbowDelimiterYellow = { fg = palette.gold },
 
-		-- MeanderingProgrammer/markdown.nvim
+		-- MeanderingProgrammer/render-markdown.nvim
 		RenderMarkdownBullet = { fg = palette.rose },
 		RenderMarkdownChecked = { fg = palette.foam },
 		RenderMarkdownCode = { bg = palette.overlay },

From d97cc7fcd772c203fec60bfcc49ebbec470d3cb0 Mon Sep 17 00:00:00 2001
From: Allan Deutsch <allan@allandeutsch.com>
Date: Mon, 12 Aug 2024 16:59:44 -0400
Subject: [PATCH 153/190] fix: nvim-notify background (#308)

---
 lua/rose-pine.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 1573fa6..3115710 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -697,7 +697,7 @@ local function set_highlights()
 		NotifyWARNBorder = make_border(groups.warn),
 		NotifyWARNIcon = { link = "NotifyWARNTitle" },
 		NotifyWARNTitle = { fg = groups.warn },
-
+		NotifyBackground = { bg = palette.surface },
 		-- rcarriga/nvim-dap-ui
 		DapUIBreakpointsCurrentLine = { fg = palette.gold, bold = styles.bold },
 		DapUIBreakpointsDisabledLine = { fg = palette.muted },

From 94ffdb774815f9d8b1b00425375b6996ec131beb Mon Sep 17 00:00:00 2001
From: jostaub <67969701+jostaub@users.noreply.github.com>
Date: Wed, 14 Aug 2024 20:40:33 +0200
Subject: [PATCH 154/190] feat: palette overrides (#307)

* feat: palette overrides

* removed option all from palett override

* removed dead code forgotten in last commit

* fix typo in readme and simplified comment

Co-authored-by: not <mvllow@icloud.com>

---------

Co-authored-by: not <mvllow@icloud.com>
---
 lua/rose-pine/config.lua  | 3 +++
 lua/rose-pine/palette.lua | 9 +++++++++
 readme.md                 | 8 ++++++++
 3 files changed, 20 insertions(+)

diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index eb05330..bbc9967 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -35,6 +35,9 @@ config.options = {
 		transparency = false,
 	},
 
+	---@type table<string, table<string, string>>
+	palette = {},
+
 	---@type table<string, string | PaletteColor>
 	groups = {
 		border = "muted",
diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index ffa5f81..59c300c 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -62,6 +62,15 @@ local variants = {
 	},
 }
 
+if options.palette ~= nil and next(options.palette) then
+	-- handle variant specific overrides
+	for variant_name, override_palette in pairs(options.palette) do
+		if variants[variant_name] then
+			variants[variant_name] = vim.tbl_extend("force", variants[variant_name], override_palette or {})
+		end
+	end
+end
+
 if variants[options.variant] ~= nil then
 	return variants[options.variant]
 end
diff --git a/readme.md b/readme.md
index 7c1ac9b..febb363 100644
--- a/readme.md
+++ b/readme.md
@@ -100,6 +100,14 @@ require("rose-pine").setup({
         h6 = "foam",
     },
 
+    pallete = {
+        -- Override the builtin palette per variant
+        -- moon = {
+        --     base = '#18191a',
+        --     overlay = '#363738',
+        -- },
+    },
+
     highlight_groups = {
         -- Comment = { fg = "foam" },
         -- VertSplit = { fg = "muted", bg = "muted" },

From fe9e661cdac2e8f42b20411555dd0d47b5d54691 Mon Sep 17 00:00:00 2001
From: Aaron Pham <Aaronpham0103@gmail.com>
Date: Sun, 25 Aug 2024 13:20:43 -0400
Subject: [PATCH 155/190] feat(plugins): add support for avante.nvim (#315)

---
 lua/rose-pine.lua | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 3115710..0706a74 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -959,6 +959,14 @@ local function set_highlights()
 		GrugFarResultsMatch = { link = "CurSearch" },
 		GrugFarResultsPath = { fg = palette.foam },
 		GrugFarResultsStats = { fg = palette.iris },
+
+		-- yetone/avante.nvim
+		AvanteTitle = { fg = pallete.highlight_high, bg = pallete.rose },
+		AvanteReversedTitle = { fg = pallete.rose },
+		AvanteSubtitle = { fg = pallete.highlight_med, bg = pallete.foam },
+		AvanteReversedSubtitle = { fg = pallete.foam },
+		AvanteThirdTitle = { fg = pallete.highlight_med, bg = pallete.iris },
+		AvanteReversedThirdTitle = { fg = pallete.iris },
 	}
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },

From 33a1ba312628da66dad067636d292166faa94c61 Mon Sep 17 00:00:00 2001
From: dav-cho <78996780+dav-cho@users.noreply.github.com>
Date: Sun, 25 Aug 2024 13:35:29 -0400
Subject: [PATCH 156/190] fix: wrong spelling for palette (#316)

---
 lua/rose-pine.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 0706a74..6f3adfe 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -961,12 +961,12 @@ local function set_highlights()
 		GrugFarResultsStats = { fg = palette.iris },
 
 		-- yetone/avante.nvim
-		AvanteTitle = { fg = pallete.highlight_high, bg = pallete.rose },
-		AvanteReversedTitle = { fg = pallete.rose },
-		AvanteSubtitle = { fg = pallete.highlight_med, bg = pallete.foam },
-		AvanteReversedSubtitle = { fg = pallete.foam },
-		AvanteThirdTitle = { fg = pallete.highlight_med, bg = pallete.iris },
-		AvanteReversedThirdTitle = { fg = pallete.iris },
+		AvanteTitle = { fg = palette.highlight_high, bg = palette.rose },
+		AvanteReversedTitle = { fg = palette.rose },
+		AvanteSubtitle = { fg = palette.highlight_med, bg = palette.foam },
+		AvanteReversedSubtitle = { fg = palette.foam },
+		AvanteThirdTitle = { fg = palette.highlight_med, bg = palette.iris },
+		AvanteReversedThirdTitle = { fg = palette.iris },
 	}
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },

From 22f873c7db1afc5b9400190bb3937a4d852df692 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sun, 25 Aug 2024 12:37:07 -0500
Subject: [PATCH 157/190] fix: palette typo (#317)

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index febb363..5247dbd 100644
--- a/readme.md
+++ b/readme.md
@@ -100,7 +100,7 @@ require("rose-pine").setup({
         h6 = "foam",
     },
 
-    pallete = {
+    palette = {
         -- Override the builtin palette per variant
         -- moon = {
         --     base = '#18191a',

From 2f44ef189f80c319f750e3190f63338cb328c532 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sun, 25 Aug 2024 12:41:35 -0500
Subject: [PATCH 158/190] feat: use neutral colours for search (#318)

---
 lua/rose-pine.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 6f3adfe..cbd74b6 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -80,7 +80,7 @@ local function set_highlights()
 	local default_highlights = {
 		ColorColumn = { bg = palette.surface },
 		Conceal = { bg = "NONE" },
-		CurSearch = { fg = palette.base, bg = palette.gold },
+		CurSearch = { fg = palette.base, bg = palette.text },
 		Cursor = { fg = palette.text, bg = palette.highlight_high },
 		CursorColumn = { bg = palette.overlay },
 		-- CursorIM = {},
@@ -126,7 +126,7 @@ local function set_highlights()
 		RedrawDebugClear = { fg = palette.base, bg = palette.gold },
 		RedrawDebugComposed = { fg = palette.base, bg = palette.pine },
 		RedrawDebugRecompose = { fg = palette.base, bg = palette.love },
-		Search = { fg = palette.base, bg = palette.rose },
+		Search = { fg = palette.text, bg = palette.text, blend = 20 },
 		SignColumn = { fg = palette.text, bg = "NONE" },
 		SpecialKey = { fg = palette.foam },
 		SpellBad = { sp = palette.subtle, undercurl = true },

From 8869e546d4873b874bc35d20e287b1775584ad71 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Sun, 25 Aug 2024 13:09:15 -0500
Subject: [PATCH 159/190] feat(transparency): support trouble.nvim (#319)

---
 lua/rose-pine.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index cbd74b6..67e52c0 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -999,6 +999,8 @@ local function set_highlights()
 		TelescopeSelection = { fg = palette.text, bg = "NONE", bold = styles.bold },
 		TelescopeSelectionCaret = { fg = palette.rose },
 
+		TroubleNormal = { bg = "NONE" },
+
 		WhichKeyFloat = { bg = "NONE" },
 		WhichKeyNormal = { bg = "NONE" },
 

From 1ebe0a5171c8be76bf62c87fc688d110ab444d42 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Tue, 8 Oct 2024 10:22:29 -0500
Subject: [PATCH 160/190] feat: use gold for search

Closes #305
---
 lua/rose-pine.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 67e52c0..65020f9 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -80,7 +80,7 @@ local function set_highlights()
 	local default_highlights = {
 		ColorColumn = { bg = palette.surface },
 		Conceal = { bg = "NONE" },
-		CurSearch = { fg = palette.base, bg = palette.text },
+		CurSearch = { fg = palette.base, bg = palette.gold },
 		Cursor = { fg = palette.text, bg = palette.highlight_high },
 		CursorColumn = { bg = palette.overlay },
 		-- CursorIM = {},
@@ -126,7 +126,7 @@ local function set_highlights()
 		RedrawDebugClear = { fg = palette.base, bg = palette.gold },
 		RedrawDebugComposed = { fg = palette.base, bg = palette.pine },
 		RedrawDebugRecompose = { fg = palette.base, bg = palette.love },
-		Search = { fg = palette.text, bg = palette.text, blend = 20 },
+		Search = { fg = palette.text, bg = palette.gold, blend = 20 },
 		SignColumn = { fg = palette.text, bg = "NONE" },
 		SpecialKey = { fg = palette.foam },
 		SpellBad = { sp = palette.subtle, undercurl = true },

From 5e7bf83782429fde7f59ba1c98702fdaa77be613 Mon Sep 17 00:00:00 2001
From: Anupam Basu <anupamb@udel.edu>
Date: Wed, 23 Oct 2024 17:59:08 -0500
Subject: [PATCH 161/190] feat: add highlight support for epwalsh/obsidian.nvim
 (#323)

---------

Co-authored-by: mvllow <mvllow@icloud.com>
---
 lua/rose-pine/plugins/obsidian.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 lua/rose-pine/plugins/obsidian.lua

diff --git a/lua/rose-pine/plugins/obsidian.lua b/lua/rose-pine/plugins/obsidian.lua
new file mode 100644
index 0000000..43cc3b3
--- /dev/null
+++ b/lua/rose-pine/plugins/obsidian.lua
@@ -0,0 +1,14 @@
+--- Rosé Pine for Obsidian(epwalsh)
+--- https://github.com/epwalsh/obsidian.nvim
+---
+--- @usage
+--- local highlights = require("rose-pine.plugins.obsidian")
+--- require("obsidian").setup({ ui = {hl_groups = highlights} })
+
+local p = require("rose-pine.palette")
+
+return {
+	ObsidianBullet = { fg = p.muted },
+	ObsidianRefText = { underline = true, fg = p.iris },
+	ObsidianDone = { bold = true, fg = p.foam }
+}

From a449bb2599bfe04aa134bc049c6cd5bb0d139ea2 Mon Sep 17 00:00:00 2001
From: Metin Yalcinkaya <MetinYalcinkaya@users.noreply.github.com>
Date: Wed, 11 Dec 2024 02:39:28 +1100
Subject: [PATCH 162/190] feat: added highlight support for Saghen/blink.cmp
 (#329)

Closes #326
---
 lua/rose-pine.lua | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 65020f9..39da9bc 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -967,6 +967,46 @@ local function set_highlights()
 		AvanteReversedSubtitle = { fg = palette.foam },
 		AvanteThirdTitle = { fg = palette.highlight_med, bg = palette.iris },
 		AvanteReversedThirdTitle = { fg = palette.iris },
+
+		-- Saghen/blink.cmp
+		BlinkCmpDoc = { fg = palette.text },
+		BlinkCmpDocBorder = { fg = palette.highlight_high },
+		BlinkCmpGhostText = { fg = palette.muted },
+
+		BlinkCmpLabel = { fg = palette.muted },
+		BlinkCmpLabelDeprecated = { fg = palette.muted, strikethrough = true },
+		BlinkCmpLabelMatch = { fg = palette.text, bold = styles.bold },
+
+		BlinkCmpDefault = { fg = palette.highlight_med },
+		BlinkCmpKindText = { fg = palette.pine },
+		BlinkCmpKindMethod = { fg = palette.foam },
+		BlinkCmpKindFunction = { fg = palette.foam },
+		BlinkCmpKindConstructor = { fg = palette.foam },
+		BlinkCmpKindField = { fg = palette.pine },
+		BlinkCmpKindVariable = { fg = palette.rose },
+		BlinkCmpKindClass = { fg = palette.gold },
+		BlinkCmpKindInterface = { fg = palette.gold },
+		BlinkCmpKindModule = { fg = palette.foam },
+		BlinkCmpKindProperty = { fg = palette.foam },
+		BlinkCmpKindUnit = { fg = palette.pine },
+		BlinkCmpKindValue = { fg = palette.love },
+		BlinkCmpKindKeyword = { fg = palette.iris },
+		BlinkCmpKindSnippet = { fg = palette.rose },
+		BlinkCmpKindColor = { fg = palette.love },
+		BlinkCmpKindFile = { fg = palette.foam },
+		BlinkCmpKindReference = { fg = palette.love },
+		BlinkCmpKindFolder = { fg = palette.foam },
+		BlinkCmpKindEnum = { fg = palette.foam },
+		BlinkCmpKindEnumMember = { fg = palette.foam },
+		BlinkCmpKindConstant = { fg = palette.gold },
+		BlinkCmpKindStruct = { fg = palette.foam },
+		BlinkCmpKindEvent = { fg = palette.foam },
+		BlinkCmpKindOperator = { fg = palette.foam },
+		BlinkCmpKindTypeParameter = { fg = palette.iris },
+		BlinkCmpKindCodeium = { fg = palette.foam },
+		BlinkCmpKindCopilot = { fg = palette.foam },
+		BlinkCmpKindSupermaven = { fg = palette.foam },
+		BlinkCmpKindTabNine = { fg = palette.foam },
 	}
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },

From 36526815ee308979b1cd703bba2033a88c2db1f5 Mon Sep 17 00:00:00 2001
From: YarLama <52606645+YarLama@users.noreply.github.com>
Date: Tue, 10 Dec 2024 18:50:19 +0300
Subject: [PATCH 163/190] Update readme.md (#328)

* Update readme.md

Extended description for Structured Setup lazy.nvim

* Update readme.md

---------

Co-authored-by: mvllow <mvllow@icloud.com>
---
 readme.md | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/readme.md b/readme.md
index 5247dbd..8a2740c 100644
--- a/readme.md
+++ b/readme.md
@@ -13,15 +13,30 @@
 
 ## Getting started
 
-Install `rose-pine/neovim` using your favourite plugin manager:
+Install `rose-pine/neovim` using your favourite package manager:
 
-**paq-nvim**
+### [pam.nvim](https://github.com/mvllow/pam.nvim)
 
 ```lua
-{ "rose-pine/neovim", as = "rose-pine" }
+{ source = "rose-pine/neovim", as = "rose-pine" }
 ```
 
-**lazy.nvim**
+### [lazy.nvim](https://lazy.folke.io/installation)
+
+**Structured Setup**
+
+```lua
+-- lua/plugins/rose-pine.lua
+return { 
+	"rose-pine/neovim", 
+	name = "rose-pine",
+	config = function()
+		vim.cmd("colorscheme rose-pine")
+	end
+}
+```
+
+**Single file**
 
 ```lua
 { "rose-pine/neovim", name = "rose-pine" }

From fc418a716fa1808153da4bd53606f5524328f861 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Tue, 7 Jan 2025 09:47:00 -0600
Subject: [PATCH 164/190] fix: lualine transparency

Fixes #333
---
 lua/lualine/themes/rose-pine-alt.lua | 12 +++++++++---
 lua/lualine/themes/rose-pine.lua     | 22 ++++++++++++++--------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/lua/lualine/themes/rose-pine-alt.lua b/lua/lualine/themes/rose-pine-alt.lua
index 05d8af7..287144f 100644
--- a/lua/lualine/themes/rose-pine-alt.lua
+++ b/lua/lualine/themes/rose-pine-alt.lua
@@ -1,4 +1,10 @@
 local p = require("rose-pine.palette")
+local config = require("rose-pine.config")
+
+local bg_base = p.base
+if config.options.styles.transparency then
+	bg_base = "NONE"
+end
 
 return {
 	normal = {
@@ -19,8 +25,8 @@ return {
 		a = { bg = p.surface, fg = p.love, gui = "bold" },
 	},
 	inactive = {
-		a = { bg = p.base, fg = p.subtle, gui = "bold" },
-		b = { bg = p.base, fg = p.subtle },
-		c = { bg = p.base, fg = p.subtle, gui = "italic" },
+		a = { bg = bg_base, fg = p.subtle, gui = "bold" },
+		b = { bg = bg_base, fg = p.subtle },
+		c = { bg = bg_base, fg = p.subtle, gui = "italic" },
 	},
 }
diff --git a/lua/lualine/themes/rose-pine.lua b/lua/lualine/themes/rose-pine.lua
index 96d6b92..4c2c9a6 100644
--- a/lua/lualine/themes/rose-pine.lua
+++ b/lua/lualine/themes/rose-pine.lua
@@ -1,34 +1,40 @@
 local p = require("rose-pine.palette")
+local config = require("rose-pine.config")
+
+local bg_base = p.base
+if config.options.styles.transparency then
+	bg_base = "NONE"
+end
 
 return {
 	normal = {
 		a = { bg = p.rose, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.rose },
-		c = { bg = p.base, fg = p.text },
+		c = { bg = bg_base, fg = p.text },
 	},
 	insert = {
 		a = { bg = p.foam, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.foam },
-		c = { bg = p.base, fg = p.text },
+		c = { bg = bg_base, fg = p.text },
 	},
 	visual = {
 		a = { bg = p.iris, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.iris },
-		c = { bg = p.base, fg = p.text },
+		c = { bg = bg_base, fg = p.text },
 	},
 	replace = {
 		a = { bg = p.pine, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.pine },
-		c = { bg = p.base, fg = p.text },
+		c = { bg = bg_base, fg = p.text },
 	},
 	command = {
 		a = { bg = p.love, fg = p.base, gui = "bold" },
 		b = { bg = p.overlay, fg = p.love },
-		c = { bg = p.base, fg = p.text },
+		c = { bg = bg_base, fg = p.text },
 	},
 	inactive = {
-		a = { bg = p.base, fg = p.muted, gui = "bold" },
-		b = { bg = p.base, fg = p.muted },
-		c = { bg = p.base, fg = p.muted },
+		a = { bg = bg_base, fg = p.muted, gui = "bold" },
+		b = { bg = bg_base, fg = p.muted },
+		c = { bg = bg_base, fg = p.muted },
 	},
 }

From c306f1315841038defc10c90f79d0dc9aec2d60f Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Wed, 8 Jan 2025 09:09:59 -0600
Subject: [PATCH 165/190] feat: use blended iris for visual

Fixes #277
---
 lua/rose-pine.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 39da9bc..8c1f782 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -143,7 +143,7 @@ local function set_highlights()
 		TabLineSel = { fg = palette.text, bg = palette.overlay, bold = styles.bold },
 		Title = { fg = palette.foam, bold = styles.bold },
 		VertSplit = { fg = groups.border },
-		Visual = { bg = palette.highlight_med },
+		Visual = { bg = palette.iris, blend = 15 },
 		-- VisualNOS = {},
 		WarningMsg = { fg = groups.warn, bold = styles.bold },
 		-- Whitespace = {},

From 463742691b259aa63aa6cb0e23fb89eb1aef2667 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Wed, 8 Jan 2025 09:37:09 -0600
Subject: [PATCH 166/190] feat: add `Notify*Body` highlights

Fixes #331
---
 lua/rose-pine.lua | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 8c1f782..a8e297d 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -682,22 +682,28 @@ local function set_highlights()
 		FzfLuaTitle = { link = "FloatTitle" },
 
 		-- rcarriga/nvim-notify
+		NotifyBackground = { link = "NormalFloat" },
+		NotifyDEBUGBody = { link = 'NormalFloat' },
 		NotifyDEBUGBorder = make_border(),
 		NotifyDEBUGIcon = { link = "NotifyDEBUGTitle" },
 		NotifyDEBUGTitle = { fg = palette.muted },
+		NotifyERRORBody = { link = 'NormalFloat' },
 		NotifyERRORBorder = make_border(groups.error),
 		NotifyERRORIcon = { link = "NotifyERRORTitle" },
 		NotifyERRORTitle = { fg = groups.error },
+		NotifyINFOBody = { link = 'NormalFloat' },
 		NotifyINFOBorder = make_border(groups.info),
 		NotifyINFOIcon = { link = "NotifyINFOTitle" },
 		NotifyINFOTitle = { fg = groups.info },
+		NotifyTRACEBody = { link = 'NormalFloat' },
 		NotifyTRACEBorder = make_border(palette.iris),
 		NotifyTRACEIcon = { link = "NotifyTRACETitle" },
 		NotifyTRACETitle = { fg = palette.iris },
+		NotifyWARNBody = { link = 'NormalFloat' },
 		NotifyWARNBorder = make_border(groups.warn),
 		NotifyWARNIcon = { link = "NotifyWARNTitle" },
 		NotifyWARNTitle = { fg = groups.warn },
-		NotifyBackground = { bg = palette.surface },
+
 		-- rcarriga/nvim-dap-ui
 		DapUIBreakpointsCurrentLine = { fg = palette.gold, bold = styles.bold },
 		DapUIBreakpointsDisabledLine = { fg = palette.muted },

From 40f03c4df10023a5532e204e5aa0dc95067d7f05 Mon Sep 17 00:00:00 2001
From: Federico Minaya <elfedeminaya@gmail.com>
Date: Tue, 14 Jan 2025 18:20:19 -0300
Subject: [PATCH 167/190] feat: add snacks indent highlights (#334)

---
 lua/rose-pine.lua | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index a8e297d..2bf1aa2 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -683,23 +683,23 @@ local function set_highlights()
 
 		-- rcarriga/nvim-notify
 		NotifyBackground = { link = "NormalFloat" },
-		NotifyDEBUGBody = { link = 'NormalFloat' },
+		NotifyDEBUGBody = { link = "NormalFloat" },
 		NotifyDEBUGBorder = make_border(),
 		NotifyDEBUGIcon = { link = "NotifyDEBUGTitle" },
 		NotifyDEBUGTitle = { fg = palette.muted },
-		NotifyERRORBody = { link = 'NormalFloat' },
+		NotifyERRORBody = { link = "NormalFloat" },
 		NotifyERRORBorder = make_border(groups.error),
 		NotifyERRORIcon = { link = "NotifyERRORTitle" },
 		NotifyERRORTitle = { fg = groups.error },
-		NotifyINFOBody = { link = 'NormalFloat' },
+		NotifyINFOBody = { link = "NormalFloat" },
 		NotifyINFOBorder = make_border(groups.info),
 		NotifyINFOIcon = { link = "NotifyINFOTitle" },
 		NotifyINFOTitle = { fg = groups.info },
-		NotifyTRACEBody = { link = 'NormalFloat' },
+		NotifyTRACEBody = { link = "NormalFloat" },
 		NotifyTRACEBorder = make_border(palette.iris),
 		NotifyTRACEIcon = { link = "NotifyTRACETitle" },
 		NotifyTRACETitle = { fg = palette.iris },
-		NotifyWARNBody = { link = 'NormalFloat' },
+		NotifyWARNBody = { link = "NormalFloat" },
 		NotifyWARNBorder = make_border(groups.warn),
 		NotifyWARNIcon = { link = "NotifyWARNTitle" },
 		NotifyWARNTitle = { fg = groups.warn },
@@ -1013,6 +1013,12 @@ local function set_highlights()
 		BlinkCmpKindCopilot = { fg = palette.foam },
 		BlinkCmpKindSupermaven = { fg = palette.foam },
 		BlinkCmpKindTabNine = { fg = palette.foam },
+
+		-- folke/snacks.nvim
+		SnacksIndent = { fg = palette.overlay },
+		SnacksIndentChunk = { fg = palette.overlay },
+		SnacksIndentBlank = { fg = palette.overlay },
+		SnacksIndentScope = { fg = palette.foam },
 	}
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },

From 6b511539052e40b91f94f92a745f459e1a965af1 Mon Sep 17 00:00:00 2001
From: Patrick Haun <patrick@bomgar.email>
Date: Wed, 15 Jan 2025 21:28:37 +0100
Subject: [PATCH 168/190] More obvious match highlight in snacks.picker (#335)

---
 lua/rose-pine.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 2bf1aa2..5f4bf54 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -1019,6 +1019,8 @@ local function set_highlights()
 		SnacksIndentChunk = { fg = palette.overlay },
 		SnacksIndentBlank = { fg = palette.overlay },
 		SnacksIndentScope = { fg = palette.foam },
+
+		SnacksPickerMatch = { fg = palette.rose, bold = styles.bold },
 	}
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },

From ffd5b6994859ee2affe723b082b0e479ca95a5bf Mon Sep 17 00:00:00 2001
From: aileot <46470475+aileot@users.noreply.github.com>
Date: Mon, 3 Feb 2025 06:09:20 +0900
Subject: [PATCH 169/190] refactor(gitsigns): avoid redundant links (#336)

The `SignAdd`, `SignChange`, and `SignDelete` are never referenced by
any other highlight definitions than the previous `GitSigns` ones before
this change.

The isolated definitions are only left for backward compatibility.
---
 lua/rose-pine.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 5f4bf54..81bfd4f 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -451,9 +451,9 @@ local function set_highlights()
 		BufferVisibleTarget = { fg = palette.gold },
 
 		-- lewis6991/gitsigns.nvim
-		GitSignsAdd = { link = "SignAdd" },
-		GitSignsChange = { link = "SignChange" },
-		GitSignsDelete = { link = "SignDelete" },
+		GitSignsAdd = { fg = groups.git_add, bg = "NONE" },
+		GitSignsChange = { fg = groups.git_change, bg = "NONE" },
+		GitSignsDelete = { fg = groups.git_delete, bg = "NONE" },
 		SignAdd = { fg = groups.git_add, bg = "NONE" },
 		SignChange = { fg = groups.git_change, bg = "NONE" },
 		SignDelete = { fg = groups.git_delete, bg = "NONE" },

From 2b88dfb054e31cd5532c05c796aec2f0a8f04469 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Mon, 3 Feb 2025 11:05:20 -0600
Subject: [PATCH 170/190] refactor: update documentation

---
 lua/rose-pine.lua | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 81bfd4f..660759a 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -271,7 +271,8 @@ local function set_highlights()
 		mkdRule = { fg = palette.subtle },
 		mkdURL = { link = "markdownUrl" },
 
-		--- Identifiers
+		--- Treesitter
+		--- |:help treesitter-highlight-groups|
 		["@variable"] = { fg = palette.text, italic = styles.italic },
 		["@variable.builtin"] = { fg = palette.love, bold = styles.bold },
 		["@variable.parameter"] = { fg = palette.iris, italic = styles.italic },
@@ -285,7 +286,6 @@ local function set_highlights()
 		["@module.builtin"] = { fg = palette.text, bold = styles.bold },
 		["@label"] = { link = "Label" },
 
-		--- Literals
 		["@string"] = { link = "String" },
 		-- ["@string.documentation"] = {},
 		["@string.regexp"] = { fg = palette.iris },
@@ -303,27 +303,24 @@ local function set_highlights()
 		["@number.float"] = { link = "Number" },
 		["@float"] = { link = "Number" },
 
-		--- Types
 		["@type"] = { fg = palette.foam },
 		["@type.builtin"] = { fg = palette.foam, bold = styles.bold },
 		-- ["@type.definition"] = {},
-		-- ["@type.qualifier"] = {},
 
 		-- ["@attribute"] = {},
 		["@property"] = { fg = palette.foam, italic = styles.italic },
 
-		--- Functions
 		["@function"] = { fg = palette.rose },
 		["@function.builtin"] = { fg = palette.rose, bold = styles.bold },
 		-- ["@function.call"] = {},
 		["@function.macro"] = { link = "Function" },
+
 		["@function.method"] = { fg = palette.rose },
 		["@function.method.call"] = { fg = palette.iris },
 
 		["@constructor"] = { fg = palette.foam },
 		["@operator"] = { link = "Operator" },
 
-		--- Keywords
 		["@keyword"] = { link = "Keyword" },
 		-- ["@keyword.coroutine"] = {},
 		-- ["@keyword.function"] = {},
@@ -334,8 +331,10 @@ local function set_highlights()
 		["@keyword.return"] = { fg = palette.pine },
 		["@keyword.debug"] = { fg = palette.rose },
 		["@keyword.exception"] = { fg = palette.pine },
+
 		["@keyword.conditional"] = { fg = palette.pine },
 		["@keyword.conditional.ternary"] = { fg = palette.pine },
+
 		["@keyword.directive"] = { fg = palette.iris },
 		["@keyword.directive.define"] = { fg = palette.iris },
 

From 8db12177048b7af3deb99a5e6c62a43bb23d08f8 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Mon, 3 Feb 2025 11:05:44 -0600
Subject: [PATCH 171/190] feat: use consistent variable styles

---
 lua/rose-pine.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 660759a..054be1c 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -274,8 +274,9 @@ local function set_highlights()
 		--- Treesitter
 		--- |:help treesitter-highlight-groups|
 		["@variable"] = { fg = palette.text, italic = styles.italic },
-		["@variable.builtin"] = { fg = palette.love, bold = styles.bold },
+		["@variable.builtin"] = { fg = palette.love, italic = styles.italic, bold = styles.bold },
 		["@variable.parameter"] = { fg = palette.iris, italic = styles.italic },
+		["@variable.parameter.builtin"] = { fg = palette.iris, italic = styles.italic, bold = styles.bold },
 		["@variable.member"] = { fg = palette.foam },
 
 		["@constant"] = { fg = palette.gold },

From 0ca4bfbc6f5904f8b18714fbe4f31a6bc59a3b87 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Mon, 3 Feb 2025 11:05:57 -0600
Subject: [PATCH 172/190] feat: set attribute style

---
 lua/rose-pine.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 054be1c..4d55469 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -308,7 +308,8 @@ local function set_highlights()
 		["@type.builtin"] = { fg = palette.foam, bold = styles.bold },
 		-- ["@type.definition"] = {},
 
-		-- ["@attribute"] = {},
+		["@attribute"] = { fg = "iris" },
+		["@attribute.builtin"] = { fg = "iris", bold = styles.bold },
 		["@property"] = { fg = palette.foam, italic = styles.italic },
 
 		["@function"] = { fg = palette.rose },

From 3d71ab02f25dd51fbc18f3d2604a23c69b958494 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Mon, 3 Feb 2025 11:06:21 -0600
Subject: [PATCH 173/190] feat: reduce background opacity for special comments

---
 lua/rose-pine.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 4d55469..523e9d6 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -351,10 +351,10 @@ local function set_highlights()
 
 		["@comment.error"] = { fg = groups.error },
 		["@comment.warning"] = { fg = groups.warn },
-		["@comment.todo"] = { fg = groups.todo, bg = groups.todo, blend = 20 },
-		["@comment.hint"] = { fg = groups.hint, bg = groups.hint, blend = 20 },
-		["@comment.info"] = { fg = groups.info, bg = groups.info, blend = 20 },
-		["@comment.note"] = { fg = groups.note, bg = groups.note, blend = 20 },
+		["@comment.todo"] = { fg = groups.todo, bg = groups.todo, blend = 15 },
+		["@comment.hint"] = { fg = groups.hint, bg = groups.hint, blend = 15 },
+		["@comment.info"] = { fg = groups.info, bg = groups.info, blend = 15 },
+		["@comment.note"] = { fg = groups.note, bg = groups.note, blend = 15 },
 
 		--- Markup
 		["@markup.strong"] = { bold = styles.bold },

From f01eac6eedf6197509dde8b66de0263207ee1877 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Mon, 3 Feb 2025 11:28:57 -0600
Subject: [PATCH 174/190] fix: invalid palette format

---
 lua/rose-pine.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 523e9d6..4f4dfdc 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -308,8 +308,8 @@ local function set_highlights()
 		["@type.builtin"] = { fg = palette.foam, bold = styles.bold },
 		-- ["@type.definition"] = {},
 
-		["@attribute"] = { fg = "iris" },
-		["@attribute.builtin"] = { fg = "iris", bold = styles.bold },
+		["@attribute"] = { fg = palette.iris },
+		["@attribute.builtin"] = { fg = palette.iris, bold = styles.bold },
 		["@property"] = { fg = palette.foam, italic = styles.italic },
 
 		["@function"] = { fg = palette.rose },

From 340cf5ed5e75673d34055f7f91727ce79965b703 Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Wed, 5 Feb 2025 19:35:55 -0600
Subject: [PATCH 175/190] feat(perf): cache colors for up to 3x speed
 improvements

---
 lua/rose-pine/utilities.lua | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/lua/rose-pine/utilities.lua b/lua/rose-pine/utilities.lua
index 26e019e..32a8575 100644
--- a/lua/rose-pine/utilities.lua
+++ b/lua/rose-pine/utilities.lua
@@ -14,10 +14,17 @@ local function color_to_rgb(color)
 	return { byte(new_color, 16), byte(new_color, 8), byte(new_color, 0) }
 end
 
+local color_cache = {}
+
 ---@param color string Palette key or hex value
 function utilities.parse_color(color)
+	if color_cache[color] then
+		return color_cache[color]
+	end
+
 	if color == nil then
-		return print("Invalid color: " .. color)
+		print("Invalid color: " .. color)
+		return nil
 	end
 
 	color = color:lower()
@@ -26,13 +33,21 @@ function utilities.parse_color(color)
 		color = require("rose-pine.palette")[color] or vim.api.nvim_get_color_by_name(color)
 	end
 
+	color_cache[color] = color
 	return color
 end
 
+local blend_cache = {}
+
 ---@param fg string Foreground color
 ---@param bg string Background color
 ---@param alpha number Between 0 (background) and 1 (foreground)
 function utilities.blend(fg, bg, alpha)
+	local cache_key = fg .. bg .. alpha
+	if blend_cache[cache_key] then
+		return blend_cache[cache_key]
+	end
+
 	local fg_rgb = color_to_rgb(fg)
 	local bg_rgb = color_to_rgb(bg)
 
@@ -41,7 +56,10 @@ function utilities.blend(fg, bg, alpha)
 		return math.floor(math.min(math.max(0, ret), 255) + 0.5)
 	end
 
-	return string.format("#%02X%02X%02X", blend_channel(1), blend_channel(2), blend_channel(3))
+	local result = string.format("#%02X%02X%02X", blend_channel(1), blend_channel(2), blend_channel(3))
+
+	blend_cache[cache_key] = result
+	return result
 end
 
 return utilities

From 946de320f411e71530d7e8c9249fc344d8ad66aa Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Wed, 5 Feb 2025 19:36:10 -0600
Subject: [PATCH 176/190] fix: strip non-standard blend properties

---
 lua/rose-pine.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 4f4dfdc..8ffa5c0 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -1122,9 +1122,14 @@ local function set_highlights()
 		if config.options.before_highlight ~= nil then
 			config.options.before_highlight(group, highlight, palette)
 		end
+
 		if highlight.blend ~= nil and (highlight.blend >= 0 and highlight.blend <= 100) and highlight.bg ~= nil then
 			highlight.bg = utilities.blend(highlight.bg, highlight.blend_on or palette.base, highlight.blend / 100)
 		end
+
+		highlight.blend = nil
+		highlight.blend_on = nil
+
 		vim.api.nvim_set_hl(0, group, highlight)
 	end
 

From 0511701746d6f03846b7848c59b98b2d9387090f Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Wed, 5 Feb 2025 19:49:14 -0600
Subject: [PATCH 177/190] feat: use experimental darker text for dawn

---
 lua/rose-pine/palette.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine/palette.lua b/lua/rose-pine/palette.lua
index 59c300c..cfefd65 100644
--- a/lua/rose-pine/palette.lua
+++ b/lua/rose-pine/palette.lua
@@ -47,7 +47,7 @@ local variants = {
 		overlay = "#f2e9e1",
 		muted = "#9893a5",
 		subtle = "#797593",
-		text = "#575279",
+		text = "#464261",
 		love = "#b4637a",
 		gold = "#ea9d34",
 		rose = "#d7827e",

From 8b216f72526a9c220bb79de0a01382cd3c8c64d0 Mon Sep 17 00:00:00 2001
From: Tiago <tiagobarros99@ua.pt>
Date: Sun, 23 Feb 2025 21:19:21 +0000
Subject: [PATCH 178/190] feat: add support for vim-sneak (#342)

---
 lua/rose-pine.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 8ffa5c0..85f9aac 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -1022,6 +1022,11 @@ local function set_highlights()
 		SnacksIndentScope = { fg = palette.foam },
 
 		SnacksPickerMatch = { fg = palette.rose, bold = styles.bold },
+
+		-- justinmk/vim-sneak
+		Sneak = { fg = palette.base, bg = palette.love },
+		SneakCurrent = { link = "StatusLineTerm" },
+		SneakScope = { link = "IncSearch" },
 	}
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },

From 44739383b9ba01512a9d81db1f542632502d510f Mon Sep 17 00:00:00 2001
From: mvllow <mvllow@icloud.com>
Date: Tue, 25 Feb 2025 19:58:52 -0600
Subject: [PATCH 179/190] docs: add highlight group examples with blend and
 inherit options

---
 readme.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 8a2740c..6ef48bc 100644
--- a/readme.md
+++ b/readme.md
@@ -27,8 +27,8 @@ Install `rose-pine/neovim` using your favourite package manager:
 
 ```lua
 -- lua/plugins/rose-pine.lua
-return { 
-	"rose-pine/neovim", 
+return {
+	"rose-pine/neovim",
 	name = "rose-pine",
 	config = function()
 		vim.cmd("colorscheme rose-pine")
@@ -123,9 +123,13 @@ require("rose-pine").setup({
         -- },
     },
 
+	-- NOTE: Highlight groups are extended (merged) by default. Disable this
+	-- per group via `inherit = false`
     highlight_groups = {
         -- Comment = { fg = "foam" },
+        -- StatusLine = { fg = "love", bg = "love", blend = 15 },
         -- VertSplit = { fg = "muted", bg = "muted" },
+        -- Visual = { fg = "base", bg = "text", inherit = false },
     },
 
     before_highlight = function(group, highlight, palette)

From d7dc9cd3f2664511e55bd7262557593e759b6225 Mon Sep 17 00:00:00 2001
From: stelo <42366677+jfkisafk@users.noreply.github.com>
Date: Tue, 11 Mar 2025 19:25:25 -0700
Subject: [PATCH 180/190] feat: extends DapUIType fg to iris (#348)

---
 lua/rose-pine.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 85f9aac..24fa5da 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -722,6 +722,7 @@ local function set_highlights()
 		DapUIThread = { fg = palette.gold },
 		DapUIValue = { fg = palette.text },
 		DapUIVariable = { fg = palette.text },
+		DapUIType = { fg = palette.iris },
 		DapUIWatchesEmpty = { fg = palette.love },
 		DapUIWatchesError = { link = "DapUIWatchesEmpty" },
 		DapUIWatchesValue = { link = "DapUIThread" },

From 5ccc37982260d0b468c82aa965e2a8afc50e9d66 Mon Sep 17 00:00:00 2001
From: aileot <46470475+aileot@users.noreply.github.com>
Date: Mon, 31 Mar 2025 15:27:19 +0000
Subject: [PATCH 181/190] fix: set `background=light` if variant is "dawn"
 (#349)

* fix: set `background=light` if variant is "dawn"

This change might fix https://github.com/rose-pine/neovim/issues/321

* Update lua/rose-pine.lua

* fix: restrict variants that override `&background`

The other variant params are considered as if "auto"
---
 lua/rose-pine.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 24fa5da..73c9534 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -1182,6 +1182,12 @@ function M.colorscheme(variant)
 	end
 	vim.g.colors_name = "rose-pine"
 
+	if variant == "dawn" then
+		vim.o.background = "light"
+	elseif variant == "main" or variant == "moon" then
+		vim.o.background = "dark"
+	end
+
 	set_highlights()
 end
 

From 39ec539f8392dfa3e4a7736461fce7c223721aca Mon Sep 17 00:00:00 2001
From: Andrei Heidelbacher <andreihh.dev@proton.me>
Date: Thu, 1 May 2025 03:02:53 +0200
Subject: [PATCH 182/190] feat(lualine): change background from base to surface
 (#354)

This change improves the contrast of the statusline while aligning with the theme's spec.
---
 lua/lualine/themes/rose-pine.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/lualine/themes/rose-pine.lua b/lua/lualine/themes/rose-pine.lua
index 4c2c9a6..e409130 100644
--- a/lua/lualine/themes/rose-pine.lua
+++ b/lua/lualine/themes/rose-pine.lua
@@ -1,7 +1,7 @@
 local p = require("rose-pine.palette")
 local config = require("rose-pine.config")
 
-local bg_base = p.base
+local bg_base = p.surface
 if config.options.styles.transparency then
 	bg_base = "NONE"
 end

From a67f5ef34bb269692ede83fd7f7397e0b5c3736d Mon Sep 17 00:00:00 2001
From: Andrei Heidelbacher <andrei.heidelbacher@gmail.com>
Date: Thu, 1 May 2025 03:53:00 +0200
Subject: [PATCH 183/190] fix(blink.cmp): remove dedicated BlinkCmpDoc
 highlight (#355)

The default `BlinkCmpDoc` highlight is linked to `NormalFloat`, which is
a sensible default. However, due to overriding the default link with
only `fg` provided, the `bg` is cleared and the documentation popup is
indistinguishable from regular text.

This change is technically a no-op in terms of intended palette, because
`NormalFloat` should already use `palette.text`, and only fixes the
cleared `bg` bug.
---
 lua/rose-pine.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 73c9534..600ac4e 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -977,7 +977,6 @@ local function set_highlights()
 		AvanteReversedThirdTitle = { fg = palette.iris },
 
 		-- Saghen/blink.cmp
-		BlinkCmpDoc = { fg = palette.text },
 		BlinkCmpDocBorder = { fg = palette.highlight_high },
 		BlinkCmpGhostText = { fg = palette.muted },
 

From d195ed8673ab887460b6a08b9845172c69ca34f7 Mon Sep 17 00:00:00 2001
From: Andrei Heidelbacher <andrei.heidelbacher@gmail.com>
Date: Thu, 1 May 2025 23:55:24 +0200
Subject: [PATCH 184/190] feat(blink.cmp): improve BlinkCmpDoc contrast between
 current line (#356)

---
 lua/rose-pine.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 600ac4e..4e9c665 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -977,6 +977,8 @@ local function set_highlights()
 		AvanteReversedThirdTitle = { fg = palette.iris },
 
 		-- Saghen/blink.cmp
+		BlinkCmpDoc = { bg = palette.highlight_low },
+		BlinkCmpDocSeparator = { bg = palette.highlight_low },
 		BlinkCmpDocBorder = { fg = palette.highlight_high },
 		BlinkCmpGhostText = { fg = palette.muted },
 

From 6b9840790cc7acdfadde07f308d34b62dd9cc675 Mon Sep 17 00:00:00 2001
From: fdcote <48247604+fdcote@users.noreply.github.com>
Date: Mon, 5 May 2025 13:13:20 -0400
Subject: [PATCH 185/190] feat: add `QuickFixLine` (#357)

---
 lua/rose-pine.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 4e9c665..fc21a2c 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -121,7 +121,7 @@ local function set_highlights()
 		PmenuSel = { fg = palette.text, bg = palette.overlay },
 		PmenuThumb = { bg = palette.muted },
 		Question = { fg = palette.gold },
-		-- QuickFixLink = {},
+		QuickFixLine = { fg = palette.foam },
 		-- RedrawDebugNormal = {},
 		RedrawDebugClear = { fg = palette.base, bg = palette.gold },
 		RedrawDebugComposed = { fg = palette.base, bg = palette.pine },

From 83c66bcadbcaf344cf0af1a41d8bd92255116b66 Mon Sep 17 00:00:00 2001
From: Adrian Schneider <166428581+adrior11@users.noreply.github.com>
Date: Thu, 26 Jun 2025 19:31:24 +0200
Subject: [PATCH 186/190] feat(grug-far): add highlight groups for add/remove
 results (#366)

---
 lua/rose-pine.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index fc21a2c..801f28d 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -961,6 +961,8 @@ local function set_highlights()
 		GrugFarInputPlaceholder = { link = "Comment" },
 		GrugFarResultsActionMessage = { fg = palette.foam },
 		GrugFarResultsChangeIndicator = { fg = groups.git_change },
+		GrugFarResultsRemoveIndicator = { fg = groups.git_delete },
+		GrugFarResultsAddIndicator = { fg = groups.git_add },
 		GrugFarResultsHeader = { fg = palette.pine },
 		GrugFarResultsLineNo = { fg = palette.iris },
 		GrugFarResultsLineColumn = { link = "GrugFarResultsLineNo" },

From f93360149e9ed4df8677fbb07c7231ea0fd03b97 Mon Sep 17 00:00:00 2001
From: fdcote <48247604+fdcote@users.noreply.github.com>
Date: Thu, 26 Jun 2025 17:32:32 -0400
Subject: [PATCH 187/190] feat: add `ModesFormat` (#367)

---
 lua/rose-pine.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 801f28d..571d336 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -462,6 +462,7 @@ local function set_highlights()
 		-- mvllow/modes.nvim
 		ModesCopy = { bg = palette.gold },
 		ModesDelete = { bg = palette.love },
+		ModesFormat = { bg = palette.rose },
 		ModesInsert = { bg = palette.foam },
 		ModesReplace = { bg = palette.pine },
 		ModesVisual = { bg = palette.iris },

From 72befaffeac38db7bdd49e0549eaa2c4806dd878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Karpi=C5=84ski?=
 <40724893+davkk@users.noreply.github.com>
Date: Fri, 18 Jul 2025 22:25:55 +0200
Subject: [PATCH 188/190] fix: do not clear `blend` prop from highlight (#351)

* add private built-in blend override

---------

Co-authored-by: mvllow <mvllow@icloud.com>
---
 lua/rose-pine.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 571d336..196f03a 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -1140,6 +1140,10 @@ local function set_highlights()
 		highlight.blend = nil
 		highlight.blend_on = nil
 
+		if highlight._nvim_blend ~= nil then
+			highlight.blend = highlight._nvim_blend
+		end
+
 		vim.api.nvim_set_hl(0, group, highlight)
 	end
 

From 0e70556c8ceb3604c87b2e2589a9c0e9873eba73 Mon Sep 17 00:00:00 2001
From: HieuDao-code <106801182+HieuDao-code@users.noreply.github.com>
Date: Sun, 24 Aug 2025 16:47:05 +0200
Subject: [PATCH 189/190] feat(diffview.nvim): add support for
 `sindrets/diffview.nvim` (#369)

---
 lua/rose-pine.lua | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 196f03a..aa3abc0 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -1032,6 +1032,39 @@ local function set_highlights()
 		Sneak = { fg = palette.base, bg = palette.love },
 		SneakCurrent = { link = "StatusLineTerm" },
 		SneakScope = { link = "IncSearch" },
+
+		-- sindrets/diffview.nvim
+		DiffviewPrimary = { fg = palette.pine },
+		DiffviewSecondary = { fg = palette.foam },
+		DiffviewNormal = { fg = palette.text, bg = palette.surface },
+		DiffviewWinSeparator = { fg = palette.text, bg = palette.surface },
+
+		DiffviewFilePanelTitle = { fg = palette.foam, bold = styles.bold },
+		DiffviewFilePanelCounter = { fg = palette.rose },
+		DiffviewFilePanelRootPath = { fg = palette.foam, bold = styles.bold },
+		DiffviewFilePanelFileName = { fg = palette.text },
+		DiffviewFilePanelSelected = { fg = palette.gold },
+		DiffviewFilePanelPath = { link = "Comment" },
+
+		DiffviewFilePanelInsertions = { fg = groups.git_add },
+		DiffviewFilePanelDeletions = { fg = groups.git_delete },
+		DiffviewFilePanelConflicts = { fg = groups.git_merge },
+		DiffviewFolderName = { fg = palette.foam, bold = styles.bold },
+		DiffviewFolderSign = { fg = palette.subtle },
+		DiffviewHash = { fg = palette.rose },
+		DiffviewReference = { fg = palette.foam, bold = styles.bold },
+		DiffviewReflogSelector = { fg = palette.rose },
+		DiffviewStatusAdded = { fg = groups.git_add },
+		DiffviewStatusUntracked = { fg = groups.untracked },
+		DiffviewStatusModified = { fg = groups.git_change },
+		DiffviewStatusRenamed = { fg = groups.git_rename },
+		DiffviewStatusCopied = { fg = groups.untracked },
+		DiffviewStatusTypeChange = { fg = groups.git_change },
+		DiffviewStatusUnmerged = { fg = groups.git_change },
+		DiffviewStatusUnknown = { fg = groups.git_delete },
+		DiffviewStatusDeleted = { fg = groups.git_delete },
+		DiffviewStatusBroken = { fg = groups.git_delete },
+		DiffviewStatusIgnored = { fg = groups.git_ignore },
 	}
 	local transparency_highlights = {
 		DiagnosticVirtualTextError = { fg = groups.error },

From 72a04c4065345b51b56aed4859ea1d884f734097 Mon Sep 17 00:00:00 2001
From: Antoine Bertin <antoine@bertin.io>
Date: Sun, 24 Aug 2025 16:50:23 +0200
Subject: [PATCH 190/190] feat: add AvantePromptInput highlight support (#368)

* feat: add AvantePromptInput highlight support
---
 lua/rose-pine.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index aa3abc0..f10ffcd 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -978,6 +978,8 @@ local function set_highlights()
 		AvanteReversedSubtitle = { fg = palette.foam },
 		AvanteThirdTitle = { fg = palette.highlight_med, bg = palette.iris },
 		AvanteReversedThirdTitle = { fg = palette.iris },
+		AvantePromptInput = { fg = palette.text, bg = groups.panel },
+		AvantePromptInputBorder = { fg = groups.border },
 
 		-- Saghen/blink.cmp
 		BlinkCmpDoc = { bg = palette.highlight_low },