diff --git a/lua/catppuccino/core/integrations/barbar.lua b/lua/catppuccino/core/integrations/barbar.lua
index 200af47..a2048ec 100644
--- a/lua/catppuccino/core/integrations/barbar.lua
+++ b/lua/catppuccino/core/integrations/barbar.lua
@@ -2,25 +2,25 @@ local util = require("catppuccino.utils.util")
 
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		BufferCurrent = { bg = cpt.fg_gutter, fg = cpt.fg },
-		BufferCurrentIndex = { bg = cpt.fg_gutter, fg = cpt.info },
-		BufferCurrentMod = { bg = cpt.fg_gutter, fg = cpt.warning },
-		BufferCurrentSign = { bg = cpt.fg_gutter, fg = cpt.info },
-		BufferCurrentTarget = { bg = cpt.fg_gutter, fg = cpt.red },
-		BufferVisible = { bg = cpt.bg_statusline, fg = cpt.fg },
-		BufferVisibleIndex = { bg = cpt.bg_statusline, fg = cpt.info },
-		BufferVisibleMod = { bg = cpt.bg_statusline, fg = cpt.warning },
-		BufferVisibleSign = { bg = cpt.bg_statusline, fg = cpt.info },
-		BufferVisibleTarget = { bg = cpt.bg_statusline, fg = cpt.red },
-		BufferInactive = { bg = cpt.bg_statusline, fg = cpt.comment },
-		BufferInactiveIndex = { bg = cpt.bg_statusline, fg = cpt.comment },
-		BufferInactiveMod = { bg = cpt.bg_statusline, fg = util.darken(cpt.warning, 0.7) },
-		BufferInactiveSign = { bg = cpt.bg_statusline, fg = cpt.border_highlight },
-		BufferInactiveTarget = { bg = cpt.bg_statusline, fg = cpt.red },
-		BufferTabpages = { bg = cpt.bg_statusline, fg = cpt.none },
-		BufferTabpage = { bg = cpt.bg_statusline, fg = cpt.border_highlight },
+		BufferCurrent = { bg = cp.fg_gutter, fg = cp.fg },
+		BufferCurrentIndex = { bg = cp.fg_gutter, fg = cp.info },
+		BufferCurrentMod = { bg = cp.fg_gutter, fg = cp.warning },
+		BufferCurrentSign = { bg = cp.fg_gutter, fg = cp.info },
+		BufferCurrentTarget = { bg = cp.fg_gutter, fg = cp.red },
+		BufferVisible = { bg = cp.bg_statusline, fg = cp.fg },
+		BufferVisibleIndex = { bg = cp.bg_statusline, fg = cp.info },
+		BufferVisibleMod = { bg = cp.bg_statusline, fg = cp.warning },
+		BufferVisibleSign = { bg = cp.bg_statusline, fg = cp.info },
+		BufferVisibleTarget = { bg = cp.bg_statusline, fg = cp.red },
+		BufferInactive = { bg = cp.bg_statusline, fg = cp.comment },
+		BufferInactiveIndex = { bg = cp.bg_statusline, fg = cp.comment },
+		BufferInactiveMod = { bg = cp.bg_statusline, fg = util.darken(cp.warning, 0.7) },
+		BufferInactiveSign = { bg = cp.bg_statusline, fg = cp.border_highlight },
+		BufferInactiveTarget = { bg = cp.bg_statusline, fg = cp.red },
+		BufferTabpages = { bg = cp.bg_statusline, fg = cp.none },
+		BufferTabpage = { bg = cp.bg_statusline, fg = cp.border_highlight },
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/bufferline.lua b/lua/catppuccino/core/integrations/bufferline.lua
index e8bd467..196c02f 100644
--- a/lua/catppuccino/core/integrations/bufferline.lua
+++ b/lua/catppuccino/core/integrations/bufferline.lua
@@ -1,27 +1,27 @@
 local M = {}
 local util = require("catppuccino.utils.util")
 
-function M.get(cpt)
+function M.get(cp)
 
 	local inactive_clr = util.darken("#000000", 0.56)
 
 	return {
-		BufferLineFill = { bg = util.brighten(cpt.bg, 0.05) },
-		BufferLineBackground = { fg = cpt.gray, bg = inactive_clr },
-		BufferLineBufferVisible = { fg = cpt.gray, bg = inactive_clr },
-		BufferLineBufferSelected = { fg = cpt.fg, bg = cpt.bg },
-		BufferLineTab = { fg = cpt.gray, bg = cpt.bg },
-		BufferLineTabSelected = { fg = cpt.red, bg = cpt.blue },
-		BufferLineTabClose = { fg = cpt.red, bg = inactive_clr },
-		BufferLineIndicatorSelected = { fg = cpt.bg, bg = cpt.bg },
+		BufferLineFill = { bg = util.brighten(cp.bg, 0.05) },
+		BufferLineBackground = { fg = cp.gray, bg = inactive_clr },
+		BufferLineBufferVisible = { fg = cp.gray, bg = inactive_clr },
+		BufferLineBufferSelected = { fg = cp.fg, bg = cp.bg },
+		BufferLineTab = { fg = cp.gray, bg = cp.bg },
+		BufferLineTabSelected = { fg = cp.red, bg = cp.blue },
+		BufferLineTabClose = { fg = cp.red, bg = inactive_clr },
+		BufferLineIndicatorSelected = { fg = cp.bg, bg = cp.bg },
 		-- 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 = cpt.gray, bg = inactive_clr },
-		BufferLineCloseButtonVisible = { fg = cpt.gray, bg = inactive_clr },
-		BufferLineCloseButtonSelected = { fg = cpt.red, bg = cpt.bg },
+		BufferLineCloseButton = { fg = cp.gray, bg = inactive_clr },
+		BufferLineCloseButtonVisible = { fg = cp.gray, bg = inactive_clr },
+		BufferLineCloseButtonSelected = { fg = cp.red, bg = cp.bg },
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/cmp.lua b/lua/catppuccino/core/integrations/cmp.lua
index 31caf27..344426c 100644
--- a/lua/catppuccino/core/integrations/cmp.lua
+++ b/lua/catppuccino/core/integrations/cmp.lua
@@ -1,14 +1,14 @@
 local M = {}
 local util = require("catppuccino.utils.util")
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		CmpItemAbbr = { fg = util.darken(cpt.white, 0.56) },
-		CmpItemAbbrDeprecated = { fg = util.darken(cpt.white, 0.56), stlye = "strikethrough" },
-		CmpItemAbbrMatch = { fg = cpt.fg, style = "bold" },
-		CmpItemAbbrMatchFuzzy = { fg = cpt.fg, style = "bold" },
-		CmpItemKind = { fg = cpt.blue_br },
-		CmpItemMenu = { fg = cpt.fg },
+		CmpItemAbbr = { fg = util.darken(cp.white, 0.56) },
+		CmpItemAbbrDeprecated = { fg = util.darken(cp.white, 0.56), stlye = "strikethrough" },
+		CmpItemAbbrMatch = { fg = cp.fg, style = "bold" },
+		CmpItemAbbrMatchFuzzy = { fg = cp.fg, style = "bold" },
+		CmpItemKind = { fg = cp.blue_br },
+		CmpItemMenu = { fg = cp.fg },
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/dashboard.lua b/lua/catppuccino/core/integrations/dashboard.lua
index 097264c..b574566 100644
--- a/lua/catppuccino/core/integrations/dashboard.lua
+++ b/lua/catppuccino/core/integrations/dashboard.lua
@@ -1,11 +1,11 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		DashboardShortCut = { fg = cpt.cyan },
-		DashboardHeader = { fg = cpt.yellow },
-		DashboardCenter = { fg = cpt.green },
-		DashboardFooter = { fg = cpt.orange, style = "italic" },
+		DashboardShortCut = { fg = cp.cyan },
+		DashboardHeader = { fg = cp.yellow },
+		DashboardCenter = { fg = cp.green },
+		DashboardFooter = { fg = cp.orange, style = "italic" },
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/fern.lua b/lua/catppuccino/core/integrations/fern.lua
index f0a5a6b..1f8b741 100644
--- a/lua/catppuccino/core/integrations/fern.lua
+++ b/lua/catppuccino/core/integrations/fern.lua
@@ -1,8 +1,8 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		FernBranchText = { fg = cpt.blue },
+		FernBranchText = { fg = cp.blue },
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/gitgutter.lua b/lua/catppuccino/core/integrations/gitgutter.lua
index d972750..401d5d7 100644
--- a/lua/catppuccino/core/integrations/gitgutter.lua
+++ b/lua/catppuccino/core/integrations/gitgutter.lua
@@ -1,10 +1,10 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		GitGutterAdd = { fg = cpt.diff.add },
-		GitGutterChange = { fg = cpt.diff.change },
-		GitGutterDelete = { fg = cpt.diff.delete },
+		GitGutterAdd = { fg = cp.diff.add },
+		GitGutterChange = { fg = cp.diff.change },
+		GitGutterDelete = { fg = cp.diff.delete },
 	}
 end
 return M
diff --git a/lua/catppuccino/core/integrations/gitsigns.lua b/lua/catppuccino/core/integrations/gitsigns.lua
index ffa9801..de1a7df 100644
--- a/lua/catppuccino/core/integrations/gitsigns.lua
+++ b/lua/catppuccino/core/integrations/gitsigns.lua
@@ -1,10 +1,10 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		GitSignsAdd = { fg = cpt.diff.add, bg = cnf.transparency and cpt.none or cpt.bg }, -- diff mode: Added line |diff.txt|
-		GitSignsChange = { fg = cpt.diff.change, bg = cnf.transparency and cpt.none or cpt.bg }, -- diff mode: Changed line |diff.txt|
-		GitSignsDelete = { fg = cpt.diff.remove, bg = cnf.transparency and cpt.none or cpt.bg }, -- diff mode: Deleted line |diff.txt|
+		GitSignsAdd = { fg = cp.diff.add, bg = cnf.transparency and cp.none or cp.bg }, -- diff mode: Added line |diff.txt|
+		GitSignsChange = { fg = cp.diff.change, bg = cnf.transparency and cp.none or cp.bg }, -- diff mode: Changed line |diff.txt|
+		GitSignsDelete = { fg = cp.diff.remove, bg = cnf.transparency and cp.none or cp.bg }, -- diff mode: Deleted line |diff.txt|
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/hop.lua b/lua/catppuccino/core/integrations/hop.lua
index 0bd1ca4..6628a9f 100644
--- a/lua/catppuccino/core/integrations/hop.lua
+++ b/lua/catppuccino/core/integrations/hop.lua
@@ -1,11 +1,11 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		HopNextKey = { bg = cpt.bg, fg = cpt.orange, style = "bold,underline" },
-		HopNextKey1 = { bg = cpt.bg, fg = cpt.blue, style = "bold" },
-		HopNextKey2 = { bg = cpt.bg, fg = cpt.green, style = "bold,italic" },
-		HopUnmatched = { bg = cpt.bg, fg = cpt.comment },
+		HopNextKey = { bg = cp.bg, fg = cp.orange, style = "bold,underline" },
+		HopNextKey1 = { bg = cp.bg, fg = cp.blue, style = "bold" },
+		HopNextKey2 = { bg = cp.bg, fg = cp.green, style = "bold,italic" },
+		HopUnmatched = { bg = cp.bg, fg = cp.comment },
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/indent_blankline.lua b/lua/catppuccino/core/integrations/indent_blankline.lua
index 481731c..47de25d 100644
--- a/lua/catppuccino/core/integrations/indent_blankline.lua
+++ b/lua/catppuccino/core/integrations/indent_blankline.lua
@@ -1,18 +1,18 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 
 	local hi = {
-		IndentBlanklineChar = { fg = cpt.gray },
+		IndentBlanklineChar = { fg = cp.gray },
 	}
 
 	if cnf.integrations.indent_blankline.colored_indent_levels then
-		hi["IndentBlanklineIndent6"] = {blend = "nocombine", fg = cpt.yellow}
-		hi["IndentBlanklineIndent5"] = {blend = "nocombine", fg = cpt.red}
-		hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cpt.green}
-		hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cpt.orange}
-		hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cpt.blue}
-		hi["IndentBlanklineIndent1"] = {blend = "nocombine", fg = cpt.magenta}
+		hi["IndentBlanklineIndent6"] = {blend = "nocombine", fg = cp.yellow}
+		hi["IndentBlanklineIndent5"] = {blend = "nocombine", fg = cp.red}
+		hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.green}
+		hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.orange}
+		hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cp.blue}
+		hi["IndentBlanklineIndent1"] = {blend = "nocombine", fg = cp.magenta}
 	end
 
 	return hi
diff --git a/lua/catppuccino/core/integrations/lightspeed.lua b/lua/catppuccino/core/integrations/lightspeed.lua
index 29b6c84..fa2a3d7 100644
--- a/lua/catppuccino/core/integrations/lightspeed.lua
+++ b/lua/catppuccino/core/integrations/lightspeed.lua
@@ -10,7 +10,7 @@ local function get_prepared()
 	return is_prepared
 end
 
-function M.get(cpt)
+function M.get(cp)
 
 	if not get_prepared() then
 		local catppuccino = require("catppuccino")
@@ -28,20 +28,20 @@ function M.get(cpt)
 	end
 
 	return {
-		LightspeedLabel = {bg = cpt.bg_search, fg = cpt.fg},
-		LightspeedOverlapped = {bg = cpt.bg_visual, fg = cpt.fg},
-		LightspeedLabelDistant = {bg = cpt.magenta_br, fg = cpt.fg},
-		LightspeedLabelDistantOverlapped = {bg = cpt.magenta_br, fg = cpt.fg},
-		LightspeedShortcut = {bg = cpt.bg, fg = cpt.orange, style = "italic"},
-		LightspeedShortcutOverlapped = {bg = cpt.bg, fg = cpt.orange, style = "bold"},
-		LightspeedMaskedChar = {bg = cpt.bg, fg = cpt.red, style = "undercurl"},
-		LightspeedGreyWash = {bg = cpt.bg, fg = cpt.comment},
-		LightspeedUnlabeledMatch = {bg = cpt.bg, fg = cpt.red_br, style = "underline"},
-		LightspeedOneCharMatch = {bg = cpt.bg, fg = cpt.red_br, style = "underline"},
-		LightspeedUniqueChar = {bg = cpt.bg, fg = cpt.white_br, style = "strikethrough"},
-		LightspeedPendingOpArea = {bg = cpt.bg, fg = cpt.white_br, style = "strikethrough"},
-		LightspeedPendingChangeOpArea = {bg = cpt.bg, fg = cpt.white_br, style = "strikethrough"},
-		LightspeedCursor = {fg = cpt.bg, bg = cpt.fg},
+		LightspeedLabel = {bg = cp.bg_search, fg = cp.fg},
+		LightspeedOverlapped = {bg = cp.bg_visual, fg = cp.fg},
+		LightspeedLabelDistant = {bg = cp.magenta_br, fg = cp.fg},
+		LightspeedLabelDistantOverlapped = {bg = cp.magenta_br, fg = cp.fg},
+		LightspeedShortcut = {bg = cp.bg, fg = cp.orange, style = "italic"},
+		LightspeedShortcutOverlapped = {bg = cp.bg, fg = cp.orange, style = "bold"},
+		LightspeedMaskedChar = {bg = cp.bg, fg = cp.red, style = "undercurl"},
+		LightspeedGreyWash = {bg = cp.bg, fg = cp.comment},
+		LightspeedUnlabeledMatch = {bg = cp.bg, fg = cp.red_br, style = "underline"},
+		LightspeedOneCharMatch = {bg = cp.bg, fg = cp.red_br, style = "underline"},
+		LightspeedUniqueChar = {bg = cp.bg, fg = cp.white_br, style = "strikethrough"},
+		LightspeedPendingOpArea = {bg = cp.bg, fg = cp.white_br, style = "strikethrough"},
+		LightspeedPendingChangeOpArea = {bg = cp.bg, fg = cp.white_br, style = "strikethrough"},
+		LightspeedCursor = {fg = cp.bg, bg = cp.fg},
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/lsp_saga.lua b/lua/catppuccino/core/integrations/lsp_saga.lua
index 3a65bee..e96c188 100644
--- a/lua/catppuccino/core/integrations/lsp_saga.lua
+++ b/lua/catppuccino/core/integrations/lsp_saga.lua
@@ -1,27 +1,27 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		DiagnosticError = { fg = cpt.error },
-		DiagnosticWarning = { fg = cpt.warning },
-		DiagnosticInformation = { fg = cpt.info },
-		DiagnosticHint = { fg = cpt.hint },
-		LspFloatWinNormal = { bg = cpt.bg_float },
-		LspFloatWinBorder = { fg = cpt.border_highlight },
-		LspSagaBorderTitle = { fg = cpt.cyan },
-		LspSagaHoverBorder = { fg = cpt.blue },
-		LspSagaRenameBorder = { fg = cpt.green },
-		LspSagaDefPreviewBorder = { fg = cpt.green },
-		LspSagaCodeActionBorder = { fg = cpt.blue },
-		LspSagaFinderSelection = { fg = cpt.bg_visual },
-		LspSagaCodeActionTitle = { fg = cpt.blue1 },
-		LspSagaCodeActionContent = { fg = cpt.purple },
-		LspSagaSignatureHelpBorder = { fg = cpt.red },
-		ReferencesCount = { fg = cpt.purple },
-		DefinitionCount = { fg = cpt.purple },
-		DefinitionIcon = { fg = cpt.blue },
-		ReferencesIcon = { fg = cpt.blue },
-		TargetWord = { fg = cpt.cyan },
+		DiagnosticError = { fg = cp.error },
+		DiagnosticWarning = { fg = cp.warning },
+		DiagnosticInformation = { fg = cp.info },
+		DiagnosticHint = { fg = cp.hint },
+		LspFloatWinNormal = { bg = cp.bg_float },
+		LspFloatWinBorder = { fg = cp.border_highlight },
+		LspSagaBorderTitle = { fg = cp.cyan },
+		LspSagaHoverBorder = { fg = cp.blue },
+		LspSagaRenameBorder = { fg = cp.green },
+		LspSagaDefPreviewBorder = { fg = cp.green },
+		LspSagaCodeActionBorder = { fg = cp.blue },
+		LspSagaFinderSelection = { fg = cp.bg_visual },
+		LspSagaCodeActionTitle = { fg = cp.blue1 },
+		LspSagaCodeActionContent = { fg = cp.purple },
+		LspSagaSignatureHelpBorder = { fg = cp.red },
+		ReferencesCount = { fg = cp.purple },
+		DefinitionCount = { fg = cp.purple },
+		DefinitionIcon = { fg = cp.blue },
+		ReferencesIcon = { fg = cp.blue },
+		TargetWord = { fg = cp.cyan },
 	}
 end
 return M
diff --git a/lua/catppuccino/core/integrations/lsp_trouble.lua b/lua/catppuccino/core/integrations/lsp_trouble.lua
index 59d2860..e3cb3a0 100644
--- a/lua/catppuccino/core/integrations/lsp_trouble.lua
+++ b/lua/catppuccino/core/integrations/lsp_trouble.lua
@@ -1,10 +1,10 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		LspTroubleText = { fg = cpt.fg_alt },
-		LspTroubleCount = { fg = cpt.magenta, bg = cpt.fg_gutter },
-		LspTroubleNormal = { fg = cpt.fg_sidebar, bg = cpt.bg_sidebar },
+		LspTroubleText = { fg = cp.fg_alt },
+		LspTroubleCount = { fg = cp.magenta, bg = cp.fg_gutter },
+		LspTroubleNormal = { fg = cp.fg_sidebar, bg = cp.bg_sidebar },
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/markdown.lua b/lua/catppuccino/core/integrations/markdown.lua
index 0aee43b..c0f9648 100644
--- a/lua/catppuccino/core/integrations/markdown.lua
+++ b/lua/catppuccino/core/integrations/markdown.lua
@@ -1,13 +1,13 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		markdownHeadingDelimiter = { fg = cpt.orange, style = "bold" },
-		markdownCode = { fg = cpt.cyan },
-		markdownCodeBlock = { fg = cpt.cyan },
-		markdownH1 = { fg = cpt.magenta, style = "bold" },
-		markdownH2 = { fg = cpt.blue, style = "bold" },
-		markdownLinkText = { fg = cpt.blue, style = "underline" },
+		markdownHeadingDelimiter = { fg = cp.orange, style = "bold" },
+		markdownCode = { fg = cp.cyan },
+		markdownCodeBlock = { fg = cp.cyan },
+		markdownH1 = { fg = cp.magenta, style = "bold" },
+		markdownH2 = { fg = cp.blue, style = "bold" },
+		markdownLinkText = { fg = cp.blue, style = "underline" },
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/native_lsp.lua b/lua/catppuccino/core/integrations/native_lsp.lua
index 0ed3adc..70aa0e3 100644
--- a/lua/catppuccino/core/integrations/native_lsp.lua
+++ b/lua/catppuccino/core/integrations/native_lsp.lua
@@ -1,46 +1,46 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 
 	local virtual_text = cnf.integrations.native_lsp.virtual_text
 	local underlines = cnf.integrations.native_lsp.underlines
 
 	return {
-		-- These groups are for the native LSP cliencpt. Some other LSP clients may
+		-- These groups are for the native LSP cliencp. Some other LSP clients may
 		-- use these groups, or use their own. Consult your LSP client's
 		-- documentation.
-		LspReferenceText = { bg = cpt.fg_gutter }, -- used for highlighting "text" references
-		LspReferenceRead = { bg = cpt.fg_gutter }, -- used for highlighting "read" references
-		LspReferenceWrite = { bg = cpt.fg_gutter }, -- used for highlighting "write" references
+		LspReferenceText = { bg = cp.fg_gutter }, -- used for highlighting "text" references
+		LspReferenceRead = { bg = cp.fg_gutter }, -- used for highlighting "read" references
+		LspReferenceWrite = { bg = cp.fg_gutter }, -- used for highlighting "write" references
 		-- hightlight diagnostics in numberline
-		DiagnosticError = { fg = cpt.error }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
-		DiagnosticWarn = { fg = cpt.warning }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
-		DiagnosticInfo = { fg = cpt.info }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
-		DiagnosticHint = { fg = cpt.hint }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
+		DiagnosticError = { fg = cp.error }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
+		DiagnosticWarn = { fg = cp.warning }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
+		DiagnosticInfo = { fg = cp.info }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
+		DiagnosticHint = { fg = cp.hint }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
 
-		LspDiagnosticsDefaultError = { fg = cpt.error }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
-		LspDiagnosticsDefaultWarning = { fg = cpt.warning }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
-		LspDiagnosticsDefaultInformation = { fg = cpt.info }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
-		LspDiagnosticsDefaultHint = { fg = cpt.hint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
-		LspSignatureActiveParameter = { fg = cpt.orange },
+		LspDiagnosticsDefaultError = { fg = cp.error }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
+		LspDiagnosticsDefaultWarning = { fg = cp.warning }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
+		LspDiagnosticsDefaultInformation = { fg = cp.info }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
+		LspDiagnosticsDefaultHint = { fg = cp.hint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
+		LspSignatureActiveParameter = { fg = cp.orange },
 		-- LspDiagnosticsFloatingError         = { }, -- Used to color "Error" diagnostic messages in diagnostics float
 		-- LspDiagnosticsFloatingWarning       = { }, -- Used to color "Warning" diagnostic messages in diagnostics float
 		-- LspDiagnosticsFloatingInformation   = { }, -- Used to color "Information" diagnostic messages in diagnostics float
 		-- LspDiagnosticsFloatingHint          = { }, -- Used to color "Hint" diagnostic messages in diagnostics float
 
-		LspDiagnosticsError = { fg = cpt.error },
-		LspDiagnosticsWarning = { fg = cpt.warning },
-		LspDiagnosticsInformation = { fg = cpt.info },
-		LspDiagnosticsHint = { fg = cpt.hint },
-		LspDiagnosticsVirtualTextError = { fg = cpt.error, style = virtual_text.errors }, -- Used for "Error" diagnostic virtual text
-		LspDiagnosticsVirtualTextWarning = { fg = cpt.warning, style = virtual_text.warnings }, -- Used for "Warning" diagnostic virtual text
-		LspDiagnosticsVirtualTextInformation = { fg = cpt.info, style = virtual_text.warnings }, -- Used for "Information" diagnostic virtual text
-		LspDiagnosticsVirtualTextHint = { fg = cpt.hint, style = virtual_text.hints }, -- Used for "Hint" diagnostic virtual text
-		LspDiagnosticsUnderlineError = { style = underlines.errors, sp = cpt.error }, -- Used to underline "Error" diagnostics
-		LspDiagnosticsUnderlineWarning = { style = underlines.warnings, sp = cpt.warning }, -- Used to underline "Warning" diagnostics
-		LspDiagnosticsUnderlineInformation = { style = underlines.information, sp = cpt.info }, -- Used to underline "Information" diagnostics
-		LspDiagnosticsUnderlineHint = { style = underlines.hints, sp = cpt.hint }, -- Used to underline "Hint" diagnostics
-		LspCodeLens = { fg = cpt.comment }, -- virtual text of the codelens
+		LspDiagnosticsError = { fg = cp.error },
+		LspDiagnosticsWarning = { fg = cp.warning },
+		LspDiagnosticsInformation = { fg = cp.info },
+		LspDiagnosticsHint = { fg = cp.hint },
+		LspDiagnosticsVirtualTextError = { fg = cp.error, style = virtual_text.errors }, -- Used for "Error" diagnostic virtual text
+		LspDiagnosticsVirtualTextWarning = { fg = cp.warning, style = virtual_text.warnings }, -- Used for "Warning" diagnostic virtual text
+		LspDiagnosticsVirtualTextInformation = { fg = cp.info, style = virtual_text.warnings }, -- Used for "Information" diagnostic virtual text
+		LspDiagnosticsVirtualTextHint = { fg = cp.hint, style = virtual_text.hints }, -- Used for "Hint" diagnostic virtual text
+		LspDiagnosticsUnderlineError = { style = underlines.errors, sp = cp.error }, -- Used to underline "Error" diagnostics
+		LspDiagnosticsUnderlineWarning = { style = underlines.warnings, sp = cp.warning }, -- Used to underline "Warning" diagnostics
+		LspDiagnosticsUnderlineInformation = { style = underlines.information, sp = cp.info }, -- Used to underline "Information" diagnostics
+		LspDiagnosticsUnderlineHint = { style = underlines.hints, sp = cp.hint }, -- Used to underline "Hint" diagnostics
+		LspCodeLens = { fg = cp.comment }, -- virtual text of the codelens
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/neogit.lua b/lua/catppuccino/core/integrations/neogit.lua
index aa465b1..2aa264e 100644
--- a/lua/catppuccino/core/integrations/neogit.lua
+++ b/lua/catppuccino/core/integrations/neogit.lua
@@ -1,15 +1,15 @@
 local M = {}
 local util = require("catppuccino.utils.util")
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		NeogitBranch = { fg = cpt.magenta },
-		NeogitRemote = { fg = cpt.pink },
-		NeogitHunkHeader = { bg = cpt.bg_highlight, fg = cpt.fg },
-		NeogitHunkHeaderHighlight = { bg = cpt.fg_gutter, fg = cpt.blue },
-		NeogitDiffContextHighlight = { bg = util.darken(cpt.fg_gutter, 0.5), fg = cpt.fg_alt },
-		NeogitDiffDeleteHighlight = { fg = cpt.diff.delete, bg = cpt.bg },
-		NeogitDiffAddHighlight = { fg = cpt.diff.add, bg = cpt.bg },
+		NeogitBranch = { fg = cp.magenta },
+		NeogitRemote = { fg = cp.pink },
+		NeogitHunkHeader = { bg = cp.bg_highlight, fg = cp.fg },
+		NeogitHunkHeaderHighlight = { bg = cp.fg_gutter, fg = cp.blue },
+		NeogitDiffContextHighlight = { bg = util.darken(cp.fg_gutter, 0.5), fg = cp.fg_alt },
+		NeogitDiffDeleteHighlight = { fg = cp.diff.delete, bg = cp.bg },
+		NeogitDiffAddHighlight = { fg = cp.diff.add, bg = cp.bg },
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/nvimtree.lua b/lua/catppuccino/core/integrations/nvimtree.lua
index 31935e1..b465849 100644
--- a/lua/catppuccino/core/integrations/nvimtree.lua
+++ b/lua/catppuccino/core/integrations/nvimtree.lua
@@ -1,31 +1,31 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	local config = require("catppuccino.config").options
 
-	local root_dir_color = cpt.bg_sidebar
+	local root_dir_color = cp.bg_sidebar
 
 	if config.integrations.nvimtree.show_root then
-		root_dir_color = cpt.blue
+		root_dir_color = cp.blue
 	end
 
 	return {
-		NvimTreeFolderName = { fg = cpt.blue },
-		NvimTreeFolderIcon = { fg = cpt.blue },
-		NvimTreeNormal = { fg = cpt.fg, bg = cpt.bg_sidebar },
-		NvimTreeOpenedFolderName = { fg = cpt.blue },
-		NvimTreeEmptyFolderName = { fg = cpt.blue_br },
-		NvimTreeIndentMarker = { fg = cpt.comment },
-		NvimTreeVertSplit = { fg = cpt.black, bg = cpt.black },
+		NvimTreeFolderName = { fg = cp.blue },
+		NvimTreeFolderIcon = { fg = cp.blue },
+		NvimTreeNormal = { fg = cp.fg, bg = cp.bg_sidebar },
+		NvimTreeOpenedFolderName = { fg = cp.blue },
+		NvimTreeEmptyFolderName = { fg = cp.blue_br },
+		NvimTreeIndentMarker = { fg = cp.comment },
+		NvimTreeVertSplit = { fg = cp.black, bg = cp.black },
 		NvimTreeRootFolder = { fg = root_dir_color, style = "bold" },
-		NvimTreeSymlink = { fg = cpt.magenta },
-		NvimTreeStatuslineNc = { fg = cpt.black, bg = cpt.black },
-		NvimTreeGitDirty = { fg = cpt.diff.change },
-		NvimTreeGitNew = { fg = cpt.diff.add },
-		NvimTreeGitDeleted = { fg = cpt.diff.delete },
-		NvimTreeSpecialFile = { fg = cpt.cyan },
-		NvimTreeImageFile = { fg = cpt.fg_sidebar },
-		NvimTreeOpenedFile = { fg = cpt.magenta },
+		NvimTreeSymlink = { fg = cp.magenta },
+		NvimTreeStatuslineNc = { fg = cp.black, bg = cp.black },
+		NvimTreeGitDirty = { fg = cp.diff.change },
+		NvimTreeGitNew = { fg = cp.diff.add },
+		NvimTreeGitDeleted = { fg = cp.diff.delete },
+		NvimTreeSpecialFile = { fg = cp.cyan },
+		NvimTreeImageFile = { fg = cp.fg_sidebar },
+		NvimTreeOpenedFile = { fg = cp.magenta },
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/telescope.lua b/lua/catppuccino/core/integrations/telescope.lua
index 010b526..18c1589 100644
--- a/lua/catppuccino/core/integrations/telescope.lua
+++ b/lua/catppuccino/core/integrations/telescope.lua
@@ -1,11 +1,11 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		TelescopeBorder = { fg = cpt.border_highlight },
-		TelescopeSelectionCaret = { fg = cpt.cyan },
-		TelescopeSelection = { fg = cpt.cyan, bg = cpt.bg_highlight },
-		TelescopeMatching = { fg = cpt.blue },
+		TelescopeBorder = { fg = cp.border_highlight },
+		TelescopeSelectionCaret = { fg = cp.cyan },
+		TelescopeSelection = { fg = cp.cyan, bg = cp.bg_highlight },
+		TelescopeMatching = { fg = cp.blue },
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/treesitter.lua b/lua/catppuccino/core/integrations/treesitter.lua
index 15df494..60c8419 100644
--- a/lua/catppuccino/core/integrations/treesitter.lua
+++ b/lua/catppuccino/core/integrations/treesitter.lua
@@ -1,7 +1,7 @@
 local util = require("catppuccino.utils.util")
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
 		-- These groups are for the neovim tree-sitter highlights.
 		-- As of writing, tree-sitter support is a WIP, group names may change.
@@ -11,60 +11,60 @@ function M.get(cpt)
 
 		-- 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 = cpt.orange_br, style = cnf.styles.keywords }, -- For booleans.
+		TSBoolean = { fg = cp.orange_br, style = cnf.styles.keywords }, -- For booleans.
 		-- TSCharacter         = { };    -- For characters.
 		-- TSComment           = { };    -- For comment blocks.
-		TSNote = { fg = cpt.bg, bg = cpt.info },
-		TSWarning = { fg = cpt.bg, bg = cpt.warning },
-		TSDanger = { fg = cpt.bg, bg = cpt.error },
-		TSConstructor = { fg = cpt.magenta }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
-		TSConditional = { fg = cpt.red, style = cnf.styles.keywords }, -- For keywords related to conditionnals.
-		TSConstant = { fg = cpt.orange }, -- For constants
-		TSConstBuiltin = { fg = cpt.orange_br, 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 cpt.
+		TSNote = { fg = cp.bg, bg = cp.info },
+		TSWarning = { fg = cp.bg, bg = cp.warning },
+		TSDanger = { fg = cp.bg, bg = cp.error },
+		TSConstructor = { fg = cp.magenta }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
+		TSConditional = { fg = cp.red, style = cnf.styles.keywords }, -- For keywords related to conditionnals.
+		TSConstant = { fg = cp.orange }, -- For constants
+		TSConstBuiltin = { fg = cp.orange_br, 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 = cpt.magenta_br, style = cnf.styles.keywords }, -- For exception related keywords.
-		TSField = { fg = cpt.red }, -- For fields.
-		rustTSField = { fg = util.darken(cpt.white, 0.75) }, -- For fields.
+		TSException = { fg = cp.magenta_br, style = cnf.styles.keywords }, -- For exception related keywords.
+		TSField = { fg = cp.red }, -- For fields.
+		rustTSField = { fg = util.darken(cp.white, 0.75) }, -- For fields.
 		-- TSFloat             = { };    -- For floats.
-		TSFunction = { fg = cpt.blue, style = cnf.styles.functions }, -- For function (calls and definitions).
-		TSFuncBuiltin = { fg = cpt.cyan }, -- For builtin functions: `table.insert` in Lua.
-		TSFuncMacro = { fg = cpt.red }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscpt.
-		TSInclude = { fg = cpt.magenta, style = cnf.styles.keywords }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua.
-		TSKeyword = { fg = cpt.magenta, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories.
-		TSKeywordFunction = { fg = cpt.magenta_br, style = cnf.styles.keywords }, -- For keywords used to define a fuction.
-		TSKeywordOperator = { fg = cpt.cyan, style = cnf.styles.keywords }, -- For `new` keyword operator
-		TSLabel = { fg = cpt.blue }, -- For labels: `label:` in C and `:label:` in Lua.
+		TSFunction = { fg = cp.blue, style = cnf.styles.functions }, -- For function (calls and definitions).
+		TSFuncBuiltin = { fg = cp.cyan }, -- For builtin functions: `table.insert` in Lua.
+		TSFuncMacro = { fg = cp.red }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscp.
+		TSInclude = { fg = cp.magenta, style = cnf.styles.keywords }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua.
+		TSKeyword = { fg = cp.magenta, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories.
+		TSKeywordFunction = { fg = cp.magenta_br, style = cnf.styles.keywords }, -- For keywords used to define a fuction.
+		TSKeywordOperator = { fg = cp.cyan, style = cnf.styles.keywords }, -- For `new` keyword operator
+		TSLabel = { fg = cp.blue }, -- For labels: `label:` in C and `:label:` in Lua.
 		-- TSMethod            = { };    -- For method calls and definitions.
-		TSNamespace = { fg = cpt.cyan }, -- For identifiers referring to modules and namespaces.
+		TSNamespace = { fg = cp.cyan }, -- For identifiers referring to modules and namespaces.
 		-- TSNone              = { };    -- TODO: docs
 		-- TSNumber            = { };    -- For all numbers
-		TSOperator = { fg = cpt.cyan }, -- For any operator: `+`, but also `->` and `*` in cpt.
-		TSParameter = { fg = cpt.orange_br }, -- For parameters of a function.
+		TSOperator = { fg = cp.cyan }, -- For any operator: `+`, but also `->` and `*` in cp.
+		TSParameter = { fg = cp.orange_br }, -- For parameters of a function.
 		-- TSParameterReference= { };    -- For references to parameters of a function.
-		TSProperty = { fg = cpt.red_br }, -- Same as `TSField`.
-		tomlTSProperty = { fg = cpt.blue }, -- Differentiates between string and properties
-		TSPunctDelimiter = { fg = cpt.green_br }, -- For delimiters ie: `.`
-		TSPunctBracket = { fg = cpt.red }, -- For brackets and parenthesis.
-		TSPunctSpecial = { fg = cpt.white }, -- For special punctutation that does not fall in the catagories before.
-		TSRepeat = { fg = cpt.red, style = cnf.styles.keywords }, -- For keywords related to loops.
+		TSProperty = { fg = cp.red_br }, -- Same as `TSField`.
+		tomlTSProperty = { fg = cp.blue }, -- Differentiates between string and properties
+		TSPunctDelimiter = { fg = cp.green_br }, -- For delimiters ie: `.`
+		TSPunctBracket = { fg = cp.red }, -- For brackets and parenthesis.
+		TSPunctSpecial = { fg = cp.white }, -- For special punctutation that does not fall in the catagories before.
+		TSRepeat = { fg = cp.red, style = cnf.styles.keywords }, -- For keywords related to loops.
 		-- TSString            = { };    -- For strings.
-		TSStringRegex = { fg = cpt.blue, style = cnf.styles.strings }, -- For regexes.
-		TSStringEscape = { fg = cpt.magenta, style = cnf.styles.strings }, -- For escape characters within a string.
+		TSStringRegex = { fg = cp.blue, style = cnf.styles.strings }, -- For regexes.
+		TSStringEscape = { fg = cp.magenta, style = cnf.styles.strings }, -- For escape characters within a string.
 		-- TSSymbol            = { };    -- For identifiers referring to symbols or atoms.
 		-- TSType              = { };    -- For types.
-		TSTypeBuiltin = { fg = cpt.cyan, style = cnf.styles.keywords }, -- For builtin types.
-		TSVariable = { style = cnf.styles.variables }, -- Any variable name that does not have another highlighcpt.
-		TSVariableBuiltin = { fg = cpt.red, style = cnf.styles.keywords }, -- Variable names that are defined by the languages, like `this` or `self`.
+		TSTypeBuiltin = { fg = cp.cyan, style = cnf.styles.keywords }, -- For builtin types.
+		TSVariable = { style = cnf.styles.variables }, -- Any variable name that does not have another highlighcp.
+		TSVariableBuiltin = { fg = cp.red, 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 considered text in a markup language.
-		TSTextReference = { fg = cpt.cyan },
+		TSTextReference = { fg = cp.cyan },
 		-- TSEmphasis          = { };    -- For text to be represented with emphasis.
 		-- TSUnderline         = { };    -- For text to be represented with an underline.
-		-- TSStrike            = { };    -- For strikethrough texcpt.
+		-- TSStrike            = { };    -- For strikethrough texcp.
 		-- TSTitle             = { };    -- Text that is part of a title.
-		-- TSLiteral           = { };    -- Literal texcpt.
+		-- TSLiteral           = { };    -- Literal texcp.
 		-- TSURI               = { };    -- Any URI like a link or email.
 	}
 end
diff --git a/lua/catppuccino/core/integrations/ts_rainbow.lua b/lua/catppuccino/core/integrations/ts_rainbow.lua
index fd75678..6973cda 100644
--- a/lua/catppuccino/core/integrations/ts_rainbow.lua
+++ b/lua/catppuccino/core/integrations/ts_rainbow.lua
@@ -1,14 +1,14 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		rainbowcol1 = {bg = cpt.bg, fg = cpt.red},
-		rainbowcol2 = {bg = cpt.bg, fg = cpt.green},
-		rainbowcol3 = {bg = cpt.bg, fg = cpt.yellow},
-		rainbowcol4 = {bg = cpt.bg, fg = cpt.blue},
-		rainbowcol5 = {bg = cpt.bg, fg = cpt.magenta},
-		rainbowcol6 = {bg = cpt.bg, fg = cpt.cyan},
-		rainbowcol7 = {bg = cpt.bg, fg = cpt.white},
+		rainbowcol1 = {bg = cp.bg, fg = cp.red},
+		rainbowcol2 = {bg = cp.bg, fg = cp.green},
+		rainbowcol3 = {bg = cp.bg, fg = cp.yellow},
+		rainbowcol4 = {bg = cp.bg, fg = cp.blue},
+		rainbowcol5 = {bg = cp.bg, fg = cp.magenta},
+		rainbowcol6 = {bg = cp.bg, fg = cp.cyan},
+		rainbowcol7 = {bg = cp.bg, fg = cp.white},
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/vim_sneak.lua b/lua/catppuccino/core/integrations/vim_sneak.lua
index 457ff5e..2c7e0fd 100644
--- a/lua/catppuccino/core/integrations/vim_sneak.lua
+++ b/lua/catppuccino/core/integrations/vim_sneak.lua
@@ -1,9 +1,9 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		Sneak = { fg = cpt.bg_highlight, bg = cpt.magenta },
-		SneakScope = { bg = cpt.bg_visual },
+		Sneak = { fg = cp.bg_highlight, bg = cp.magenta },
+		SneakScope = { bg = cp.bg_visual },
 	}
 end
 
diff --git a/lua/catppuccino/core/integrations/which_key.lua b/lua/catppuccino/core/integrations/which_key.lua
index acbe7d2..37dde47 100644
--- a/lua/catppuccino/core/integrations/which_key.lua
+++ b/lua/catppuccino/core/integrations/which_key.lua
@@ -1,14 +1,14 @@
 local M = {}
 
-function M.get(cpt)
+function M.get(cp)
 	return {
-		WhichKey = { fg = cpt.cyan },
-		WhichKeyGroup = { fg = cpt.blue },
-		WhichKeyDesc = { fg = cpt.magenta },
-		WhichKeySeperator = { fg = cpt.comment },
-		WhichKeySeparator = { fg = cpt.comment },
-		WhichKeyFloat = { bg = cpt.bg_sidebar },
-		WhichKeyValue = { fg = cpt.comment },
+		WhichKey = { fg = cp.cyan },
+		WhichKeyGroup = { fg = cp.blue },
+		WhichKeyDesc = { fg = cp.magenta },
+		WhichKeySeperator = { fg = cp.comment },
+		WhichKeySeparator = { fg = cp.comment },
+		WhichKeyFloat = { bg = cp.bg_sidebar },
+		WhichKeyValue = { fg = cp.comment },
 	}
 end