diff --git a/lua/catppuccino/core/integrations/barbar.lua b/lua/catppuccino/core/integrations/barbar.lua
index 8ead618..200af47 100644
--- a/lua/catppuccino/core/integrations/barbar.lua
+++ b/lua/catppuccino/core/integrations/barbar.lua
@@ -3,25 +3,25 @@ local util = require("catppuccino.utils.util")
 local M = {}
 
 function M.get(cpt)
-    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}
-    }
+	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 },
+	}
 end
 
 return M
diff --git a/lua/catppuccino/core/integrations/bufferline.lua b/lua/catppuccino/core/integrations/bufferline.lua
index fd3b6c5..03d52e6 100644
--- a/lua/catppuccino/core/integrations/bufferline.lua
+++ b/lua/catppuccino/core/integrations/bufferline.lua
@@ -3,24 +3,24 @@ local util = require("catppuccino.utils.util")
 local M = {}
 
 function M.get(cpt)
-    return {
-        BufferLineFill = {bg = util.brighten(cpt.bg, 0.04)},
-        BufferLineBackground = {fg = cpt.gray, bg = cpt.black},
-        BufferLineBufferVisible = {fg = cpt.gray, bg = cpt.black},
-        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 = cpt.black},
-        BufferLineIndicatorSelected = {fg = cpt.bg, bg = cpt.bg},
-        -- separators
-        BufferLineSeparator = {fg = cpt.black, bg = cpt.black},
-        BufferLineSeparatorVisible = {fg = cpt.black, bg = cpt.black},
-        BufferLineSeparatorSelected = {fg = cpt.black, bg = cpt.black},
-        -- close buttons
-        BufferLineCloseButton = {fg = cpt.gray, bg = cpt.black},
-        BufferLineCloseButtonVisible = {fg = cpt.gray, bg = cpt.black},
-        BufferLineCloseButtonSelected = {fg = cpt.red, bg = cpt.bg}
-    }
+	return {
+		BufferLineFill = { bg = util.brighten(cpt.bg, 0.04) },
+		BufferLineBackground = { fg = cpt.gray, bg = cpt.black },
+		BufferLineBufferVisible = { fg = cpt.gray, bg = cpt.black },
+		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 = cpt.black },
+		BufferLineIndicatorSelected = { fg = cpt.bg, bg = cpt.bg },
+		-- separators
+		BufferLineSeparator = { fg = cpt.black, bg = cpt.black },
+		BufferLineSeparatorVisible = { fg = cpt.black, bg = cpt.black },
+		BufferLineSeparatorSelected = { fg = cpt.black, bg = cpt.black },
+		-- close buttons
+		BufferLineCloseButton = { fg = cpt.gray, bg = cpt.black },
+		BufferLineCloseButtonVisible = { fg = cpt.gray, bg = cpt.black },
+		BufferLineCloseButtonSelected = { fg = cpt.red, bg = cpt.bg },
+	}
 end
 
 return M
diff --git a/lua/catppuccino/core/integrations/dashboard.lua b/lua/catppuccino/core/integrations/dashboard.lua
index f108d1a..097264c 100644
--- a/lua/catppuccino/core/integrations/dashboard.lua
+++ b/lua/catppuccino/core/integrations/dashboard.lua
@@ -1,12 +1,12 @@
 local M = {}
 
 function M.get(cpt)
-    return {
-        DashboardShortCut = {fg = cpt.cyan},
-        DashboardHeader = {fg = cpt.yellow},
-        DashboardCenter = {fg = cpt.green},
-        DashboardFooter = {fg = cpt.orange, style = "italic"}
-    }
+	return {
+		DashboardShortCut = { fg = cpt.cyan },
+		DashboardHeader = { fg = cpt.yellow },
+		DashboardCenter = { fg = cpt.green },
+		DashboardFooter = { fg = cpt.orange, style = "italic" },
+	}
 end
 
 return M
diff --git a/lua/catppuccino/core/integrations/fern.lua b/lua/catppuccino/core/integrations/fern.lua
index d68ad05..f0a5a6b 100644
--- a/lua/catppuccino/core/integrations/fern.lua
+++ b/lua/catppuccino/core/integrations/fern.lua
@@ -1,9 +1,9 @@
 local M = {}
 
 function M.get(cpt)
-    return {
-        FernBranchText = {fg = cpt.blue}
-    }
+	return {
+		FernBranchText = { fg = cpt.blue },
+	}
 end
 
 return M
diff --git a/lua/catppuccino/core/integrations/gitgutter.lua b/lua/catppuccino/core/integrations/gitgutter.lua
index be39b86..fed2940 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)
-    return {
-        GitGutterAdd = {fg = cpt.gitSigns.add}, -- diff mode: Added line |diff.txt|
-        GitGutterChange = {fg = cpt.gitSigns.change}, -- diff mode: Changed line |diff.txt|
-        GitGutterDelete = {fg = cpt.gitSigns.delete} -- diff mode: Deleted line |diff.txt|
-    }
+	return {
+		GitGutterAdd = { fg = cpt.gitSigns.add }, -- diff mode: Added line |diff.txt|
+		GitGutterChange = { fg = cpt.gitSigns.change }, -- diff mode: Changed line |diff.txt|
+		GitGutterDelete = { fg = cpt.gitSigns.delete }, -- diff mode: Deleted line |diff.txt|
+	}
 end
 return M
diff --git a/lua/catppuccino/core/integrations/gitsigns.lua b/lua/catppuccino/core/integrations/gitsigns.lua
index 2d7bd11..929a825 100644
--- a/lua/catppuccino/core/integrations/gitsigns.lua
+++ b/lua/catppuccino/core/integrations/gitsigns.lua
@@ -1,11 +1,11 @@
 local M = {}
 
 function M.get(cpt)
-    return {
-        GitSignsAdd = {fg = cpt.diff.add, bg = cpt.bg}, -- diff mode: Added line |diff.txt|
-        GitSignsChange = {fg = cpt.diff.change, bg = cpt.bg}, -- diff mode: Changed line |diff.txt|
-        GitSignsDelete = {fg = cpt.diff.delete, bg = cpt.bg} -- diff mode: Deleted line |diff.txt|
-    }
+	return {
+		GitSignsAdd = { fg = cpt.diff.add, bg = cpt.bg }, -- diff mode: Added line |diff.txt|
+		GitSignsChange = { fg = cpt.diff.change, bg = cpt.bg }, -- diff mode: Changed line |diff.txt|
+		GitSignsDelete = { fg = cpt.diff.delete, bg = cpt.bg }, -- diff mode: Deleted line |diff.txt|
+	}
 end
 
 return M
diff --git a/lua/catppuccino/core/integrations/indent_blankline.lua b/lua/catppuccino/core/integrations/indent_blankline.lua
index 152db8d..6032d76 100644
--- a/lua/catppuccino/core/integrations/indent_blankline.lua
+++ b/lua/catppuccino/core/integrations/indent_blankline.lua
@@ -1,9 +1,9 @@
 local M = {}
 
 function M.get(cpt)
-    return {
-        IndentBlanklineChar = {fg = cpt.gray}
-    }
+	return {
+		IndentBlanklineChar = { fg = cpt.gray },
+	}
 end
 
 return M
diff --git a/lua/catppuccino/core/integrations/lsp_saga.lua b/lua/catppuccino/core/integrations/lsp_saga.lua
index 6c17953..3a65bee 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)
-    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}
-    }
+	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 },
+	}
 end
 return M
diff --git a/lua/catppuccino/core/integrations/lsp_trouble.lua b/lua/catppuccino/core/integrations/lsp_trouble.lua
index 8713d23..59d2860 100644
--- a/lua/catppuccino/core/integrations/lsp_trouble.lua
+++ b/lua/catppuccino/core/integrations/lsp_trouble.lua
@@ -1,11 +1,11 @@
 local M = {}
 
 function M.get(cpt)
-    return {
-        LspTroubleText = {fg = cpt.fg_alt},
-        LspTroubleCount = {fg = cpt.magenta, bg = cpt.fg_gutter},
-        LspTroubleNormal = {fg = cpt.fg_sidebar, bg = cpt.bg_sidebar}
-    }
+	return {
+		LspTroubleText = { fg = cpt.fg_alt },
+		LspTroubleCount = { fg = cpt.magenta, bg = cpt.fg_gutter },
+		LspTroubleNormal = { fg = cpt.fg_sidebar, bg = cpt.bg_sidebar },
+	}
 end
 
 return M
diff --git a/lua/catppuccino/core/integrations/markdown.lua b/lua/catppuccino/core/integrations/markdown.lua
index e4dcf75..0aee43b 100644
--- a/lua/catppuccino/core/integrations/markdown.lua
+++ b/lua/catppuccino/core/integrations/markdown.lua
@@ -1,14 +1,14 @@
 local M = {}
 
 function M.get(cpt)
-    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"}
-    }
+	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" },
+	}
 end
 
 return M
diff --git a/lua/catppuccino/core/integrations/native_lsp.lua b/lua/catppuccino/core/integrations/native_lsp.lua
index 29f60f4..a042fd0 100644
--- a/lua/catppuccino/core/integrations/native_lsp.lua
+++ b/lua/catppuccino/core/integrations/native_lsp.lua
@@ -1,38 +1,38 @@
 local M = {}
 
 function M.get(cpt)
-    return {
-        -- These groups are for the native LSP cliencpt. 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
-        -- hightlight diagnostics in numberline
-        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},
-        -- 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
+	return {
+		-- These groups are for the native LSP cliencpt. 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
+		-- hightlight diagnostics in numberline
+		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 },
+		-- 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 = cpc.integrations.native_lsp.styles.errors}, -- Used for "Error" diagnostic virtual text
-        LspDiagnosticsVirtualTextWarning = {fg = cpt.warning, style = cpc.integrations.native_lsp.styles.warnings}, -- Used for "Warning" diagnostic virtual text
-        LspDiagnosticsVirtualTextInformation = {fg = cpt.info, style = cpc.integrations.native_lsp.styles.information}, -- Used for "Information" diagnostic virtual text
-        LspDiagnosticsVirtualTextHint = {fg = cpt.hint, style = cpc.integrations.native_lsp.styles.hints}, -- Used for "Hint" diagnostic virtual text
-        LspDiagnosticsUnderlineError = {style = "underline", sp = cpt.error}, -- Used to underline "Error" diagnostics
-        LspDiagnosticsUnderlineWarning = {style = "underline", sp = cpt.warning}, -- Used to underline "Warning" diagnostics
-        LspDiagnosticsUnderlineInformation = {style = "underline", sp = cpt.info}, -- Used to underline "Information" diagnostics
-        LspDiagnosticsUnderlineHint = {style = "underline", sp = cpt.hint}, -- Used to underline "Hint" diagnostics
-        LspCodeLens = {fg = cpt.comment} -- virtual text of the codelens
-    }
+		LspDiagnosticsError = { fg = cpt.error },
+		LspDiagnosticsWarning = { fg = cpt.warning },
+		LspDiagnosticsInformation = { fg = cpt.info },
+		LspDiagnosticsHint = { fg = cpt.hint },
+		LspDiagnosticsVirtualTextError = { fg = cpt.error, style = cpc.integrations.native_lsp.styles.errors }, -- Used for "Error" diagnostic virtual text
+		LspDiagnosticsVirtualTextWarning = { fg = cpt.warning, style = cpc.integrations.native_lsp.styles.warnings }, -- Used for "Warning" diagnostic virtual text
+		LspDiagnosticsVirtualTextInformation = { fg = cpt.info, style = cpc.integrations.native_lsp.styles.information }, -- Used for "Information" diagnostic virtual text
+		LspDiagnosticsVirtualTextHint = { fg = cpt.hint, style = cpc.integrations.native_lsp.styles.hints }, -- Used for "Hint" diagnostic virtual text
+		LspDiagnosticsUnderlineError = { style = "underline", sp = cpt.error }, -- Used to underline "Error" diagnostics
+		LspDiagnosticsUnderlineWarning = { style = "underline", sp = cpt.warning }, -- Used to underline "Warning" diagnostics
+		LspDiagnosticsUnderlineInformation = { style = "underline", sp = cpt.info }, -- Used to underline "Information" diagnostics
+		LspDiagnosticsUnderlineHint = { style = "underline", sp = cpt.hint }, -- Used to underline "Hint" diagnostics
+		LspCodeLens = { fg = cpt.comment }, -- virtual text of the codelens
+	}
 end
 
 return M
diff --git a/lua/catppuccino/core/integrations/neogit.lua b/lua/catppuccino/core/integrations/neogit.lua
index 5aff07e..9b2913c 100644
--- a/lua/catppuccino/core/integrations/neogit.lua
+++ b/lua/catppuccino/core/integrations/neogit.lua
@@ -2,15 +2,15 @@ local util = require("catppuccino.utils.util")
 local M = {}
 
 function M.get(cpt)
-    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.git.delete, bg = cpt.diff.delete},
-        NeogitDiffAddHighlight = {fg = cpt.git.add, bg = cpt.diff.add}
-    }
+	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.git.delete, bg = cpt.diff.delete },
+		NeogitDiffAddHighlight = { fg = cpt.git.add, bg = cpt.diff.add },
+	}
 end
 
 return M
diff --git a/lua/catppuccino/core/integrations/nvimtree.lua b/lua/catppuccino/core/integrations/nvimtree.lua
index 48e59f7..dd0610c 100644
--- a/lua/catppuccino/core/integrations/nvimtree.lua
+++ b/lua/catppuccino/core/integrations/nvimtree.lua
@@ -1,32 +1,32 @@
 local M = {}
 
 function M.get(cpt)
-    local config = require("catppuccino.config").options
+	local config = require("catppuccino.config").options
 
-    local root_dir_color = cpt.bg_sidebar
+	local root_dir_color = cpt.bg_sidebar
 
-    if (config.integrations.nvimtree.show_root) then
-        root_dir_color = cpt.blue
-    end
+	if config.integrations.nvimtree.show_root then
+		root_dir_color = cpt.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},
-        NvimTreeRootFolder = {fg = root_dir_color, style = "bold"},
-        NvimTreeSymlink = {fg = cpt.magenta},
-        NvimTreeStatuslineNc = {fg = cpt.black, bg = cpt.black},
-        NvimTreeGitDirty = {fg = cpt.git.change},
-        NvimTreeGitNew = {fg = cpt.git.add},
-        NvimTreeGitDeleted = {fg = cpt.git.delete},
-        NvimTreeSpecialFile = {fg = cpt.cyan},
-        NvimTreeImageFile = {fg = cpt.fg_sidebar},
-        NvimTreeOpenedFile = {fg = cpt.magenta}
-    }
+	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 },
+		NvimTreeRootFolder = { fg = root_dir_color, style = "bold" },
+		NvimTreeSymlink = { fg = cpt.magenta },
+		NvimTreeStatuslineNc = { fg = cpt.black, bg = cpt.black },
+		NvimTreeGitDirty = { fg = cpt.git.change },
+		NvimTreeGitNew = { fg = cpt.git.add },
+		NvimTreeGitDeleted = { fg = cpt.git.delete },
+		NvimTreeSpecialFile = { fg = cpt.cyan },
+		NvimTreeImageFile = { fg = cpt.fg_sidebar },
+		NvimTreeOpenedFile = { fg = cpt.magenta },
+	}
 end
 
 return M
diff --git a/lua/catppuccino/core/integrations/telescope.lua b/lua/catppuccino/core/integrations/telescope.lua
index 18dad73..010b526 100644
--- a/lua/catppuccino/core/integrations/telescope.lua
+++ b/lua/catppuccino/core/integrations/telescope.lua
@@ -1,12 +1,12 @@
 local M = {}
 
 function M.get(cpt)
-    return {
-        TelescopeBorder = {fg = cpt.border_highlight},
-        TelescopeSelectionCaret = {fg = cpt.cyan},
-        TelescopeSelection = {fg = cpt.cyan, bg = cpt.bg_highlight},
-        TelescopeMatching = {fg = cpt.blue}
-    }
+	return {
+		TelescopeBorder = { fg = cpt.border_highlight },
+		TelescopeSelectionCaret = { fg = cpt.cyan },
+		TelescopeSelection = { fg = cpt.cyan, bg = cpt.bg_highlight },
+		TelescopeMatching = { fg = cpt.blue },
+	}
 end
 
 return M
diff --git a/lua/catppuccino/core/integrations/treesitter.lua b/lua/catppuccino/core/integrations/treesitter.lua
index 995b30d..83ffbd9 100644
--- a/lua/catppuccino/core/integrations/treesitter.lua
+++ b/lua/catppuccino/core/integrations/treesitter.lua
@@ -14,51 +14,51 @@ function M.get(cpt)
 		-- TSBoolean           = { };    -- 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.
+		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       = { };    -- For keywords related to conditionnals.
-		TSConstant = {fg = cpt.orange}, -- For constants
-		TSConstBuiltin = {fg = cpt.orange_br}, -- For constant that are built in the language: `nil` in Lua.
+		TSConstant = { fg = cpt.orange }, -- For constants
+		TSConstBuiltin = { fg = cpt.orange_br }, -- For constant that are built in the language: `nil` in Lua.
 		-- TSConstMacro        = { };    -- For constants that are defined by macros: `NULL` in cpt.
 		-- TSError             = { };    -- For syntax/parser errors.
 		-- TSException         = { };    -- For exception related keywords.
-		TSField = {fg = cpt.red}, -- For fields.
-		rustTSField = {fg = util.darken(cpt.white, 0.75)}, -- For fields.
+		TSField = { fg = cpt.red }, -- For fields.
+		rustTSField = { fg = util.darken(cpt.white, 0.75) }, -- For fields.
 		-- TSFloat             = { };    -- For floats.
 		-- TSFunction = { fg = cpt.fg_gutter }, -- 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.
+		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           = { };    -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua.
-		TSKeyword = {fg = cpt.magenta, style = cpc.styles.keywords}, -- For keywords that don't fall in previous categories.
-		TSKeywordFunction = {fg = cpt.magenta, style = cpc.styles.functions}, -- For keywords used to define a fuction.
-		TSLabel = {fg = cpt.blue}, -- For labels: `label:` in C and `:label:` in Lua.
+		TSKeyword = { fg = cpt.magenta, style = cpc.styles.keywords }, -- For keywords that don't fall in previous categories.
+		TSKeywordFunction = { fg = cpt.magenta, style = cpc.styles.functions }, -- For keywords used to define a fuction.
+		TSLabel = { fg = cpt.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 = cpt.cyan }, -- For identifiers referring to modules and namespaces.
 		-- TSNone              = { };    -- TODO: docs
 		-- TSNumber            = { };    -- For all numbers
-		TSOperator = {fg = cpt.fg}, -- For any operator: `+`, but also `->` and `*` in cpt.
-		TSParameter = {fg = cpt.orange_br}, -- For parameters of a function.
+		TSOperator = { fg = cpt.fg }, -- For any operator: `+`, but also `->` and `*` in cpt.
+		TSParameter = { fg = cpt.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 = util.string_to_color(cpt, "", cpt.fg_alt)}, -- 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.
+		TSProperty = { fg = cpt.red_br }, -- Same as `TSField`.
+		tomlTSProperty = { fg = cpt.blue }, -- Differentiates between string and properties
+		TSPunctDelimiter = { fg = util.string_to_color(cpt, "", cpt.fg_alt) }, -- 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            = { };    -- For keywords related to loops.
 		-- TSString            = { };    -- For strings.
-		TSStringRegex = {fg = cpt.blue, style = cpc.styles.strings}, -- For regexes.
-		TSStringEscape = {fg = cpt.magenta, style = cpc.styles.strings}, -- For escape characters within a string.
+		TSStringRegex = { fg = cpt.blue, style = cpc.styles.strings }, -- For regexes.
+		TSStringEscape = { fg = cpt.magenta, style = cpc.styles.strings }, -- For escape characters within a string.
 		-- TSSymbol            = { };    -- For identifiers referring to symbols or atoms.
 		-- TSType              = { };    -- For types.
-		TSTypeBuiltin = {fg = cpt.cyan}, -- For builtin types.
-		TSVariable = {style = cpc.styles.variables}, -- Any variable name that does not have another highlighcpt.
-		TSVariableBuiltin = {fg = cpt.red}, -- Variable names that are defined by the languages, like `this` or `self`.
+		TSTypeBuiltin = { fg = cpt.cyan }, -- For builtin types.
+		TSVariable = { style = cpc.styles.variables }, -- Any variable name that does not have another highlighcpt.
+		TSVariableBuiltin = { fg = cpt.red }, -- 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 = cpt.cyan },
 		-- TSEmphasis          = { };    -- For text to be represented with emphasis.
 		-- TSUnderline         = { };    -- For text to be represented with an underline.
 		-- TSStrike            = { };    -- For strikethrough texcpt.
@@ -69,4 +69,3 @@ function M.get(cpt)
 end
 
 return M
-
diff --git a/lua/catppuccino/core/integrations/vim_sneak.lua b/lua/catppuccino/core/integrations/vim_sneak.lua
index 4763955..457ff5e 100644
--- a/lua/catppuccino/core/integrations/vim_sneak.lua
+++ b/lua/catppuccino/core/integrations/vim_sneak.lua
@@ -1,10 +1,10 @@
 local M = {}
 
 function M.get(cpt)
-    return {
-        Sneak = {fg = cpt.bg_highlight, bg = cpt.magenta},
-        SneakScope = {bg = cpt.bg_visual}
-    }
+	return {
+		Sneak = { fg = cpt.bg_highlight, bg = cpt.magenta },
+		SneakScope = { bg = cpt.bg_visual },
+	}
 end
 
 return M
diff --git a/lua/catppuccino/core/integrations/which_key.lua b/lua/catppuccino/core/integrations/which_key.lua
index 36f8484..acbe7d2 100644
--- a/lua/catppuccino/core/integrations/which_key.lua
+++ b/lua/catppuccino/core/integrations/which_key.lua
@@ -1,15 +1,15 @@
 local M = {}
 
 function M.get(cpt)
-    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}
-    }
+	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 },
+	}
 end
 
 return M