diff --git a/lua/catppuccin/core/integrations/bufferline.lua b/lua/catppuccin/core/integrations/bufferline.lua
index 4af0b41..2b8e2bb 100644
--- a/lua/catppuccin/core/integrations/bufferline.lua
+++ b/lua/catppuccin/core/integrations/bufferline.lua
@@ -2,25 +2,25 @@ local M = {}
 
 function M.get(cp)
 
-	local inactive_clr = cp.katppuccino14
+	local inactive_clr = cp.catppuccin14
 
 	return {
-		BufferLineFill = { bg = cp.katppuccino13 },
-		BufferLineBackground = { fg = cp.katppuccino10, bg = inactive_clr },
-		BufferLineBufferVisible = { fg = cp.katppuccino12, bg = inactive_clr },
-		BufferLineBufferSelected = { fg = cp.katppuccino0, bg = cp.katppuccino1 },
-		BufferLineTab = { fg = cp.katppuccino12, bg = cp.katppuccino1 },
-		BufferLineTabSelected = { fg = cp.katppuccino5, bg = cp.katppuccino9 },
-		BufferLineTabClose = { fg = cp.katppuccino5, bg = inactive_clr },
-		BufferLineIndicatorSelected = { fg = cp.katppuccino6, bg = cp.katppuccino1 },
+		BufferLineFill = { bg = cp.catppuccin13 },
+		BufferLineBackground = { fg = cp.catppuccin10, bg = inactive_clr },
+		BufferLineBufferVisible = { fg = cp.catppuccin12, bg = inactive_clr },
+		BufferLineBufferSelected = { fg = cp.catppuccin0, bg = cp.catppuccin1 },
+		BufferLineTab = { fg = cp.catppuccin12, bg = cp.catppuccin1 },
+		BufferLineTabSelected = { fg = cp.catppuccin5, bg = cp.catppuccin9 },
+		BufferLineTabClose = { fg = cp.catppuccin5, bg = inactive_clr },
+		BufferLineIndicatorSelected = { fg = cp.catppuccin6, bg = cp.catppuccin1 },
 		-- separators
 		BufferLineSeparator = { fg = inactive_clr, bg = inactive_clr },
 		BufferLineSeparatorVisible = { fg = inactive_clr, bg = inactive_clr },
 		BufferLineSeparatorSelected = { fg = inactive_clr, bg = inactive_clr },
 		-- close buttons
-		BufferLineCloseButton = { fg = cp.katppuccino12, bg = inactive_clr },
-		BufferLineCloseButtonVisible = { fg = cp.katppuccino12, bg = inactive_clr },
-		BufferLineCloseButtonSelected = { fg = cp.katppuccino5, bg = cp.katppuccino1 },
+		BufferLineCloseButton = { fg = cp.catppuccin12, bg = inactive_clr },
+		BufferLineCloseButtonVisible = { fg = cp.catppuccin12, bg = inactive_clr },
+		BufferLineCloseButtonSelected = { fg = cp.catppuccin5, bg = cp.catppuccin1 },
 	}
 end
 
diff --git a/lua/catppuccin/core/integrations/cmp.lua b/lua/catppuccin/core/integrations/cmp.lua
index 8439816..663ef0c 100644
--- a/lua/catppuccin/core/integrations/cmp.lua
+++ b/lua/catppuccin/core/integrations/cmp.lua
@@ -2,12 +2,12 @@ local M = {}
 
 function M.get(cp)
 	return {
-		CmpItemAbbr = { fg = cp.katppuccino11 },
-		CmpItemAbbrDeprecated = { fg = cp.katppuccino11, stlye = "strikethrough" },
-		CmpItemAbbrMatch = { fg = cp.katppuccino10, style = "bold" },
-		CmpItemAbbrMatchFuzzy = { fg = cp.katppuccino10, style = "bold" },
-		CmpItemKind = { fg = cp.katppuccino9 },
-		CmpItemMenu = { fg = cp.katppuccino10 },
+		CmpItemAbbr = { fg = cp.catppuccin11 },
+		CmpItemAbbrDeprecated = { fg = cp.catppuccin11, stlye = "strikethrough" },
+		CmpItemAbbrMatch = { fg = cp.catppuccin10, style = "bold" },
+		CmpItemAbbrMatchFuzzy = { fg = cp.catppuccin10, style = "bold" },
+		CmpItemKind = { fg = cp.catppuccin9 },
+		CmpItemMenu = { fg = cp.catppuccin10 },
 	}
 end
 
diff --git a/lua/catppuccin/core/integrations/dashboard.lua b/lua/catppuccin/core/integrations/dashboard.lua
index 82f7a1f..464d640 100644
--- a/lua/catppuccin/core/integrations/dashboard.lua
+++ b/lua/catppuccin/core/integrations/dashboard.lua
@@ -2,10 +2,10 @@ local M = {}
 
 function M.get(cp)
 	return {
-		DashboardShortCut = { fg = cp.katppuccino2 },
-		DashboardHeader = { fg = cp.katppuccino8 },
-		DashboardCenter = { fg = cp.katppuccino7 },
-		DashboardFooter = { fg = cp.katppuccino6, style = "italic" },
+		DashboardShortCut = { fg = cp.catppuccin2 },
+		DashboardHeader = { fg = cp.catppuccin8 },
+		DashboardCenter = { fg = cp.catppuccin7 },
+		DashboardFooter = { fg = cp.catppuccin6, style = "italic" },
 	}
 end
 
diff --git a/lua/catppuccin/core/integrations/fern.lua b/lua/catppuccin/core/integrations/fern.lua
index c6a5248..ebda1dd 100644
--- a/lua/catppuccin/core/integrations/fern.lua
+++ b/lua/catppuccin/core/integrations/fern.lua
@@ -2,7 +2,7 @@ local M = {}
 
 function M.get(cp)
 	return {
-		FernBranchText = { fg = cp.katppuccino9 },
+		FernBranchText = { fg = cp.catppuccin9 },
 	}
 end
 
diff --git a/lua/catppuccin/core/integrations/gitgutter.lua b/lua/catppuccin/core/integrations/gitgutter.lua
index 7e4cbe6..3293e3a 100644
--- a/lua/catppuccin/core/integrations/gitgutter.lua
+++ b/lua/catppuccin/core/integrations/gitgutter.lua
@@ -2,9 +2,9 @@ local M = {}
 
 function M.get(cp)
 	return {
-		GitGutterAdd = { fg = cp.katppuccino9 },
-		GitGutterChange = { fg = cp.katppuccino8 },
-		GitGutterDelete = { fg = cp.katppuccino5 },
+		GitGutterAdd = { fg = cp.catppuccin9 },
+		GitGutterChange = { fg = cp.catppuccin8 },
+		GitGutterDelete = { fg = cp.catppuccin5 },
 	}
 end
 return M
diff --git a/lua/catppuccin/core/integrations/gitsigns.lua b/lua/catppuccin/core/integrations/gitsigns.lua
index ea17ad0..d0a2f0c 100644
--- a/lua/catppuccin/core/integrations/gitsigns.lua
+++ b/lua/catppuccin/core/integrations/gitsigns.lua
@@ -2,9 +2,9 @@ local M = {}
 
 function M.get(cp)
 	return {
-		GitSignsAdd = { fg = cp.katppuccino9, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- diff mode: Added line |diff.txt|
-		GitSignsChange = { fg = cp.katppuccino8, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- diff mode: Changed line |diff.txt|
-		GitSignsDelete = { fg = cp.katppuccino5, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- diff mode: Deleted line |diff.txt|
+		GitSignsAdd = { fg = cp.catppuccin9, bg = cnf.transparency and cp.none or cp.catppuccin1 }, -- diff mode: Added line |diff.txt|
+		GitSignsChange = { fg = cp.catppuccin8, bg = cnf.transparency and cp.none or cp.catppuccin1 }, -- diff mode: Changed line |diff.txt|
+		GitSignsDelete = { fg = cp.catppuccin5, bg = cnf.transparency and cp.none or cp.catppuccin1 }, -- diff mode: Deleted line |diff.txt|
 	}
 end
 
diff --git a/lua/catppuccin/core/integrations/indent_blankline.lua b/lua/catppuccin/core/integrations/indent_blankline.lua
index 3210c9f..bc1fbc0 100644
--- a/lua/catppuccin/core/integrations/indent_blankline.lua
+++ b/lua/catppuccin/core/integrations/indent_blankline.lua
@@ -3,16 +3,16 @@ local M = {}
 function M.get(cp)
 
 	local hi = {
-		IndentBlanklineChar = { fg = cp.katppuccino12 },
+		IndentBlanklineChar = { fg = cp.catppuccin12 },
 	}
 
 	if cnf.integrations.indent_blankline.colored_indent_levels then
-		hi["IndentBlanklineIndent6"] = {blend = "nocombine", fg = cp.katppuccino8}
-		hi["IndentBlanklineIndent5"] = {blend = "nocombine", fg = cp.katppuccino5}
-		hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.katppuccino7}
-		hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.katppuccino6}
-		hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cp.katppuccino9}
-		hi["IndentBlanklineIndent1"] = {blend = "nocombine", fg = cp.katppuccino4}
+		hi["IndentBlanklineIndent6"] = {blend = "nocombine", fg = cp.catppuccin8}
+		hi["IndentBlanklineIndent5"] = {blend = "nocombine", fg = cp.catppuccin5}
+		hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.catppuccin7}
+		hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.catppuccin6}
+		hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cp.catppuccin9}
+		hi["IndentBlanklineIndent1"] = {blend = "nocombine", fg = cp.catppuccin4}
 	end
 
 	return hi
diff --git a/lua/catppuccin/core/integrations/lightspeed.lua b/lua/catppuccin/core/integrations/lightspeed.lua
index 765851f..ebe0ac4 100644
--- a/lua/catppuccin/core/integrations/lightspeed.lua
+++ b/lua/catppuccin/core/integrations/lightspeed.lua
@@ -1,47 +1,47 @@
 local M = {}
 
-local is_prepakatppuccino5
+local is_prepacatppuccin5
 
-local function set_prepakatppuccino5(val)
-	is_prepakatppuccino5 = val
+local function set_prepacatppuccin5(val)
+	is_prepacatppuccin5 = val
 end
 
-local function get_prepakatppuccino5()
-	return is_prepakatppuccino5
+local function get_prepacatppuccin5()
+	return is_prepacatppuccin5
 end
 
 function M.get(cp)
 
-	if not get_prepakatppuccino5() then
-		local katppuccino = require("katppuccino")
-		if katppuccino.after_loading ~= nil then
-			katppuccino.after_loading = function ()
-				katppuccino.after_loading()
+	if not get_prepacatppuccin5() then
+		local catppuccin = require("catppuccin")
+		if catppuccin.after_loading ~= nil then
+			catppuccin.after_loading = function ()
+				catppuccin.after_loading()
 				require'lightspeed'.init_highlight()
 			end
 		else
-			katppuccino.after_loading = function ()
+			catppuccin.after_loading = function ()
 				require'lightspeed'.init_highlight()
 			end
 		end
-		set_prepakatppuccino5(true)
+		set_prepacatppuccin5(true)
 	end
 
 	return {
-		LightspeedLabel = {bg = cp.katppuccino12, fg = cp.katppuccino10},
-		LightspeedOverlapped = {bg = cp.katppuccino12, fg = cp.katppuccino10},
-		LightspeedLabelDistant = {bg = cp.katppuccino3, fg = cp.katppuccino10},
-		LightspeedLabelDistantOverlapped = {bg = cp.katppuccino3, fg = cp.katppuccino10},
-		LightspeedShortcut = {bg = cp.katppuccino1, fg = cp.katppuccino6, style = "italic"},
-		LightspeedShortcutOverlapped = {bg = cp.katppuccino1, fg = cp.katppuccino6, style = "bold"},
-		LightspeedMaskedChar = {bg = cp.katppuccino1, fg = cp.katppuccino5, style = "undercurl"},
-		LightspeedGreyWash = {bg = cp.katppuccino1, fg = cp.katppuccino11},
-		LightspeedUnlabeledMatch = {bg = cp.katppuccino1, fg = cp.katppuccino5, style = "underline"},
-		LightspeedOneCharMatch = {bg = cp.katppuccino1, fg = cp.katppuccino5, style = "underline"},
-		LightspeedUniqueChar = {bg = cp.katppuccino1, fg = cp.katppuccino0, style = "strikethrough"},
-		LightspeedPendingOpArea = {bg = cp.katppuccino1, fg = cp.katppuccino0, style = "strikethrough"},
-		LightspeedPendingChangeOpArea = {bg = cp.katppuccino1, fg = cp.katppuccino0, style = "strikethrough"},
-		LightspeedCursor = {fg = cp.katppuccino1, bg = cp.katppuccino10},
+		LightspeedLabel = {bg = cp.catppuccin12, fg = cp.catppuccin10},
+		LightspeedOverlapped = {bg = cp.catppuccin12, fg = cp.catppuccin10},
+		LightspeedLabelDistant = {bg = cp.catppuccin3, fg = cp.catppuccin10},
+		LightspeedLabelDistantOverlapped = {bg = cp.catppuccin3, fg = cp.catppuccin10},
+		LightspeedShortcut = {bg = cp.catppuccin1, fg = cp.catppuccin6, style = "italic"},
+		LightspeedShortcutOverlapped = {bg = cp.catppuccin1, fg = cp.catppuccin6, style = "bold"},
+		LightspeedMaskedChar = {bg = cp.catppuccin1, fg = cp.catppuccin5, style = "undercurl"},
+		LightspeedGreyWash = {bg = cp.catppuccin1, fg = cp.catppuccin11},
+		LightspeedUnlabeledMatch = {bg = cp.catppuccin1, fg = cp.catppuccin5, style = "underline"},
+		LightspeedOneCharMatch = {bg = cp.catppuccin1, fg = cp.catppuccin5, style = "underline"},
+		LightspeedUniqueChar = {bg = cp.catppuccin1, fg = cp.catppuccin0, style = "strikethrough"},
+		LightspeedPendingOpArea = {bg = cp.catppuccin1, fg = cp.catppuccin0, style = "strikethrough"},
+		LightspeedPendingChangeOpArea = {bg = cp.catppuccin1, fg = cp.catppuccin0, style = "strikethrough"},
+		LightspeedCursor = {fg = cp.catppuccin1, bg = cp.catppuccin10},
 	}
 end
 
diff --git a/lua/catppuccin/core/integrations/markdown.lua b/lua/catppuccin/core/integrations/markdown.lua
index c95f78c..827170e 100644
--- a/lua/catppuccin/core/integrations/markdown.lua
+++ b/lua/catppuccin/core/integrations/markdown.lua
@@ -2,12 +2,12 @@ local M = {}
 
 function M.get(cp)
 	return {
-		markdownHeadingDelimiter = { fg = cp.katppuccino6, style = "bold" },
-		markdownCode = { fg = cp.katppuccino2 },
-		markdownCodeBlock = { fg = cp.katppuccino2 },
-		markdownH1 = { fg = cp.katppuccino4, style = "bold" },
-		markdownH2 = { fg = cp.katppuccino9, style = "bold" },
-		markdownLinkText = { fg = cp.katppuccino9, style = "underline" },
+		markdownHeadingDelimiter = { fg = cp.catppuccin6, style = "bold" },
+		markdownCode = { fg = cp.catppuccin2 },
+		markdownCodeBlock = { fg = cp.catppuccin2 },
+		markdownH1 = { fg = cp.catppuccin4, style = "bold" },
+		markdownH2 = { fg = cp.catppuccin9, style = "bold" },
+		markdownLinkText = { fg = cp.catppuccin9, style = "underline" },
 	}
 end
 
diff --git a/lua/catppuccin/core/integrations/neogit.lua b/lua/catppuccin/core/integrations/neogit.lua
index da50655..d278bd0 100644
--- a/lua/catppuccin/core/integrations/neogit.lua
+++ b/lua/catppuccin/core/integrations/neogit.lua
@@ -2,13 +2,13 @@ local M = {}
 
 function M.get(cp)
 	return {
-		NeogitBranch = { fg = cp.katppuccino4 },
-		NeogitRemote = { fg = cp.katppuccino4 },
-		NeogitHunkHeader = { bg = cp.katppuccino9, fg = cp.katppuccino10 },
-		NeogitHunkHeaderHighlight = { bg = cp.katppuccino12, fg = cp.katppuccino9 },
-		NeogitDiffContextHighlight = { bg = cp.katppuccino15, fg = cp.katppuccino0 },
-		NeogitDiffDeleteHighlight = { fg = cp.katppuccino5, bg = cp.katppuccino1 },
-		NeogitDiffAddHighlight = { fg = cp.katppuccino9, bg = cp.katppuccino1 },
+		NeogitBranch = { fg = cp.catppuccin4 },
+		NeogitRemote = { fg = cp.catppuccin4 },
+		NeogitHunkHeader = { bg = cp.catppuccin9, fg = cp.catppuccin10 },
+		NeogitHunkHeaderHighlight = { bg = cp.catppuccin12, fg = cp.catppuccin9 },
+		NeogitDiffContextHighlight = { bg = cp.catppuccin15, fg = cp.catppuccin0 },
+		NeogitDiffDeleteHighlight = { fg = cp.catppuccin5, bg = cp.catppuccin1 },
+		NeogitDiffAddHighlight = { fg = cp.catppuccin9, bg = cp.catppuccin1 },
 	}
 end
 
diff --git a/lua/catppuccin/core/integrations/nvimtree.lua b/lua/catppuccin/core/integrations/nvimtree.lua
index 234ee6c..4a08e4f 100644
--- a/lua/catppuccin/core/integrations/nvimtree.lua
+++ b/lua/catppuccin/core/integrations/nvimtree.lua
@@ -1,31 +1,31 @@
 local M = {}
 
 function M.get(cp)
-	local config = require("katppuccino.config").options
+	local config = require("catppuccin.config").options
 
-	local root_dir_color = cp.katppuccino4
+	local root_dir_color = cp.catppuccin4
 
 	if config.integrations.nvimtree.show_root then
-		root_dir_color = cp.katppuccino9
+		root_dir_color = cp.catppuccin9
 	end
 
 	return {
-		NvimTreeFolderName = { fg = cp.katppuccino9 },
-		NvimTreeFolderIcon = { fg = cp.katppuccino9 },
-		NvimTreeNormal = { fg = cp.katppuccino10, bg = cp.katppuccino13 },
-		NvimTreeOpenedFolderName = { fg = cp.katppuccino9 },
-		NvimTreeEmptyFolderName = { fg = cp.katppuccino9 },
-		NvimTreeIndentMarker = { fg = cp.katppuccino11 },
+		NvimTreeFolderName = { fg = cp.catppuccin9 },
+		NvimTreeFolderIcon = { fg = cp.catppuccin9 },
+		NvimTreeNormal = { fg = cp.catppuccin10, bg = cp.catppuccin13 },
+		NvimTreeOpenedFolderName = { fg = cp.catppuccin9 },
+		NvimTreeEmptyFolderName = { fg = cp.catppuccin9 },
+		NvimTreeIndentMarker = { fg = cp.catppuccin11 },
 		NvimTreeVertSplit = { fg = cp.black, bg = cp.black },
 		NvimTreeRootFolder = { fg = root_dir_color, style = "bold" },
-		NvimTreeSymlink = { fg = cp.katppuccino4 },
+		NvimTreeSymlink = { fg = cp.catppuccin4 },
 		NvimTreeStatuslineNc = { fg = cp.black, bg = cp.black },
-		NvimTreeGitDirty = { fg = cp.katppuccino8 },
-		NvimTreeGitNew = { fg = cp.katppuccino9 },
-		NvimTreeGitDeleted = { fg = cp.katppuccino5 },
-		NvimTreeSpecialFile = { fg = cp.katppuccino2 },
-		NvimTreeImageFile = { fg = cp.katppuccino10 },
-		NvimTreeOpenedFile = { fg = cp.katppuccino4 },
+		NvimTreeGitDirty = { fg = cp.catppuccin8 },
+		NvimTreeGitNew = { fg = cp.catppuccin9 },
+		NvimTreeGitDeleted = { fg = cp.catppuccin5 },
+		NvimTreeSpecialFile = { fg = cp.catppuccin2 },
+		NvimTreeImageFile = { fg = cp.catppuccin10 },
+		NvimTreeOpenedFile = { fg = cp.catppuccin4 },
 	}
 end
 
diff --git a/lua/catppuccin/core/integrations/telescope.lua b/lua/catppuccin/core/integrations/telescope.lua
index 6dd2753..40ebb93 100644
--- a/lua/catppuccin/core/integrations/telescope.lua
+++ b/lua/catppuccin/core/integrations/telescope.lua
@@ -2,10 +2,10 @@ local M = {}
 
 function M.get(cp)
 	return {
-		TelescopeBorder = { fg = cp.katppuccino9 },
-		TelescopeSelectionCaret = { fg = cp.katppuccino2 },
-		TelescopeSelection = { fg = cp.katppuccino2, bg = cp.katppuccino15 },
-		TelescopeMatching = { fg = cp.katppuccino9 },
+		TelescopeBorder = { fg = cp.catppuccin9 },
+		TelescopeSelectionCaret = { fg = cp.catppuccin2 },
+		TelescopeSelection = { fg = cp.catppuccin2, bg = cp.catppuccin15 },
+		TelescopeMatching = { fg = cp.catppuccin9 },
 	}
 end
 
diff --git a/lua/catppuccin/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua
index 4c7f0a1..9bd8e06 100644
--- a/lua/catppuccin/core/integrations/treesitter.lua
+++ b/lua/catppuccin/core/integrations/treesitter.lua
@@ -10,55 +10,55 @@ function M.get(cp)
 
 		-- TSAnnotation        = { };    -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information.
 		-- TSAttribute         = { };    -- (unstable) TODO: docs
-		TSBoolean = { fg = cp.katppuccino6, style = cnf.styles.keywords }, -- For booleans.
+		TSBoolean = { fg = cp.catppuccin6, style = cnf.styles.keywords }, -- For booleans.
 		-- TSCharacter         = { };    -- For characters.
-		-- TSkatppuccino11           = { };    -- For katppuccino11 blocks.
-		TSNote = { fg = cp.katppuccino1, bg = cp.katppuccino9 },
-		TSWarning = { fg = cp.katppuccino1, bg = cp.katppuccino8 },
-		TSDanger = { fg = cp.katppuccino1, bg = cp.katppuccino5 },
-		TSConstructor = { fg = cp.katppuccino4 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
-		TSConditional = { fg = cp.katppuccino5, style = cnf.styles.keywords }, -- For keywords related to conditionnals.
-		TSConstant = { fg = cp.katppuccino6 }, -- For constants
-		TSConstBuiltin = { fg = cp.katppuccino6, style = cnf.styles.keywords }, -- For constant that are built in the language: `nil` in Lua.
+		-- TScatppuccin11           = { };    -- For catppuccin11 blocks.
+		TSNote = { fg = cp.catppuccin1, bg = cp.catppuccin9 },
+		TSWarning = { fg = cp.catppuccin1, bg = cp.catppuccin8 },
+		TSDanger = { fg = cp.catppuccin1, bg = cp.catppuccin5 },
+		TSConstructor = { fg = cp.catppuccin4 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
+		TSConditional = { fg = cp.catppuccin5, style = cnf.styles.keywords }, -- For keywords related to conditionnals.
+		TSConstant = { fg = cp.catppuccin6 }, -- For constants
+		TSConstBuiltin = { fg = cp.catppuccin6, style = cnf.styles.keywords }, -- For constant that are built in the language: `nil` in Lua.
 		-- TSConstMacro        = { };    -- For constants that are defined by macros: `NULL` in cp.
 		-- TSError             = { };    -- For syntax/parser errors.
-		TSException = { fg = cp.katppuccino3, style = cnf.styles.keywords }, -- For exception related keywords.
-		TSField = { fg = cp.katppuccino5 }, -- For fields.
-		-- rustTSField = { fg = cp.katppuccino12 }, -- For fields.
+		TSException = { fg = cp.catppuccin3, style = cnf.styles.keywords }, -- For exception related keywords.
+		TSField = { fg = cp.catppuccin5 }, -- For fields.
+		-- rustTSField = { fg = cp.catppuccin12 }, -- For fields.
 		-- TSFloat             = { };    -- For floats.
-		TSFunction = { fg = cp.katppuccino9, style = cnf.styles.functions }, -- For function (calls and definitions).
-		TSFuncBuiltin = { fg = cp.katppuccino2 }, -- For builtin functions: `table.insert` in Lua.
-		TSFuncMacro = { fg = cp.katppuccino5 }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscp.
-		TSInclude = { fg = cp.katppuccino4, style = cnf.styles.keywords }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua.
-		TSKeyword = { fg = cp.katppuccino4, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories.
-		TSKeywordFunction = { fg = cp.katppuccino3, style = cnf.styles.keywords }, -- For keywords used to define a fuction.
-		TSKeywordOperator = { fg = cp.katppuccino2, style = cnf.styles.keywords }, -- For `new` keyword operator
-		TSLabel = { fg = cp.katppuccino9 }, -- For labels: `label:` in C and `:label:` in Lua.
+		TSFunction = { fg = cp.catppuccin9, style = cnf.styles.functions }, -- For function (calls and definitions).
+		TSFuncBuiltin = { fg = cp.catppuccin2 }, -- For builtin functions: `table.insert` in Lua.
+		TSFuncMacro = { fg = cp.catppuccin5 }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscp.
+		TSInclude = { fg = cp.catppuccin4, style = cnf.styles.keywords }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua.
+		TSKeyword = { fg = cp.catppuccin4, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories.
+		TSKeywordFunction = { fg = cp.catppuccin3, style = cnf.styles.keywords }, -- For keywords used to define a fuction.
+		TSKeywordOperator = { fg = cp.catppuccin2, style = cnf.styles.keywords }, -- For `new` keyword operator
+		TSLabel = { fg = cp.catppuccin9 }, -- For labels: `label:` in C and `:label:` in Lua.
 		-- TSMethod            = { };    -- For method calls and definitions.
-		TSNamespace = { fg = cp.katppuccino2 }, -- For identifiers referring to modules and namespaces.
+		TSNamespace = { fg = cp.catppuccin2 }, -- For identifiers referring to modules and namespaces.
 		-- TSNone              = { };    -- TODO: docs
 		-- TSNumber            = { };    -- For all numbers
-		TSOperator = { fg = cp.katppuccino2 }, -- For any operator: `+`, but also `->` and `*` in cp.
-		TSParameter = { fg = cp.katppuccino6 }, -- For parameters of a function.
+		TSOperator = { fg = cp.catppuccin2 }, -- For any operator: `+`, but also `->` and `*` in cp.
+		TSParameter = { fg = cp.catppuccin6 }, -- For parameters of a function.
 		-- TSParameterReference= { };    -- For references to parameters of a function.
-		TSProperty = { fg = cp.katppuccino5 }, -- Same as `TSField`.
-		tomlTSProperty = { fg = cp.katppuccino9 }, -- Differentiates between string and properties
-		TSPunctDelimiter = { fg = cp.katppuccino2 }, -- For delimiters ie: `.`
-		TSPunctBracket = { fg = cp.katppuccino5 }, -- For brackets and parenthesis.
-		TSPunctSpecial = { fg = cp.katppuccino0 }, -- For special punctutation that does not fall in the catagories before.
-		TSRepeat = { fg = cp.katppuccino5, style = cnf.styles.keywords }, -- For keywords related to loops.
+		TSProperty = { fg = cp.catppuccin5 }, -- Same as `TSField`.
+		tomlTSProperty = { fg = cp.catppuccin9 }, -- Differentiates between string and properties
+		TSPunctDelimiter = { fg = cp.catppuccin2 }, -- For delimiters ie: `.`
+		TSPunctBracket = { fg = cp.catppuccin5 }, -- For brackets and parenthesis.
+		TSPunctSpecial = { fg = cp.catppuccin0 }, -- For special punctutation that does not fall in the catagories before.
+		TSRepeat = { fg = cp.catppuccin5, style = cnf.styles.keywords }, -- For keywords related to loops.
 		-- TSString            = { };    -- For strings.
-		TSStringRegex = { fg = cp.katppuccino9, style = cnf.styles.strings }, -- For regexes.
-		TSStringEscape = { fg = cp.katppuccino4, style = cnf.styles.strings }, -- For escape characters within a string.
+		TSStringRegex = { fg = cp.catppuccin9, style = cnf.styles.strings }, -- For regexes.
+		TSStringEscape = { fg = cp.catppuccin4, style = cnf.styles.strings }, -- For escape characters within a string.
 		-- TSSymbol            = { };    -- For identifiers referring to symbols or atoms.
 		-- TSType              = { };    -- For types.
-		TSTypeBuiltin = { fg = cp.katppuccino2, style = cnf.styles.keywords }, -- For builtin types.
+		TSTypeBuiltin = { fg = cp.catppuccin2, style = cnf.styles.keywords }, -- For builtin types.
 		TSVariable = { style = cnf.styles.variables }, -- Any variable name that does not have another highlighcp.
-		TSVariableBuiltin = { fg = cp.katppuccino5, style = cnf.styles.keywords }, -- Variable names that are defined by the languages, like `this` or `self`.
+		TSVariableBuiltin = { fg = cp.catppuccin5, style = cnf.styles.keywords }, -- Variable names that are defined by the languages, like `this` or `self`.
 		-- TSTag               = { };    -- Tags like html tag names.
 		-- TSTagDelimiter      = { };    -- Tag delimiter like `<` `>` `/`
-		-- TSText              = { };    -- For strings considekatppuccino5 text in a markup language.
-		TSTextReference = { fg = cp.katppuccino2 },
+		-- TSText              = { };    -- For strings considecatppuccin5 text in a markup language.
+		TSTextReference = { fg = cp.catppuccin2 },
 		-- TSEmphasis          = { };    -- For text to be represented with emphasis.
 		-- TSUnderline         = { };    -- For text to be represented with an underline.
 		-- TSStrike            = { };    -- For strikethrough texcp.
diff --git a/lua/catppuccin/core/integrations/ts_rainbow.lua b/lua/catppuccin/core/integrations/ts_rainbow.lua
index 3a09491..4b23843 100644
--- a/lua/catppuccin/core/integrations/ts_rainbow.lua
+++ b/lua/catppuccin/core/integrations/ts_rainbow.lua
@@ -2,13 +2,13 @@ local M = {}
 
 function M.get(cp)
 	return {
-		rainbowcol1 = {bg = cp.katppuccino1, fg = cp.katppuccino5},
-		rainbowcol2 = {bg = cp.katppuccino1, fg = cp.katppuccino7},
-		rainbowcol3 = {bg = cp.katppuccino1, fg = cp.katppuccino8},
-		rainbowcol4 = {bg = cp.katppuccino1, fg = cp.katppuccino9},
-		rainbowcol5 = {bg = cp.katppuccino1, fg = cp.katppuccino4},
-		rainbowcol6 = {bg = cp.katppuccino1, fg = cp.katppuccino2},
-		rainbowcol7 = {bg = cp.katppuccino1, fg = cp.katppuccino0},
+		rainbowcol1 = {bg = cp.catppuccin1, fg = cp.catppuccin5},
+		rainbowcol2 = {bg = cp.catppuccin1, fg = cp.catppuccin7},
+		rainbowcol3 = {bg = cp.catppuccin1, fg = cp.catppuccin8},
+		rainbowcol4 = {bg = cp.catppuccin1, fg = cp.catppuccin9},
+		rainbowcol5 = {bg = cp.catppuccin1, fg = cp.catppuccin4},
+		rainbowcol6 = {bg = cp.catppuccin1, fg = cp.catppuccin2},
+		rainbowcol7 = {bg = cp.catppuccin1, fg = cp.catppuccin0},
 	}
 end
 
diff --git a/lua/catppuccin/core/mapper.lua b/lua/catppuccin/core/mapper.lua
index 1c30d0b..6f62f78 100644
--- a/lua/catppuccin/core/mapper.lua
+++ b/lua/catppuccin/core/mapper.lua
@@ -1,5 +1,5 @@
-local colors_util = require("katppuccino.utils.colors")
-local color_palette = require("katppuccino.core.color_palette")
+local colors_util = require("catppuccin.utils.colors")
+local color_palette = require("catppuccin.core.color_palette")
 
 local M = {}
 
@@ -9,7 +9,7 @@ local function get_properties()
 		background = "dark",
 	}
 
-	if colors_util.assert_brightness(color_palette.katppuccino1) then
+	if colors_util.assert_brightness(color_palette.catppuccin1) then
 		props["background"] = "light"
 	end
 
@@ -21,153 +21,153 @@ local function get_base()
 	cp.none = "NONE"
 
 	return {
-		Comment = { fg = cp.katppuccino11, style = cnf.styles.comments }, -- just comments
-		ColorColumn = { bg = cp.katppuccino15 }, -- used for the columns set with 'colorcolumn'
+		Comment = { fg = cp.catppuccin11, style = cnf.styles.comments }, -- just comments
+		ColorColumn = { bg = cp.catppuccin15 }, -- used for the columns set with 'colorcolumn'
 		Conceal = { fg = cp.black }, -- placeholder characters substituted for concealed text (see 'conceallevel')
-		Cursor = { fg = cp.katppuccino1, bg = cp.katppuccino10 }, -- character under the cursor
-		lCursor = { fg = cp.katppuccino1, bg = cp.katppuccino10 }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
-		CursorIM = { fg = cp.katppuccino1, bg = cp.katppuccino10 }, -- like Cursor, but used when in IME mode |CursorIM|
-		CursorColumn = { bg = cp.katppuccino14 }, -- Screen-column at the cursor, when 'cursorcolumn' is secp.
-		CursorLine = { bg = cp.katppuccino14 }, -- Screen-line at the cursor, when 'cursorline' is secp.  Low-priority if foreground (ctermfg OR guifg) is not secp.
-		Directory = { fg = cp.katppuccino9 }, -- directory names (and other special names in listings)
-		EndOfBuffer = { fg = cp.katppuccino1 }, -- filler lines (~) after the end of the buffer.  By default, this is highlighted like |hl-NonText|.
-		ErrorMsg = { fg = cp.katppuccino5 }, -- error messages on the command line
-		VertSplit = { fg = cp.katppuccino13 }, -- the column separating vertically split windows
-		Folded = { fg = cp.katppuccino9, bg = cp.katppuccino12 }, -- line used for closed folds
-		FoldColumn = { bg = cp.katppuccino1, fg = cp.katppuccino11 }, -- 'foldcolumn'
-		SignColumn = { bg = cnf.transparency and cp.none or cp.katppuccino1, fg = cp.katppuccino12 }, -- column where |signs| are displayed
-		SignColumnSB = { bg = cp.katppuccino13, fg = cp.katppuccino12 }, -- column where |signs| are displayed
-		Substitute = { bg = cp.katppuccino12, fg = cp.katppuccino4 }, -- |:substitute| replacement text highlighting
-		LineNr = { fg = cp.katppuccino12 }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp.
-		CursorLineNr = { fg = cp.katppuccino0 }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline.
-		MatchParen = { fg = cp.katppuccino6, style = "bold" }, -- The character under the cursor or just before it, if it is a paikatppuccino5 bracket, and its match. |pi_paren.txt|
-		ModeMsg = { fg = cp.katppuccino0, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ")
-		MsgArea = { fg = cp.katppuccino0 }, -- Area for messages and cmdline
+		Cursor = { fg = cp.catppuccin1, bg = cp.catppuccin10 }, -- character under the cursor
+		lCursor = { fg = cp.catppuccin1, bg = cp.catppuccin10 }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
+		CursorIM = { fg = cp.catppuccin1, bg = cp.catppuccin10 }, -- like Cursor, but used when in IME mode |CursorIM|
+		CursorColumn = { bg = cp.catppuccin14 }, -- Screen-column at the cursor, when 'cursorcolumn' is secp.
+		CursorLine = { bg = cp.catppuccin14 }, -- Screen-line at the cursor, when 'cursorline' is secp.  Low-priority if foreground (ctermfg OR guifg) is not secp.
+		Directory = { fg = cp.catppuccin9 }, -- directory names (and other special names in listings)
+		EndOfBuffer = { fg = cp.catppuccin1 }, -- filler lines (~) after the end of the buffer.  By default, this is highlighted like |hl-NonText|.
+		ErrorMsg = { fg = cp.catppuccin5 }, -- error messages on the command line
+		VertSplit = { fg = cp.catppuccin13 }, -- the column separating vertically split windows
+		Folded = { fg = cp.catppuccin9, bg = cp.catppuccin12 }, -- line used for closed folds
+		FoldColumn = { bg = cp.catppuccin1, fg = cp.catppuccin11 }, -- 'foldcolumn'
+		SignColumn = { bg = cnf.transparency and cp.none or cp.catppuccin1, fg = cp.catppuccin12 }, -- column where |signs| are displayed
+		SignColumnSB = { bg = cp.catppuccin13, fg = cp.catppuccin12 }, -- column where |signs| are displayed
+		Substitute = { bg = cp.catppuccin12, fg = cp.catppuccin4 }, -- |:substitute| replacement text highlighting
+		LineNr = { fg = cp.catppuccin12 }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp.
+		CursorLineNr = { fg = cp.catppuccin0 }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline.
+		MatchParen = { fg = cp.catppuccin6, style = "bold" }, -- The character under the cursor or just before it, if it is a paicatppuccin5 bracket, and its match. |pi_paren.txt|
+		ModeMsg = { fg = cp.catppuccin0, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ")
+		MsgArea = { fg = cp.catppuccin0 }, -- Area for messages and cmdline
 		MsgSeparator = {}, -- Separator for scrolled messages, `msgsep` flag of 'display'
-		MoreMsg = { fg = cp.katppuccino9 }, -- |more-prompt|
-		NonText = { fg = cp.katppuccino11 }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|.
-		Normal = { fg = cp.katppuccino10, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- normal text
-		NormalNC = { fg = cp.katppuccino10, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- normal text in non-current windows
-		NormalSB = { fg = cp.katppuccino10, bg = cp.katppuccino13 }, -- normal text in non-current windows
-		NormalFloat = { fg = cp.katppuccino10, bg = cp.katppuccino13 }, -- Normal text in floating windows.
-		FloatBorder = { fg = cp.katppuccino9 },
-		Pmenu = { bg = cp.katppuccino14, fg = cp.katppuccino10 }, -- Popup menu: normal item.
-		PmenuSel = { fg = cp.katppuccino4, bg = cp.katppuccino12 }, -- Popup menu: selected item.
-		PmenuSbar = { bg = cp.katppuccino12 }, -- Popup menu: scrollbar.
-		PmenuThumb = { bg = cp.katppuccino11 }, -- Popup menu: Thumb of the scrollbar.
-		Question = { fg = cp.katppuccino9 }, -- |hit-enter| prompt and yes/no questions
-		QuickFixLine = { bg = cp.katppuccino12, style = "bold" }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there.
-		Search = { bg = cp.katppuccino12, fg = cp.katppuccino4 }, -- Last search pattern highlighting (see 'hlsearch').  Also used for similar items that need to stand oucp.
-		IncSearch = { bg = cp.katppuccino4, fg = cp.katppuccino12 }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c"
-		SpecialKey = { fg = cp.katppuccino10 }, -- Unprintable characters: text displayed differently from what it really is.  But not 'listchars' whitespace. |hl-Whitespace|
-		SpellBad = { sp = cp.katppuccino5, style = "undercurl" }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise.
-		SpellCap = { sp = cp.katppuccino8, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise.
-		SpellLocal = { sp = cp.katppuccino9, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise.
-		SpellRare = { sp = cp.katppuccino0, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is hardly ever used.  |spell| Combined with the highlighting used otherwise.
-		StatusLine = { fg = cp.katppuccino10, bg = cp.katppuccino14 }, -- status line of current window
-		StatusLineNC = { fg = cp.katppuccino12, bg = cp.katppuccino14 }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window.
-		TabLine = { bg = cp.katppuccino14, fg = cp.katppuccino12 }, -- tab pages line, not active tab page label
+		MoreMsg = { fg = cp.catppuccin9 }, -- |more-prompt|
+		NonText = { fg = cp.catppuccin11 }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|.
+		Normal = { fg = cp.catppuccin10, bg = cnf.transparency and cp.none or cp.catppuccin1 }, -- normal text
+		NormalNC = { fg = cp.catppuccin10, bg = cnf.transparency and cp.none or cp.catppuccin1 }, -- normal text in non-current windows
+		NormalSB = { fg = cp.catppuccin10, bg = cp.catppuccin13 }, -- normal text in non-current windows
+		NormalFloat = { fg = cp.catppuccin10, bg = cp.catppuccin13 }, -- Normal text in floating windows.
+		FloatBorder = { fg = cp.catppuccin9 },
+		Pmenu = { bg = cp.catppuccin14, fg = cp.catppuccin10 }, -- Popup menu: normal item.
+		PmenuSel = { fg = cp.catppuccin4, bg = cp.catppuccin12 }, -- Popup menu: selected item.
+		PmenuSbar = { bg = cp.catppuccin12 }, -- Popup menu: scrollbar.
+		PmenuThumb = { bg = cp.catppuccin11 }, -- Popup menu: Thumb of the scrollbar.
+		Question = { fg = cp.catppuccin9 }, -- |hit-enter| prompt and yes/no questions
+		QuickFixLine = { bg = cp.catppuccin12, style = "bold" }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there.
+		Search = { bg = cp.catppuccin12, fg = cp.catppuccin4 }, -- Last search pattern highlighting (see 'hlsearch').  Also used for similar items that need to stand oucp.
+		IncSearch = { bg = cp.catppuccin4, fg = cp.catppuccin12 }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c"
+		SpecialKey = { fg = cp.catppuccin10 }, -- Unprintable characters: text displayed differently from what it really is.  But not 'listchars' whitespace. |hl-Whitespace|
+		SpellBad = { sp = cp.catppuccin5, style = "undercurl" }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise.
+		SpellCap = { sp = cp.catppuccin8, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise.
+		SpellLocal = { sp = cp.catppuccin9, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise.
+		SpellRare = { sp = cp.catppuccin0, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is hardly ever used.  |spell| Combined with the highlighting used otherwise.
+		StatusLine = { fg = cp.catppuccin10, bg = cp.catppuccin14 }, -- status line of current window
+		StatusLineNC = { fg = cp.catppuccin12, bg = cp.catppuccin14 }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window.
+		TabLine = { bg = cp.catppuccin14, fg = cp.catppuccin12 }, -- tab pages line, not active tab page label
 		TabLineFill = { bg = cp.black }, -- tab pages line, where there are no labels
-		TabLineSel = { fg = cp.katppuccino0, bg = cp.katppuccino12 }, -- tab pages line, active tab page label
-		Title = { fg = cp.katppuccino9, style = "bold" }, -- titles for output from ":set all", ":autocmd" etcp.
-		Visual = { bg = cp.katppuccino15 }, -- Visual mode selection
-		VisualNOS = { bg = cp.katppuccino15 }, -- Visual mode selection when vim is "Not Owning the Selection".
-		WarningMsg = { fg = cp.katppuccino8 }, -- warning messages
-		Whitespace = { fg = cp.katppuccino12 }, -- "nbsp", "space", "tab" and "trail" in 'listchars'
-		WildMenu = { bg = cp.katppuccino11 }, -- current match in 'wildmenu' completion
+		TabLineSel = { fg = cp.catppuccin0, bg = cp.catppuccin12 }, -- tab pages line, active tab page label
+		Title = { fg = cp.catppuccin9, style = "bold" }, -- titles for output from ":set all", ":autocmd" etcp.
+		Visual = { bg = cp.catppuccin15 }, -- Visual mode selection
+		VisualNOS = { bg = cp.catppuccin15 }, -- Visual mode selection when vim is "Not Owning the Selection".
+		WarningMsg = { fg = cp.catppuccin8 }, -- warning messages
+		Whitespace = { fg = cp.catppuccin12 }, -- "nbsp", "space", "tab" and "trail" in 'listchars'
+		WildMenu = { bg = cp.catppuccin11 }, -- current match in 'wildmenu' completion
 		-- These groups are not listed as default vim groups,
 		-- but they are defacto standard group names for syntax highlighting.
-		-- katppuccino11ed out groups should chain up to their "preferkatppuccino5" group by
+		-- catppuccin11ed out groups should chain up to their "prefercatppuccin5" group by
 		-- default,
-		-- Unkatppuccino11 and edit if you want more specific syntax highlighting.
+		-- Uncatppuccin11 and edit if you want more specific syntax highlighting.
 
 		-- code itself
 
-		Constant = { fg = cp.katppuccino6 }, -- (preferkatppuccino5) any constant
-		String = { fg = cp.katppuccino7, style = cnf.styles.strings }, -- a string constant: "this is a string"
-		Character = { fg = cp.katppuccino7 }, --  a character constant: 'c', '\n'
-		Number = { fg = cp.katppuccino6 }, --   a number constant: 234, 0xff
-		Float = { fg = cp.katppuccino6 }, --    a floating point constant: 2.3e10
-		Boolean = { fg = cp.katppuccino6 }, --  a boolean constant: TRUE, false
-		Identifier = { fg = cp.katppuccino2, style = cnf.styles.variables }, -- (preferkatppuccino5) any variable name
-		Function = { fg = cp.katppuccino9, style = cnf.styles.functions }, -- function name (also: methods for classes)
-		Statement = { fg = cp.katppuccino3 }, -- (preferkatppuccino5) any statement
-		Conditional = { fg = cp.katppuccino5 }, --  if, then, else, endif, switch, etcp.
-		Repeat = { fg = cp.katppuccino5 }, --   for, do, while, etcp.
-		Label = { fg = cp.katppuccino3 }, --    case, default, etcp.
-		Operator = { fg = cp.katppuccino2 }, -- "sizeof", "+", "*", etcp.
-		Keyword = { fg = cp.katppuccino4, style = cnf.styles.keywords }, --  any other keyword
+		Constant = { fg = cp.catppuccin6 }, -- (prefercatppuccin5) any constant
+		String = { fg = cp.catppuccin7, style = cnf.styles.strings }, -- a string constant: "this is a string"
+		Character = { fg = cp.catppuccin7 }, --  a character constant: 'c', '\n'
+		Number = { fg = cp.catppuccin6 }, --   a number constant: 234, 0xff
+		Float = { fg = cp.catppuccin6 }, --    a floating point constant: 2.3e10
+		Boolean = { fg = cp.catppuccin6 }, --  a boolean constant: TRUE, false
+		Identifier = { fg = cp.catppuccin2, style = cnf.styles.variables }, -- (prefercatppuccin5) any variable name
+		Function = { fg = cp.catppuccin9, style = cnf.styles.functions }, -- function name (also: methods for classes)
+		Statement = { fg = cp.catppuccin3 }, -- (prefercatppuccin5) any statement
+		Conditional = { fg = cp.catppuccin5 }, --  if, then, else, endif, switch, etcp.
+		Repeat = { fg = cp.catppuccin5 }, --   for, do, while, etcp.
+		Label = { fg = cp.catppuccin3 }, --    case, default, etcp.
+		Operator = { fg = cp.catppuccin2 }, -- "sizeof", "+", "*", etcp.
+		Keyword = { fg = cp.catppuccin4, style = cnf.styles.keywords }, --  any other keyword
 		-- Exception     = { }, --  try, catch, throw
 
-		PreProc = { fg = cp.katppuccino4 }, -- (preferkatppuccino5) generic Preprocessor
-		Include = { fg = cp.katppuccino4 }, --  preprocessor #include
+		PreProc = { fg = cp.catppuccin4 }, -- (prefercatppuccin5) generic Preprocessor
+		Include = { fg = cp.catppuccin4 }, --  preprocessor #include
 		-- Define        = { }, --   preprocessor #define
 		-- Macro         = { }, --    same as Define
 		-- PreCondit     = { }, --  preprocessor #if, #else, #endif, etcp.
 
-		Type = { fg = cp.katppuccino8 }, -- (preferkatppuccino5) int, long, char, etcp.
-		StorageClass = { fg = cp.katppuccino8 }, -- static, register, volatile, etcp.
-		Structure = { fg = cp.katppuccino8 }, --  struct, union, enum, etcp.
-		Typedef = { fg = cp.katppuccino8 }, --  A typedef
-		Special = { fg = cp.katppuccino9 }, -- (preferkatppuccino5) any special symbol
+		Type = { fg = cp.catppuccin8 }, -- (prefercatppuccin5) int, long, char, etcp.
+		StorageClass = { fg = cp.catppuccin8 }, -- static, register, volatile, etcp.
+		Structure = { fg = cp.catppuccin8 }, --  struct, union, enum, etcp.
+		Typedef = { fg = cp.catppuccin8 }, --  A typedef
+		Special = { fg = cp.catppuccin9 }, -- (prefercatppuccin5) any special symbol
 		-- SpecialChar   = { }, --  special character in a constant
 		-- Tag           = { }, --    you can use CTRL-] on this
 		-- Delimiter     = { }, --  character that needs attention
-		-- Specialkatppuccino11= { }, -- special things inside a katppuccino11
+		-- Specialcatppuccin11= { }, -- special things inside a catppuccin11
 		-- Debug         = { }, --    debugging statements
 
-		Underlined = { style = "underline" }, -- (preferkatppuccino5) text that stands out, HTML links
+		Underlined = { style = "underline" }, -- (prefercatppuccin5) text that stands out, HTML links
 		Bold = { style = "bold" },
 		Italic = { style = "italic" },
 		-- ("Ignore", below, may be invisible...)
-		-- Ignore = { }, -- (preferkatppuccino5) left blank, hidden  |hl-Ignore|
-
-		Error = { fg = cp.katppuccino5 }, -- (preferkatppuccino5) any erroneous construct
-		Todo = { bg = cp.katppuccino8, fg = cp.katppuccino1, style = "bold" }, -- (preferkatppuccino5) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
-		qfLineNr = { fg = cp.katppuccino8 },
-		qfFileName = { fg = cp.katppuccino9 },
-		htmlH1 = { fg = cp.katppuccino4, style = "bold" },
-		htmlH2 = { fg = cp.katppuccino9, style = "bold" },
-		-- mkdHeading = { fg = cp.katppuccino6, style = "bold" },
-		-- mkdCode = { bg = cp.terminal_black, fg = cp.katppuccino10 },
-		mkdCodeDelimiter = { bg = cp.katppuccino1, fg = cp.katppuccino10 },
-		mkdCodeStart = { fg = cp.katppuccino2, style = "bold" },
-		mkdCodeEnd = { fg = cp.katppuccino2, style = "bold" },
-		-- mkdLink = { fg = cp.katppuccino9, style = "underline" },
+		-- Ignore = { }, -- (prefercatppuccin5) left blank, hidden  |hl-Ignore|
+
+		Error = { fg = cp.catppuccin5 }, -- (prefercatppuccin5) any erroneous construct
+		Todo = { bg = cp.catppuccin8, fg = cp.catppuccin1, style = "bold" }, -- (prefercatppuccin5) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
+		qfLineNr = { fg = cp.catppuccin8 },
+		qfFileName = { fg = cp.catppuccin9 },
+		htmlH1 = { fg = cp.catppuccin4, style = "bold" },
+		htmlH2 = { fg = cp.catppuccin9, style = "bold" },
+		-- mkdHeading = { fg = cp.catppuccin6, style = "bold" },
+		-- mkdCode = { bg = cp.terminal_black, fg = cp.catppuccin10 },
+		mkdCodeDelimiter = { bg = cp.catppuccin1, fg = cp.catppuccin10 },
+		mkdCodeStart = { fg = cp.catppuccin2, style = "bold" },
+		mkdCodeEnd = { fg = cp.catppuccin2, style = "bold" },
+		-- mkdLink = { fg = cp.catppuccin9, style = "underline" },
 
 		-- debugging
-		debugPC = { bg = cp.katppuccino13 }, -- used for highlighting the current line in terminal-debug
-		debugBreakpoint = { bg = cp.katppuccino1, fg = cp.katppuccino11 }, -- used for breakpoint colors in terminal-debug
+		debugPC = { bg = cp.catppuccin13 }, -- used for highlighting the current line in terminal-debug
+		debugBreakpoint = { bg = cp.catppuccin1, fg = cp.catppuccin11 }, -- used for breakpoint colors in terminal-debug
 		-- illuminate
-		illuminatedWord = { bg = cp.katppuccino12 },
-		illuminatedCurWord = { bg = cp.katppuccino12 },
+		illuminatedWord = { bg = cp.catppuccin12 },
+		illuminatedCurWord = { bg = cp.catppuccin12 },
 		-- diff
-		diffAdded = { fg = cp.katppuccino9 },
-		diffRemoved = { fg = cp.katppuccino5 },
-		diffChanged = { fg = cp.katppuccino8 },
-		diffOldFile = { fg = cp.katppuccino8 },
-		diffNewFile = { fg = cp.katppuccino6 },
-		diffFile = { fg = cp.katppuccino9 },
-		diffLine = { fg = cp.katppuccino11 },
-		diffIndexLine = { fg = cp.katppuccino4 },
-		DiffAdd = { fg = cp.katppuccino9, bg = cp.katppuccino1 }, -- diff mode: Added line |diff.txt|
-		DiffChange = { fg = cp.katppuccino8, bg = cp.katppuccino1 }, -- diff mode: Changed line |diff.txt|
-		DiffDelete = { fg = cp.katppuccino5, bg = cp.katppuccino1 }, -- diff mode: Deleted line |diff.txt|
-		DiffText = { fg = cp.katppuccino9, bg = cp.katppuccino1 }, -- diff mode: Changed text within a changed line |diff.txt|
+		diffAdded = { fg = cp.catppuccin9 },
+		diffRemoved = { fg = cp.catppuccin5 },
+		diffChanged = { fg = cp.catppuccin8 },
+		diffOldFile = { fg = cp.catppuccin8 },
+		diffNewFile = { fg = cp.catppuccin6 },
+		diffFile = { fg = cp.catppuccin9 },
+		diffLine = { fg = cp.catppuccin11 },
+		diffIndexLine = { fg = cp.catppuccin4 },
+		DiffAdd = { fg = cp.catppuccin9, bg = cp.catppuccin1 }, -- diff mode: Added line |diff.txt|
+		DiffChange = { fg = cp.catppuccin8, bg = cp.catppuccin1 }, -- diff mode: Changed line |diff.txt|
+		DiffDelete = { fg = cp.catppuccin5, bg = cp.catppuccin1 }, -- diff mode: Deleted line |diff.txt|
+		DiffText = { fg = cp.catppuccin9, bg = cp.catppuccin1 }, -- diff mode: Changed text within a changed line |diff.txt|
 		-- NeoVim
-		healthError = { fg = cp.katppuccino5 },
-		healthSuccess = { fg = cp.katppuccino7 },
-		healthWarning = { fg = cp.katppuccino8 },
+		healthError = { fg = cp.catppuccin5 },
+		healthSuccess = { fg = cp.catppuccin7 },
+		healthWarning = { fg = cp.catppuccin8 },
 		-- misc
 
 		-- glyphs
-		GlyphPalette1 = { fg = cp.katppuccino5 },
-		GlyphPalette2 = { fg = cp.katppuccino7 },
-		GlyphPalette3 = { fg = cp.katppuccino8 },
-		GlyphPalette4 = { fg = cp.katppuccino9 },
-		GlyphPalette6 = { fg = cp.katppuccino7 },
-		GlyphPalette7 = { fg = cp.katppuccino10 },
-		GlyphPalette9 = { fg = cp.katppuccino5 },
+		GlyphPalette1 = { fg = cp.catppuccin5 },
+		GlyphPalette2 = { fg = cp.catppuccin7 },
+		GlyphPalette3 = { fg = cp.catppuccin8 },
+		GlyphPalette4 = { fg = cp.catppuccin9 },
+		GlyphPalette6 = { fg = cp.catppuccin7 },
+		GlyphPalette7 = { fg = cp.catppuccin10 },
+		GlyphPalette9 = { fg = cp.catppuccin5 },
 	}
 end
 
@@ -191,7 +191,7 @@ local function get_integrations()
 			final_integrations = vim.tbl_deep_extend(
 				"force",
 				final_integrations,
-				require("katppuccino.core.integrations." .. integration).get(color_palette)
+				require("catppuccin.core.integrations." .. integration).get(color_palette)
 			)
 		end
 	end
@@ -199,7 +199,7 @@ local function get_integrations()
 	final_integrations = vim.tbl_deep_extend(
 		"force",
 		final_integrations,
-		require("katppuccino.core.remaps").get_hig_remaps() or {}
+		require("catppuccin.core.remaps").get_hig_remaps() or {}
 	)
 	return final_integrations
 end
@@ -208,21 +208,21 @@ local function get_terminal()
 	local g = vim.g
 	local cp = color_palette
 
-	g.terminal_color_0 = cp.katppuccino0
-	g.terminal_color_1 = cp.katppuccino1
-	g.terminal_color_2 = cp.katppuccino2
-	g.terminal_color_3 = cp.katppuccino3
-	g.terminal_color_4 = cp.katppuccino4
-	g.terminal_color_5 = cp.katppuccino5
-	g.terminal_color_6 = cp.katppuccino6
-	g.terminal_color_7 = cp.katppuccino7
-	g.terminal_color_8 = cp.katppuccino8
-	g.terminal_color_9 = cp.katppuccino9
-	g.terminal_color_10 = cp.katppuccino10
+	g.terminal_color_0 = cp.catppuccin0
+	g.terminal_color_1 = cp.catppuccin1
+	g.terminal_color_2 = cp.catppuccin2
+	g.terminal_color_3 = cp.catppuccin3
+	g.terminal_color_4 = cp.catppuccin4
+	g.terminal_color_5 = cp.catppuccin5
+	g.terminal_color_6 = cp.catppuccin6
+	g.terminal_color_7 = cp.catppuccin7
+	g.terminal_color_8 = cp.catppuccin8
+	g.terminal_color_9 = cp.catppuccin9
+	g.terminal_color_10 = cp.catppuccin10
 end
 
 function M.apply()
-	_G.cnf = require("katppuccino.config").options
+	_G.cnf = require("catppuccin.config").options
 
 	local theme = {}
 	theme.properties = get_properties() -- nvim settings