diff --git a/lua/colors/integrations/cmp.lua b/lua/colors/integrations/cmp.lua
index 1adcd70..ac274a6 100644
--- a/lua/colors/integrations/cmp.lua
+++ b/lua/colors/integrations/cmp.lua
@@ -1,45 +1,27 @@
 local theme = require("colors.kdark").colors
 
-local black = theme.black
-local red = theme.red
-local green = theme.green
-local yellow = theme.yellow
-local blue = theme.blue
-local magenta = theme.magenta
-local cyan = theme.cyan
-local white = theme.white
-local bright_black = theme.bright_black
-local bright_red = theme.bright_red
-local bright_green = theme.bright_green
-local bright_yellow = theme.bright_yellow
-local bright_blue = theme.bright_blue
-local bright_magenta = theme.bright_magenta
-local bright_cyan = theme.bright_cyan
-local bright_white = theme.bright_white
-
-
 return {
-   CmpItemKindConstant = { fg = bright_red },
-   CmpItemKindFunction = { fg = bright_magenta },
-   CmpItemKindIdentifier = { fg = bright_black },
-   CmpItemKindField = { fg = bright_black },
-   CmpItemKindVariable = { fg = bright_cyan },
-   Special = { fg = bright_blue },
-   CmpItemKindSnippet = { fg = red },
-   CmpItemKindText = { fg = bright_yellow },
-   CmpItemKindStructure = { fg = bright_cyan },
-   CmpItemKindType = { fg = bright_green },
-   CmpItemKindKeyword = { fg = white },
-   CmpItemKindMethod = { fg = bright_magenta },
-   CmpItemKindConstructor = { fg = blue },
-   CmpItemKindFolder = { fg = white },
-   CmpItemKindModule = { fg = bright_green },
-   CmpItemKindProperty = { fg = bright_black },
-   CmpItemKindUnit = { fg = bright_cyan },
-   CmpItemKindFile = { fg = white },
-   CmpItemKindColor = { fg = red },
-   CmpItemKindReference = { fg = magenta },
-   CmpItemKindStruct = { fg = bright_cyan },
-   CmpItemKindOperator = { fg = magenta },
-   CmpItemKindTypeParameter = { fg = bright_black },
+    CmpItemKindConstant = { fg = theme.bright_red },
+    CmpItemKindFunction = { fg = theme.bright_magenta },
+    CmpItemKindIdentifier = { fg = theme.bright_black },
+    CmpItemKindField = { fg = theme.bright_black },
+    CmpItemKindVariable = { fg = theme.bright_cyan },
+    Special = { fg = theme.bright_blue },
+    CmpItemKindSnippet = { fg = theme.red },
+    CmpItemKindText = { fg = theme.bright_yellow },
+    CmpItemKindStructure = { fg = theme.bright_cyan },
+    CmpItemKindType = { fg = theme.bright_green },
+    CmpItemKindKeyword = { fg = theme.white },
+    CmpItemKindMethod = { fg = theme.bright_magenta },
+    CmpItemKindConstructor = { fg = theme.blue },
+    CmpItemKindFolder = { fg = theme.white },
+    CmpItemKindModule = { fg = theme.bright_green },
+    CmpItemKindProperty = { fg = theme.bright_black },
+    CmpItemKindUnit = { fg = theme.bright_cyan },
+    CmpItemKindFile = { fg = theme.white },
+    CmpItemKindColor = { fg = theme.red },
+    CmpItemKindReference = { fg = theme.magenta },
+    CmpItemKindStruct = { fg = theme.bright_cyan },
+    CmpItemKindOperator = { fg = theme.magenta },
+    CmpItemKindTypeParameter = { fg = theme.bright_black },
 }
diff --git a/lua/colors/integrations/nvim.lua b/lua/colors/integrations/nvim.lua
index e5e4b77..bab0771 100644
--- a/lua/colors/integrations/nvim.lua
+++ b/lua/colors/integrations/nvim.lua
@@ -1,33 +1,15 @@
 local theme = require("colors.kdark").colors
 
-local black = theme.black
-local red = theme.red
-local green = theme.green
-local yellow = theme.yellow
-local blue = theme.blue
-local magenta = theme.magenta
-local cyan = theme.cyan
-local white = theme.white
-local bright_black = theme.bright_black
-local bright_red = theme.bright_red
-local bright_green = theme.bright_green
-local bright_yellow = theme.bright_yellow
-local bright_blue = theme.bright_blue
-local bright_magenta = theme.bright_magenta
-local bright_cyan = theme.bright_cyan
-local bright_white = theme.bright_white
-
 return {
-
-    Comment = { fg = bright_black },
+    Comment = { fg = theme.bright_black },
 
     SignColumn = {
-        bg = black,
+        bg = theme.black,
     },
 
     -- line number
-    LineNr = { fg = bright_black },
-    CursorLineNr = { fg = white },
+    LineNr = { fg = theme.bright_black },
+    CursorLineNr = { fg = theme.white },
 
     CursorLine = {
         bg = '#131313',
@@ -35,81 +17,81 @@ return {
     },
 
     -- those ugly ~'s
-    EndOfBuffer = { fg = black },
+    EndOfBuffer = { fg = theme.black },
 
     -- floating windows
-    FloatBorder = { fg = blue },
-    NormalFloat = { bg = black },
+    FloatBorder = { fg = theme.blue },
+    NormalFloat = { bg = theme.black },
 
     -- Pmenu i.e completion menu
-    Pmenu = { bg = black },
-    PmenuSbar = { bg = black },
-    PmenuSel = { bg = black, fg = white },
-    PmenuThumb = { bg = bright_black },
+    Pmenu = { bg = theme.black },
+    PmenuSbar = { bg = theme.black },
+    PmenuSel = { bg = theme.black, fg = theme.white },
+    PmenuThumb = { bg = theme.bright_black },
 
     -- nvim cmp
-    CmpItemAbbr = { fg = white },
-    CmpItemAbbrMatch = { fg = blue, bold = true },
-    CmpBorder = { fg = bright_black },
-    CmpDocBorder = { fg = bright_black },
+    CmpItemAbbr = { fg = theme.white },
+    CmpItemAbbrMatch = { fg = theme.blue, bold = true },
+    CmpBorder = { fg = theme.bright_black },
+    CmpDocBorder = { fg = theme.bright_black },
 
-    NvimInternalError = { fg = red },
-    WinSeparator = { fg = bright_black },
+    NvimInternalError = { fg = theme.red },
+    WinSeparator = { fg = theme.bright_black },
 
     -- Dashboard i.e alpha.nvim
-    AlphaHeader = { fg = bright_black },
-    AlphaButtons = { fg = bright_black },
+    AlphaHeader = { fg = theme.bright_black },
+    AlphaButtons = { fg = theme.bright_black },
 
     -- Gitsigns.nvim
     DiffAdd = {
-        fg = blue,
+        fg = theme.blue,
     },
 
     DiffAdded = {
-        fg = green,
+        fg = theme.green,
     },
 
     DiffChange = {
-        fg = bright_black,
+        fg = theme.bright_black,
     },
 
     DiffChangeDelete = {
-        fg = red,
+        fg = theme.red,
     },
 
     DiffModified = {
-        fg = yellow,
+        fg = theme.yellow,
     },
 
     DiffDelete = {
-        fg = red,
+        fg = theme.red,
     },
 
     DiffRemoved = {
-        fg = red,
+        fg = theme.red,
     },
 
     -- Indent blankline
-    IndentBlanklineChar = { fg = bright_black },
-    IndentBlanklineSpaceChar = { fg = bright_black },
+    IndentBlanklineChar = { fg = theme.bright_black },
+    IndentBlanklineSpaceChar = { fg = theme.bright_black },
 
     -- Lsp Diagnostics
-    DiagnosticHint = { fg = magenta },
-    DiagnosticError = { fg = red },
-    DiagnosticWarn = { fg = yellow },
-    DiagnosticInformation = { fg = green },
+    DiagnosticHint = { fg = theme.magenta },
+    DiagnosticError = { fg = theme.red },
+    DiagnosticWarn = { fg = theme.yellow },
+    DiagnosticInformation = { fg = theme.green },
 
     -- NvimTree
-    NvimTreeEmptyFolderName = { fg = bright_blue },
-    NvimTreeEndOfBuffer = { fg = black },
-    NvimTreeFolderIcon = { fg = bright_blue },
-    NvimTreeFolderName = { fg = bright_blue },
-    NvimTreeGitDirty = { fg = red },
-    NvimTreeIndentMarker = { fg = bright_black },
+    NvimTreeEmptyFolderName = { fg = theme.bright_blue },
+    NvimTreeEndOfBuffer = { fg = theme.black },
+    NvimTreeFolderIcon = { fg = theme.bright_blue },
+    NvimTreeFolderName = { fg = theme.bright_blue },
+    NvimTreeGitDirty = { fg = theme.red },
+    NvimTreeIndentMarker = { fg = theme.bright_black },
     NvimTreeNormal = { bg = '#000000' },
     NvimTreeNormalNC = { bg = '#000000' },
-    NvimTreeOpenedFolderName = { fg = bright_blue },
-    NvimTreeGitIgnored = { fg = bright_black },
+    NvimTreeOpenedFolderName = { fg = theme.bright_blue },
+    NvimTreeGitIgnored = { fg = theme.bright_black },
 
     NvimTreeWinSeparator = {
         fg = '#000000',
@@ -117,27 +99,27 @@ return {
     },
 
     NvimTreeWindowPicker = {
-        fg = red,
-        bg = black,
+        fg = theme.red,
+        bg = theme.black,
     },
 
     NvimTreeCursorLine = {
-        bg = black,
+        bg = theme.black,
     },
 
     -- StatusLine = {
-    --     fg = white,
+    --     fg = theme. white,
     -- },
     -- StatusLineNC = {
-    --     fg = white,
+    --     fg = theme. white,
     -- },
     -- StatusLineSeparator = {
-    --     fg = bright_black,
+    --     fg = theme. bright_black,
     -- },
     -- StatusLineTerm = {
-    --     fg = bright_black,
+    --     fg = theme. bright_black,
     -- },
     -- StatusLineTermNC = {
-    --     fg = bright_black,
+    --     fg = theme. bright_black,
     -- },
 }
diff --git a/lua/colors/integrations/syntax.lua b/lua/colors/integrations/syntax.lua
index f0b394b..a879f58 100644
--- a/lua/colors/integrations/syntax.lua
+++ b/lua/colors/integrations/syntax.lua
@@ -1,132 +1,112 @@
 local theme = require("colors.kdark").colors
 
--- Standard syntax highlighting
-local black = theme.black
-local red = theme.red
-local green = theme.green
-local yellow = theme.yellow
-local blue = theme.blue
-local magenta = theme.magenta
-local cyan = theme.cyan
-local white = theme.white
-local bright_black = theme.bright_black
-local bright_red = theme.bright_red
-local bright_green = theme.bright_green
-local bright_yellow = theme.bright_yellow
-local bright_blue = theme.bright_blue
-local bright_magenta = theme.bright_magenta
-local bright_cyan = theme.bright_cyan
-local bright_white = theme.bright_white
-local orange = theme.orange
-local gray = theme.gray
-
 return {
-   Boolean = {
-      fg = orange,
-   },
+    Boolean = {
+        fg = theme.orange,
+    },
 
-   Character = {
-      fg = magenta,
-   },
+    Character = {
+        fg = theme.magenta,
+    },
 
-   Conditional = {
-      fg = magenta,
-   },
+    Conditional = {
+        fg = theme.magenta,
+    },
 
-   Constant = {
-      fg = magenta,
-   },
+    Constant = {
+        fg = theme.magenta,
+    },
 
-   Define = {
-      fg = magenta,
-      sp = "none",
-   },
+    Define = {
+        fg = theme.magenta,
+        sp = "none",
+    },
 
-   Delimiter = {
-      fg = orange,
-   },
+    Delimiter = {
+        fg = theme.orange,
+    },
 
-   Float = {
-      fg = yellow,
-   },
+    Float = {
+        fg = theme.yellow,
+    },
 
-   Function = {
-      fg = bright_blue,
-   },
+    Function = {
+        fg = theme.bright_blue,
+    },
 
-   Identifier = {
-      fg = magenta,
-      sp = "none",
-   },
+    Identifier = {
+        fg = theme.magenta,
+        sp = "none",
+    },
 
-   Include = {
-      fg = bright_blue,
-   },
+    Include = {
+        fg = theme.bright_blue,
+    },
 
-   Keyword = {
-      fg = magenta,
-   },
+    Keyword = {
+        fg = theme.magenta,
+    },
 
-   Label = {
-      fg = yellow,
-   },
+    Label = {
+        fg = theme.yellow,
+    },
 
-   Number = {
-      fg = yellow,
-   },
+    Number = {
+        fg = theme.yellow,
+    },
 
-   Operator = {
-      fg = gray,
-      sp = "none",
-   },
+    Operator = {
+        fg = theme.gray,
+        sp = "none",
+    },
 
-   PreProc = {
-      fg = yellow,
-   },
+    PreProc = {
+        fg = theme.yellow,
+    },
 
-   Repeat = {
-      fg = yellow,
-   },
+    Repeat = {
+        fg = theme.yellow,
+    },
 
-   Special = {
-      fg = bright_blue,
-   },
+    Special = {
+        fg = theme.bright_blue,
+    },
 
-   SpecialChar = {
-      fg = orange,
-   },
+    SpecialChar = {
+        fg = theme.orange,
+    },
 
-   Statement = {
-      fg = magenta,
-   },
+    Statement = {
+        fg = theme.magenta,
+    },
 
-   StorageClass = {
-      fg = yellow,
-   },
+    StorageClass = {
+        fg = theme.yellow,
+    },
 
-   String = {
-      fg = bright_green,
-   },
+    String = {
+        fg = theme.bright_green,
+    },
 
-   Structure = {
-      fg = magenta,
-   },
+    Structure = {
+        fg = theme.magenta,
+    },
 
-   Tag = {
-      fg = yellow,
-   },
+    Tag = {
+        fg = theme.yellow,
+    },
 
-   Todo = {
-      fg = yellow,
-      bg = bright_black,
-   },
+    Todo = {
+        fg = theme.yellow,
+        bg = theme.bright_black,
+    },
 
-   Type = {
-      fg = yellow,
-      sp = "none",
-   },
+    Type = {
+        fg = theme.yellow,
+        sp = "none",
+    },
 
-   Typedef = {
-      fg = yellow,
-   },
+    Typedef = {
+        fg = theme.yellow,
+    },
 }
diff --git a/lua/colors/integrations/treesitter.lua b/lua/colors/integrations/treesitter.lua
index 6530e09..65978af 100644
--- a/lua/colors/integrations/treesitter.lua
+++ b/lua/colors/integrations/treesitter.lua
@@ -1,187 +1,168 @@
 local theme = require("colors.kdark").colors
 
-local black = theme.black                      -- base00
-local red = theme.red                          -- base01
-local green = theme.green                      -- base02
-local yellow = theme.yellow                    -- base03
-local blue = theme.blue                        -- base04
-local magenta = theme.magenta                  -- base05
-local cyan = theme.cyan                        -- base06
-local white = theme.white                      -- base07
-local bright_black = theme.bright_black        -- base08
-local bright_red = theme.bright_red            -- base09
-local bright_green = theme.bright_green        -- base0A
-local bright_yellow = theme.bright_yellow      -- base0B
-local bright_blue = theme.bright_blue          -- base0C
-local bright_magenta = theme.bright_magenta    -- base0D
-local bright_cyan = theme.bright_cyan          -- base0E
-local bright_white = theme.bright_white        -- base0F
-local orange = theme.orange
-local gray = theme.gray
-
 return {
-   TSAnnotation = {
-      fg = orange,
-      sp = "none",
-   },
+    TSAnnotation = {
+        fg = theme.orange,
+        sp = "none",
+    },
 
-   TSAttribute = {
-      fg = bright_green,
-      sp = "none",
-   },
+    TSAttribute = {
+        fg = theme.bright_green,
+        sp = "none",
+    },
 
-   TSCharacter = {
-      fg = magenta,
-      sp = "none",
-   },
+    TSCharacter = {
+        fg = theme.magenta,
+        sp = "none",
+    },
 
-   TSConstBuiltin = {
-      fg = bright_yellow,
-      sp = "none",
-   },
+    TSConstBuiltin = {
+        fg = theme.bright_yellow,
+        sp = "none",
+    },
 
-   TSConstMacro = {
-      fg = magenta,
-      sp = "none",
-   },
+    TSConstMacro = {
+        fg = theme.magenta,
+        sp = "none",
+    },
 
-   TSError = {
-      fg =  red,
-      sp = "none",
-   },
+    TSError = {
+        fg = theme.red,
+        sp = "none",
+    },
 
-   TSException = {
-      fg = magenta,
-      sp = "none",
-   },
+    TSException = {
+        fg = theme.magenta,
+        sp = "none",
+    },
 
-   TSFloat = {
-      fg = bright_yellow,
-      sp = "none",
-   },
+    TSFloat = {
+        fg = theme.bright_yellow,
+        sp = "none",
+    },
 
-   TSFuncBuiltin = {
-      fg = bright_blue,
-      sp = "none",
-   },
+    TSFuncBuiltin = {
+        fg = theme.bright_blue,
+        sp = "none",
+    },
 
-   TSFuncMacro = {
-      fg = magenta,
-      sp = "none",
-   },
+    TSFuncMacro = {
+        fg = theme.magenta,
+        sp = "none",
+    },
 
-   TSKeywordOperator = {
-      fg = bright_magenta,
-      sp = "none",
-   },
+    TSKeywordOperator = {
+        fg = theme.bright_magenta,
+        sp = "none",
+    },
 
-   TSMethod = {
-      fg = bright_blue,
-      sp = "none",
-   },
+    TSMethod = {
+        fg = theme.bright_blue,
+        sp = "none",
+    },
 
-   TSNamespace = {
-      fg = magenta,
-      sp = "none",
-   },
+    TSNamespace = {
+        fg = theme.magenta,
+        sp = "none",
+    },
 
-   TSNone = {
-      fg = gray,
-      sp = "none",
-   },
+    TSNone = {
+        fg = theme.gray,
+        sp = "none",
+    },
 
-   TSParameter = {
-      fg = magenta,
-      sp = "none",
-   },
+    TSParameter = {
+        fg = theme.magenta,
+        sp = "none",
+    },
 
-   TSParameterReference = {
-      fg = gray,
-      sp = "none",
-   },
+    TSParameterReference = {
+        fg = theme.gray,
+        sp = "none",
+    },
 
-   TSPunctDelimiter = {
-      fg = orange,
-      sp = "none",
-   },
+    TSPunctDelimiter = {
+        fg = theme.orange,
+        sp = "none",
+    },
 
-   TSPunctSpecial = {
-      fg = gray,
-      sp = "none",
-   },
+    TSPunctSpecial = {
+        fg = theme.gray,
+        sp = "none",
+    },
 
-   TSStringRegex = {
-      fg = cyan,
-      sp = "none",
-   },
+    TSStringRegex = {
+        fg = theme.cyan,
+        sp = "none",
+    },
 
-   TSStringEscape = {
-      fg = cyan,
-      sp = "none",
-   },
+    TSStringEscape = {
+        fg = theme.cyan,
+        sp = "none",
+    },
 
-   TSSymbol = {
-      fg = bright_green,
-      sp = "none",
-   },
+    TSSymbol = {
+        fg = theme.bright_green,
+        sp = "none",
+    },
 
-   TSTagDelimiter = {
-      fg = orange,
-      sp = "none",
-   },
+    TSTagDelimiter = {
+        fg = theme.orange,
+        sp = "none",
+    },
 
-   TSText = {
-      fg = gray,
-      sp = "none",
-   },
+    TSText = {
+        fg = theme.gray,
+        sp = "none",
+    },
 
-   TSStrong = {
-      bold = true,
-   },
+    TSStrong = {
+        bold = true,
+    },
 
-   TSEmphasis = {
-      fg = theme.base09,
-      sp = "none",
-   },
+    TSEmphasis = {
+        fg = theme.base09,
+        sp = "none",
+    },
 
-   TSStrike = {
-      fg = black,
-      sp = "none",
-      strikethrough = true,
-   },
+    TSStrike = {
+        fg = theme.black,
+        sp = "none",
+        strikethrough = true,
+    },
 
-   TSLiteral = {
-      fg = bright_magenta,
-      sp = "none",
-   },
+    TSLiteral = {
+        fg = theme.bright_magenta,
+        sp = "none",
+    },
 
-   TSURI = {
-      fg = bright_magenta,
-      sp = "none",
-      underline = true,
-   },
+    TSURI = {
+        fg = theme.bright_magenta,
+        sp = "none",
+        underline = true,
+    },
 
-   TSTypeBuiltin = {
-      fg = yellow,
-      sp = "none",
-   },
+    TSTypeBuiltin = {
+        fg = theme.yellow,
+        sp = "none",
+    },
 
-   TSVariableBuiltin = {
-      fg = bright_yellow,
-      sp = "none",
-   },
+    TSVariableBuiltin = {
+        fg = theme.bright_yellow,
+        sp = "none",
+    },
 
-   TSDefinition = {
-      sp = blue,
-      underline = true,
-   },
+    TSDefinition = {
+        sp = theme.blue,
+        underline = true,
+    },
 
-   TSDefinitionUsage = {
-      sp = bright_black,
-      underline = true,
-   },
+    TSDefinitionUsage = {
+        sp = theme.bright_black,
+        underline = true,
+    },
 
-   TSCurrentScope = {
-      bold = true,
-   },
+    TSCurrentScope = {
+        bold = true,
+    },
 }