diff --git a/lua/catppuccino/core/integrations/dashboard.lua b/lua/catppuccino/core/integrations/dashboard.lua
index 490d0b1..d4651b6 100644
--- a/lua/catppuccino/core/integrations/dashboard.lua
+++ b/lua/catppuccino/core/integrations/dashboard.lua
@@ -3,7 +3,7 @@ local M = {}
 function M.get(cp)
 	return {
 		DashboardShortCut = { fg = cp.catppuccino3 },
-		DashboardHeader = { fg = cp.yellow },
+		DashboardHeader = { fg = cp.catppuccino9 },
 		DashboardCenter = { fg = cp.catppuccino8 },
 		DashboardFooter = { fg = cp.catppuccino7, style = "italic" },
 	}
diff --git a/lua/catppuccino/core/integrations/indent_blankline.lua b/lua/catppuccino/core/integrations/indent_blankline.lua
index c5b6498..d0af913 100644
--- a/lua/catppuccino/core/integrations/indent_blankline.lua
+++ b/lua/catppuccino/core/integrations/indent_blankline.lua
@@ -7,7 +7,7 @@ function M.get(cp)
 	}
 
 	if cnf.integrations.indent_blankline.colocatppuccino6_indent_levels then
-		hi["IndentBlanklineIndent6"] = {blend = "nocombine", fg = cp.yellow}
+		hi["IndentBlanklineIndent6"] = {blend = "nocombine", fg = cp.catppuccino9}
 		hi["IndentBlanklineIndent5"] = {blend = "nocombine", fg = cp.catppuccino6}
 		hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.catppuccino8}
 		hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.catppuccino7}
diff --git a/lua/catppuccino/core/integrations/ts_rainbow.lua b/lua/catppuccino/core/integrations/ts_rainbow.lua
index 6cf3207..769054d 100644
--- a/lua/catppuccino/core/integrations/ts_rainbow.lua
+++ b/lua/catppuccino/core/integrations/ts_rainbow.lua
@@ -4,7 +4,7 @@ function M.get(cp)
 	return {
 		rainbowcol1 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino6},
 		rainbowcol2 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino8},
-		rainbowcol3 = {catppuccino2 = cp.catppuccino2, fg = cp.yellow},
+		rainbowcol3 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino9},
 		rainbowcol4 = {catppuccino2 = cp.catppuccino2, fg = cp.blue},
 		rainbowcol5 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino5},
 		rainbowcol6 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino3},
diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua
index 8fccfb4..780cb33 100644
--- a/lua/catppuccino/core/mapper.lua
+++ b/lua/catppuccino/core/mapper.lua
@@ -105,10 +105,10 @@ local function get_base()
 		-- Macro         = { }, --    same as Define
 		-- PreCondit     = { }, --  preprocessor #if, #else, #endif, etcp.
 
-		Type = { fg = cp.yellow }, -- (prefercatppuccino6) int, long, char, etcp.
-		StorageClass = { fg = cp.yellow }, -- static, register, volatile, etcp.
-		Structure = { fg = cp.yellow }, --  struct, union, enum, etcp.
-		Typedef = { fg = cp.yellow }, --  A typedef
+		Type = { fg = cp.catppuccino9 }, -- (prefercatppuccino6) int, long, char, etcp.
+		StorageClass = { fg = cp.catppuccino9 }, -- static, register, volatile, etcp.
+		Structure = { fg = cp.catppuccino9 }, --  struct, union, enum, etcp.
+		Typedef = { fg = cp.catppuccino9 }, --  A typedef
 		Special = { fg = cp.blue }, -- (prefercatppuccino6) any special symbol
 		-- SpecialChar   = { }, --  special character in a constant
 		-- Tag           = { }, --    you can use CTRL-] on this
@@ -123,8 +123,8 @@ local function get_base()
 		-- Ignore = { }, -- (prefercatppuccino6) left blank, hidden  |hl-Ignore|
 
 		Error = { fg = cp.error }, -- (prefercatppuccino6) any erroneous construct
-		Todo = { catppuccino2 = cp.yellow, fg = cp.catppuccino2, style = "bold" }, -- (prefercatppuccino6) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
-		qfLineNr = { fg = cp.yellow },
+		Todo = { catppuccino2 = cp.catppuccino9, fg = cp.catppuccino2, style = "bold" }, -- (prefercatppuccino6) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
+		qfLineNr = { fg = cp.catppuccino9 },
 		qfFileName = { fg = cp.blue },
 		htmlH1 = { fg = cp.catppuccino5, style = "bold" },
 		htmlH2 = { fg = cp.blue, style = "bold" },
@@ -145,7 +145,7 @@ local function get_base()
 		diffAdded = { fg = cp.diff.add },
 		diffRemoved = { fg = cp.diff.delete },
 		diffChanged = { fg = cp.diff.change },
-		diffOldFile = { fg = cp.yellow },
+		diffOldFile = { fg = cp.catppuccino9 },
 		diffNewFile = { fg = cp.catppuccino7 },
 		diffFile = { fg = cp.blue },
 		diffLine = { fg = cp.comment },
@@ -163,7 +163,7 @@ local function get_base()
 		-- glyphs
 		GlyphPalette1 = { fg = cp.catppuccino6 },
 		GlyphPalette2 = { fg = cp.catppuccino8 },
-		GlyphPalette3 = { fg = cp.yellow },
+		GlyphPalette3 = { fg = cp.catppuccino9 },
 		GlyphPalette4 = { fg = cp.blue },
 		GlyphPalette6 = { fg = cp.catppuccino8_br },
 		GlyphPalette7 = { fg = cp.fg },