diff --git a/lua/catppuccino/core/integrations/dashboard.lua b/lua/catppuccino/core/integrations/dashboard.lua
index 5def725..490d0b1 100644
--- a/lua/catppuccino/core/integrations/dashboard.lua
+++ b/lua/catppuccino/core/integrations/dashboard.lua
@@ -4,7 +4,7 @@ function M.get(cp)
 	return {
 		DashboardShortCut = { fg = cp.catppuccino3 },
 		DashboardHeader = { fg = cp.yellow },
-		DashboardCenter = { fg = cp.green },
+		DashboardCenter = { fg = cp.catppuccino8 },
 		DashboardFooter = { fg = cp.catppuccino7, style = "italic" },
 	}
 end
diff --git a/lua/catppuccino/core/integrations/hop.lua b/lua/catppuccino/core/integrations/hop.lua
index 7af02e2..cc41946 100644
--- a/lua/catppuccino/core/integrations/hop.lua
+++ b/lua/catppuccino/core/integrations/hop.lua
@@ -4,7 +4,7 @@ function M.get(cp)
 	return {
 		HopNextKey = { catppuccino2 = cp.catppuccino2, fg = cp.catppuccino7, style = "bold,underline" },
 		HopNextKey1 = { catppuccino2 = cp.catppuccino2, fg = cp.blue, style = "bold" },
-		HopNextKey2 = { catppuccino2 = cp.catppuccino2, fg = cp.green, style = "bold,italic" },
+		HopNextKey2 = { catppuccino2 = cp.catppuccino2, fg = cp.catppuccino8, style = "bold,italic" },
 		HopUnmatched = { catppuccino2 = cp.catppuccino2, fg = cp.comment },
 	}
 end
diff --git a/lua/catppuccino/core/integrations/indent_blankline.lua b/lua/catppuccino/core/integrations/indent_blankline.lua
index d6d5c5b..c5b6498 100644
--- a/lua/catppuccino/core/integrations/indent_blankline.lua
+++ b/lua/catppuccino/core/integrations/indent_blankline.lua
@@ -9,7 +9,7 @@ function M.get(cp)
 	if cnf.integrations.indent_blankline.colocatppuccino6_indent_levels then
 		hi["IndentBlanklineIndent6"] = {blend = "nocombine", fg = cp.yellow}
 		hi["IndentBlanklineIndent5"] = {blend = "nocombine", fg = cp.catppuccino6}
-		hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.green}
+		hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.catppuccino8}
 		hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.catppuccino7}
 		hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cp.blue}
 		hi["IndentBlanklineIndent1"] = {blend = "nocombine", fg = cp.catppuccino5}
diff --git a/lua/catppuccino/core/integrations/lsp_saga.lua b/lua/catppuccino/core/integrations/lsp_saga.lua
index f7767d2..bf746e9 100644
--- a/lua/catppuccino/core/integrations/lsp_saga.lua
+++ b/lua/catppuccino/core/integrations/lsp_saga.lua
@@ -10,8 +10,8 @@ function M.get(cp)
 		LspFloatWinBorder = { fg = cp.border_highlight },
 		LspSagaBorderTitle = { fg = cp.catppuccino3 },
 		LspSagaHoverBorder = { fg = cp.blue },
-		LspSagaRenameBorder = { fg = cp.green },
-		LspSagaDefPreviewBorder = { fg = cp.green },
+		LspSagaRenameBorder = { fg = cp.catppuccino8 },
+		LspSagaDefPreviewBorder = { fg = cp.catppuccino8 },
 		LspSagaCodeActionBorder = { fg = cp.blue },
 		LspSagaFinderSelection = { fg = cp.catppuccino2_visual },
 		LspSagaCodeActionTitle = { fg = cp.blue1 },
diff --git a/lua/catppuccino/core/integrations/treesitter.lua b/lua/catppuccino/core/integrations/treesitter.lua
index ab783fe..70b9bf5 100644
--- a/lua/catppuccino/core/integrations/treesitter.lua
+++ b/lua/catppuccino/core/integrations/treesitter.lua
@@ -44,7 +44,7 @@ function M.get(cp)
 		-- TSParameterReference= { };    -- For references to parameters of a function.
 		TSProperty = { fg = cp.catppuccino6 }, -- Same as `TSField`.
 		tomlTSProperty = { fg = cp.blue }, -- Differentiates between string and properties
-		TSPunctDelimiter = { fg = cp.green_br }, -- For delimiters ie: `.`
+		TSPunctDelimiter = { fg = cp.catppuccino8_br }, -- For delimiters ie: `.`
 		TSPunctBracket = { fg = cp.catppuccino6 }, -- For brackets and parenthesis.
 		TSPunctSpecial = { fg = cp.catppuccino0 }, -- For special punctutation that does not fall in the catagories before.
 		TSRepeat = { fg = cp.catppuccino6, style = cnf.styles.keywords }, -- For keywords related to loops.
diff --git a/lua/catppuccino/core/integrations/ts_rainbow.lua b/lua/catppuccino/core/integrations/ts_rainbow.lua
index 6208483..6cf3207 100644
--- a/lua/catppuccino/core/integrations/ts_rainbow.lua
+++ b/lua/catppuccino/core/integrations/ts_rainbow.lua
@@ -3,7 +3,7 @@ local M = {}
 function M.get(cp)
 	return {
 		rainbowcol1 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino6},
-		rainbowcol2 = {catppuccino2 = cp.catppuccino2, fg = cp.green},
+		rainbowcol2 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino8},
 		rainbowcol3 = {catppuccino2 = cp.catppuccino2, fg = cp.yellow},
 		rainbowcol4 = {catppuccino2 = cp.catppuccino2, fg = cp.blue},
 		rainbowcol5 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino5},
diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua
index 09a2374..8fccfb4 100644
--- a/lua/catppuccino/core/mapper.lua
+++ b/lua/catppuccino/core/mapper.lua
@@ -84,8 +84,8 @@ local function get_base()
 		-- code itself
 
 		Constant = { fg = cp.catppuccino7 }, -- (prefercatppuccino6) any constant
-		String = { fg = cp.green, style = cnf.styles.strings }, -- a string constant: "this is a string"
-		Character = { fg = cp.green }, --  a character constant: 'c', '\n'
+		String = { fg = cp.catppuccino8, style = cnf.styles.strings }, -- a string constant: "this is a string"
+		Character = { fg = cp.catppuccino8 }, --  a character constant: 'c', '\n'
 		Number = { fg = cp.catppuccino7_br }, --   a number constant: 234, 0xff
 		Float = { fg = cp.catppuccino7_br }, --    a floating point constant: 2.3e10
 		Boolean = { fg = cp.catppuccino7_br }, --  a boolean constant: TRUE, false
@@ -156,16 +156,16 @@ local function get_base()
 		DiffText = { fg = cp.diff.text, catppuccino2 = cp.catppuccino2 }, -- diff mode: Changed text within a changed line |diff.txt|
 		-- NeoVim
 		healthError = { fg = cp.error },
-		healthSuccess = { fg = cp.green_br },
+		healthSuccess = { fg = cp.catppuccino8_br },
 		healthWarning = { fg = cp.warning },
 		-- misc
 
 		-- glyphs
 		GlyphPalette1 = { fg = cp.catppuccino6 },
-		GlyphPalette2 = { fg = cp.green },
+		GlyphPalette2 = { fg = cp.catppuccino8 },
 		GlyphPalette3 = { fg = cp.yellow },
 		GlyphPalette4 = { fg = cp.blue },
-		GlyphPalette6 = { fg = cp.green_br },
+		GlyphPalette6 = { fg = cp.catppuccino8_br },
 		GlyphPalette7 = { fg = cp.fg },
 		GlyphPalette9 = { fg = cp.catppuccino6 },
 	}