diff --git a/lua/catppuccino/core/integrations/barbar.lua b/lua/catppuccino/core/integrations/barbar.lua
index f94c9d1..532cafa 100644
--- a/lua/catppuccino/core/integrations/barbar.lua
+++ b/lua/catppuccino/core/integrations/barbar.lua
@@ -17,10 +17,10 @@ function M.get(cp)
 		BufferInactive = { bg = cp.catppuccino2_statusline, fg = cp.catppuccino12 },
 		BufferInactiveIndex = { bg = cp.catppuccino2_statusline, fg = cp.catppuccino12 },
 		BufferInactiveMod = { bg = cp.catppuccino2_statusline, fg = util.darken(cp.warning, 0.7) },
-		BufferInactiveSign = { bg = cp.catppuccino2_statusline, fg = cp.border_highlight },
+		BufferInactiveSign = { bg = cp.catppuccino2_statusline, fg = cp.catppuccino10 },
 		BufferInactiveTarget = { bg = cp.catppuccino2_statusline, fg = cp.catppuccino6 },
 		BufferTabpages = { bg = cp.catppuccino2_statusline, fg = cp.none },
-		BufferTabpage = { bg = cp.catppuccino2_statusline, fg = cp.border_highlight },
+		BufferTabpage = { bg = cp.catppuccino2_statusline, fg = cp.catppuccino10 },
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/lsp_saga.lua b/lua/catppuccino/core/integrations/lsp_saga.lua
index 85308a3..ee50733 100644
--- a/lua/catppuccino/core/integrations/lsp_saga.lua
+++ b/lua/catppuccino/core/integrations/lsp_saga.lua
@@ -7,7 +7,7 @@ function M.get(cp)
 		DiagnosticInformation = { fg = cp.info },
 		DiagnosticHint = { fg = cp.hint },
 		LspFloatWinNormal = { bg = cp.catppuccino2_float },
-		LspFloatWinBorder = { fg = cp.border_highlight },
+		LspFloatWinBorder = { fg = cp.catppuccino10 },
 		LspSagaBorderTitle = { fg = cp.catppuccino3 },
 		LspSagaHoverBorder = { fg = cp.catppuccino10 },
 		LspSagaRenameBorder = { fg = cp.catppuccino8 },
diff --git a/lua/catppuccino/core/integrations/neogit.lua b/lua/catppuccino/core/integrations/neogit.lua
index 69b2980..c20bfaa 100644
--- a/lua/catppuccino/core/integrations/neogit.lua
+++ b/lua/catppuccino/core/integrations/neogit.lua
@@ -5,7 +5,7 @@ function M.get(cp)
 	return {
 		NeogitBranch = { fg = cp.catppuccino5 },
 		NeogitRemote = { fg = cp.catppuccino5 },
-		NeogitHunkHeader = { bg = cp.catppuccino2_highlight, fg = cp.catppuccino11 },
+		NeogitHunkHeader = { bg = cp.catppuccino10, fg = cp.catppuccino11 },
 		NeogitHunkHeaderHighlight = { bg = cp.catppuccino13, fg = cp.catppuccino10 },
 		NeogitDiffContextHighlight = { bg = util.darken(cp.catppuccino13, 0.5), fg = cp.catppuccino11_alt },
 		NeogitDiffDeleteHighlight = { fg = cp.diff.delete, bg = cp.catppuccino2 },
diff --git a/lua/catppuccino/core/integrations/telescope.lua b/lua/catppuccino/core/integrations/telescope.lua
index 411261c..f40a53f 100644
--- a/lua/catppuccino/core/integrations/telescope.lua
+++ b/lua/catppuccino/core/integrations/telescope.lua
@@ -2,9 +2,9 @@ local M = {}
 
 function M.get(cp)
 	return {
-		TelescopeBorder = { fg = cp.border_highlight },
+		TelescopeBorder = { fg = cp.catppuccino10 },
 		TelescopeSelectionCaret = { fg = cp.catppuccino3 },
-		TelescopeSelection = { fg = cp.catppuccino3, bg = cp.catppuccino2_highlight },
+		TelescopeSelection = { fg = cp.catppuccino3, bg = cp.catppuccino16 },
 		TelescopeMatching = { fg = cp.catppuccino10 },
 	}
 end
diff --git a/lua/catppuccino/core/integrations/vim_sneak.lua b/lua/catppuccino/core/integrations/vim_sneak.lua
index 042f46c..fa6d345 100644
--- a/lua/catppuccino/core/integrations/vim_sneak.lua
+++ b/lua/catppuccino/core/integrations/vim_sneak.lua
@@ -2,7 +2,7 @@ local M = {}
 
 function M.get(cp)
 	return {
-		Sneak = { fg = cp.catppuccino2_highlight, bg = cp.catppuccino5 },
+		Sneak = { fg = cp.catppuccino16, bg = cp.catppuccino5 },
 		SneakScope = { bg = cp.util.darken(cp.catppuccino10, 0.2) },
 	}
 end
diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua
index a088348..cdceefb 100644
--- a/lua/catppuccino/core/mapper.lua
+++ b/lua/catppuccino/core/mapper.lua
@@ -27,8 +27,8 @@ local function get_base()
 		Cursor = { fg = cp.catppuccino2, bg = cp.catppuccino11 }, -- character under the cursor
 		lCursor = { fg = cp.catppuccino2, bg = cp.catppuccino11 }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
 		CursorIM = { fg = cp.catppuccino2, bg = cp.catppuccino11 }, -- like Cursor, but used when in IME mode |CursorIM|
-		CursorColumn = { bg = cp.catppuccino2_highlight }, -- Screen-column at the cursor, when 'cursorcolumn' is secp.
-		CursorLine = { bg = cp.catppuccino2_highlight }, -- Screen-line at the cursor, when 'cursorline' is secp.  Low-priority if foreground (ctermfg OR guifg) is not secp.
+		CursorColumn = { bg = cp.catppuccino16 }, -- Screen-column at the cursor, when 'cursorcolumn' is secp.
+		CursorLine = { bg = cp.catppuccino16 }, -- Screen-line at the cursor, when 'cursorline' is secp.  Low-priority if foreground (ctermfg OR guifg) is not secp.
 		Directory = { fg = cp.catppuccino10 }, -- directory names (and other special names in listings)
 		EndOfBuffer = { fg = cp.catppuccino2 }, -- filler lines (~) after the end of the buffer.  By default, this is highlighted like |hl-NonText|.
 		ErrorMsg = { fg = cp.error }, -- error messages on the command line
@@ -50,7 +50,7 @@ local function get_base()
 		NormalNC = { fg = cp.catppuccino11, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- normal text in non-current windows
 		NormalSB = { fg = cp.fg, bg = cp.catppuccino14 }, -- normal text in non-current windows
 		NormalFloat = { fg = cp.catppuccino11, bg = cp.catppuccino2_float }, -- Normal text in floating windows.
-		FloatBorder = { fg = cp.border_highlight },
+		FloatBorder = { fg = cp.catppuccino10 },
 		Pmenu = { bg = cp.catppuccino2_popup, fg = cp.catppuccino11 }, -- Popup menu: normal item.
 		PmenuSel = { fg = cp.catppuccino3, bg = util.darken(cp.catppuccino13, 0.8) }, -- Popup menu: selected item.
 		PmenuSbar = { bg = util.lighten(cp.catppuccino2_popup, 0.95) }, -- Popup menu: scrollbar.