diff --git a/lua/hl_themes/chocolate.lua b/lua/hl_themes/chocolate.lua
new file mode 100644
index 0000000..daa9c3e
--- /dev/null
+++ b/lua/hl_themes/chocolate.lua
@@ -0,0 +1,101 @@
+-- Credits to original theme https://gitlab.com/snakedye/chocolate
+-- This is modified version of it
+
+local M = {}
+
+M.base_30 = {
+   white = "#cdc0ad",
+   darker_black = "#201d1c",
+   black = "#252221", --  nvim bg
+   black2 = "#2b2827",
+   one_bg = "#2f2c2b",
+   one_bg2 = "#393635",
+   one_bg3 = "#43403f",
+   grey = "#4d4a49",
+   grey_fg = "#575453",
+   grey_fg2 = "#615e5d",
+   light_grey = "#6b6867",
+   red = "#c65f5f",
+   baby_pink = "#dc7575",
+   pink = "#d16a6a",
+   line = "#322f2e", -- for lines like vertsplit
+   green = "#8ca589",
+   vibrant_green = "#95ae92",
+   nord_blue = "#728797",
+   blue = "#7d92a2",
+   yellow = "#d9b27c",
+   sun = "#e1ba84",
+   purple = "#998396",
+   dark_purple = "#917b8e",
+   teal = "#749689",
+   orange = "#d08b65",
+   cyan = "#829e9b",
+   statusline_bg = "#292625",
+   lightbg = "#353231",
+   pmenu_bg = "#859e82",
+   folder_bg = "#768b9b",
+   beige = "#ab9382",
+}
+
+M.base_16 = {
+   base00 = "#252221",
+   base01 = "#2f2c2b",
+   base02 = "#393635",
+   base03 = "#43403f",
+   base04 = "#4d4a49",
+   base05 = "#c8bAA4",
+   base06 = "#beae94",
+   base07 = "#cdc0ad",
+   base08 = "#c65f5f",
+   base09 = "#d08b65",
+   base0A = "#d9b27c",
+   base0B = "#8ca589",
+   base0C = "#998396",
+   base0D = "#7d92a2",
+   base0E = "#c65f5f",
+   base0F = "#ab9382",
+}
+
+M.polish_hl = {
+   TSField = {
+      fg = M.base_30.purple,
+   },
+
+   TSVariable = {
+      fg = M.base_16.base06,
+   },
+
+   TSModule = {
+      fg = M.base_30.beige,
+   },
+
+   Operator = {
+      fg = M.base_30.blue,
+   },
+
+   TSAttribute = {
+      fg = M.base_30.cyan,
+   },
+
+   TSPunctBracket = {
+      fg = M.base_16.base06,
+   },
+
+   TSParenthesis = {
+      link = "TSPunctBracket",
+   },
+
+   TSParameter = {
+      fg = M.base_30.green,
+   },
+
+   TSFuncBuiltin = {
+      fg = M.base_30.yellow,
+   },
+}
+
+M.type = "dark"
+
+M = require("base46").override_theme(M, "chocolate")
+
+return M
diff --git a/lua/hl_themes/gruvbox_light.lua b/lua/hl_themes/gruvbox_light.lua
new file mode 100644
index 0000000..0f68a41
--- /dev/null
+++ b/lua/hl_themes/gruvbox_light.lua
@@ -0,0 +1,59 @@
+local M = {}
+
+M.base_30 = {
+   white = "#504945",
+   darker_black = "#e8dbb2",
+   black = "#F2E5BC", --  nvim bg
+   black2 = "#e3d6ad",
+   one_bg = "#e5d8af",
+   one_bg2 = "#d8cba2",
+   one_bg3 = "#cabd94",
+   grey = "#c0b38a",
+   grey_fg = "#b6a980",
+   grey_fg2 = "#ac9f76",
+   light_grey = "#a2956c",
+   red = "#d65d0e",
+   baby_pink = "#af3a03",
+   pink = "#9d0006",
+   line = "#ded1a8", -- for lines like vertsplit
+   green = "#79740e",
+   vibrant_green = "#7f7a14",
+   nord_blue = "#7b9d90",
+   blue = "#458588",
+   yellow = "#d79921",
+   sun = "#dd9f27",
+   purple = "#8f3f71",
+   dark_purple = "#853567",
+   teal = "#749689",
+   orange = "#b57614",
+   cyan = "#82b3a8",
+   statusline_bg = "#e9dcb3",
+   lightbg = "#ddd0a7",
+   pmenu_bg = "#739588",
+   folder_bg = "#746d69",
+}
+
+M.base_16 = {
+   base00 = "#F2E5BC",
+   base01 = "#e5d8af",
+   base02 = "#d8cba2",
+   base03 = "#cabd94",
+   base04 = "#c0b38a",
+   base05 = "#504945",
+   base06 = "#3c3836",
+   base07 = "#282828",
+   base08 = "#9d0006",
+   base09 = "#af3a03",
+   base0A = "#b57614",
+   base0B = "#79740e",
+   base0C = "#427b58",
+   base0D = "#076678",
+   base0E = "#8f3f71",
+   base0F = "#d65d0e",
+}
+
+M.type = "light"
+
+M = require("base46").override_theme(M, "gruvbox_light")
+
+return M
diff --git a/lua/hl_themes/nightfox.lua b/lua/hl_themes/nightfox.lua
new file mode 100644
index 0000000..f93f152
--- /dev/null
+++ b/lua/hl_themes/nightfox.lua
@@ -0,0 +1,59 @@
+local M = {}
+
+M.base_30 = {
+   white = "#cdcecf",
+   darker_black = "#121c29",
+   black = "#192330",
+   black2 = "#202a37",
+   one_bg = "#252f3c", -- real bg of onedark
+   one_bg2 = "#313b48",
+   one_bg3 = "#3d4754",
+   grey = "#495360",
+   grey_fg = "#535d6a",
+   grey_fg2 = "#5c6673",
+   light_grey = "#646e7b",
+   red = "#c94f6d",
+   baby_pink = "#e26886",
+   pink = "#d85e7c",
+   line = "#2a3441",
+   green = "#8ebaa4",
+   vibrant_green = "#6ad4d6",
+   blue = "#719cd6",
+   nord_blue = "#86abdc",
+   yellow = "#dbc074",
+   sun = "#e0c989",
+   purple = "#baa1e2",
+   dark_purple = "#9d79d6",
+   teal = "#5cc6c8",
+   orange = "#fe9373",
+   cyan = "#8be5e7",
+   statusline_bg = "#202a37",
+   lightbg = "#313b48",
+   pmenu_bg = "#719cd6",
+   folder_bg = "#719cd6",
+}
+
+M.base_16 = {
+   base00 = "#192330",
+   base01 = "#252f3c",
+   base02 = "#313b48",
+   base03 = "#3d4754",
+   base04 = "#495360",
+   base05 = "#c0c8d5",
+   base06 = "#c7cfdc",
+   base07 = "#ced6e3",
+   base08 = "#e26886",
+   base09 = "#fe9373",
+   base0A = "#dbc074",
+   base0B = "#8ebaa4",
+   base0C = "#7ad4d6",
+   base0D = "#86abdc",
+   base0E = "#9d79d6",
+   base0F = "#d85e7c",
+}
+
+M.type = "dark"
+
+M = require("base46").override_theme(M, "nightfox")
+
+return M
diff --git a/lua/hl_themes/onenord_light.lua b/lua/hl_themes/onenord_light.lua
new file mode 100644
index 0000000..0de9868
--- /dev/null
+++ b/lua/hl_themes/onenord_light.lua
@@ -0,0 +1,94 @@
+local M = {}
+
+M.base_30 = {
+   white = "#2a303c",
+   darker_black = "#ced4df",
+   black = "#D8DEE9", --  nvim bg
+   black2 = "#c9cfda",
+   one_bg = "#c7cdd8", -- real bg of onedark
+   one_bg2 = "#bdc3ce",
+   one_bg3 = "#b3b9c4",
+   grey = "#a9afba",
+   grey_fg = "#9fa5b0",
+   grey_fg2 = "#959ba6",
+   light_grey = "#8b919c",
+   red = "#a3454e",
+   baby_pink = "#ae5059",
+   pink = "#c56770",
+   line = "#acb2bd", -- for lines like vertsplit
+   green = "#75905e",
+   vibrant_green = "#809b69",
+   nord_blue = "#5b7b9b",
+   blue = "#3f5f7f",
+   yellow = "#c18401",
+   sun = "#dea95f",
+   purple = "#9c87c7",
+   dark_purple = "#927dbd",
+   teal = "#395979",
+   orange = "#b46b54",
+   cyan = "#6181a1",
+   statusline_bg = "#ced4df",
+   lightbg = "#bac0cb",
+   pmenu_bg = "#7191b1",
+   folder_bg = "#616773",
+}
+
+M.base_16 = {
+   base00 = "#D8DEE9",
+   base01 = "#f4f4f4",
+   base02 = "#e5e5e6",
+   base03 = "#dfdfe0",
+   base04 = "#d7d7d8",
+   base05 = "#3e4450",
+   base06 = "#272d39",
+   base07 = "#2a303c",
+   base08 = "#a3454e",
+   base09 = "#b46b54",
+   base0A = "#b88339",
+   base0B = "#75905e",
+   base0C = "#5b7b9b",
+   base0D = "#3f5f7f",
+   base0E = "#8d6786",
+   base0F = "#a3454e",
+}
+
+M.polish_hl = {
+   WhichKeyDesc = {
+      fg = M.base_30.white,
+   },
+
+   WhichKey = {
+      fg = M.base_30.white,
+   },
+
+   TelescopePromptPrefix = {
+      fg = M.base_30.white,
+   },
+
+   TelescopeSelection = {
+      bg = M.base_30.one_bg,
+      fg = M.base_30.white,
+   },
+
+   TSPunctBracket = {
+      fg = M.base_30.nord_blue,
+   },
+
+   NormalFloat = {
+      bg = M.base_30.black,
+   },
+
+   FloatBorder = {
+      fg = M.base_16.base05,
+   },
+
+   DiffAdd = {
+      fg = M.base_16.base05,
+   },
+}
+
+M = require("base46").override_theme(M, "onenord_light")
+
+M.type = "light"
+
+return M
diff --git a/lua/hl_themes/vscode_dark.lua b/lua/hl_themes/vscode_dark.lua
new file mode 100644
index 0000000..6c32e3b
--- /dev/null
+++ b/lua/hl_themes/vscode_dark.lua
@@ -0,0 +1,83 @@
+local M = {}
+
+M.base_30 = {
+   white = "#dee1e6",
+   darker_black = "#1a1a1a",
+   black = "#1E1E1E", --  nvim bg
+   black2 = "#252525",
+   one_bg = "#282828",
+   one_bg2 = "#313131",
+   one_bg3 = "#3a3a3a",
+   grey = "#444444",
+   grey_fg = "#4e4e4e",
+   grey_fg2 = "#585858",
+   light_grey = "#626262",
+   red = "#D16969",
+   baby_pink = "#ea696f",
+   pink = "#bb7cb6",
+   line = "#2e2e2e", -- for lines like vertsplit
+   green = "#B5CEA8",
+   vibrant_green = "#bfd8b2",
+   blue = "#569CD6",
+   nord_blue = "#60a6e0",
+   yellow = "#D7BA7D",
+   sun = "#e1c487",
+   purple = "#c68aee",
+   dark_purple = "#b77bdf",
+   teal = "#4EC994",
+   orange = "#d3967d",
+   cyan = "#9CDCFE",
+   statusline_bg = "#242424",
+   lightbg = "#303030",
+   pmenu_bg = "#60a6e0",
+   folder_bg = "#7A8A92",
+}
+
+M.base_16 = {
+   --author of this template Tomas Iser, @tomasiser on github,
+   base00 = "#1E1E1E",
+   base01 = "#262626",
+   base02 = "#303030",
+   base03 = "#3C3C3C",
+   base04 = "#464646",
+   base05 = "#D4D4D4",
+   base06 = "#E9E9E9",
+   base07 = "#FFFFFF",
+   base08 = "#D16969",
+   base09 = "#B5CEA8",
+   base0A = "#D7BA7D",
+   base0B = "#BD8D78",
+   base0C = "#9CDCFE",
+   base0D = "#DCDCAA",
+   base0E = "#C586C0",
+   base0F = "#CE9178",
+}
+
+M.polish_hl = {
+
+   TSKeyword = {
+      fg = M.base_30.blue,
+   },
+
+   TSVariable = {
+      fg = M.base_30.cyan,
+   },
+
+   luaTSField = {
+      fg = M.base_30.red,
+   },
+
+   TSFieldKey = {
+      fg = M.base_30.teal,
+   },
+
+   TSKeywordReturn = {
+      fg = M.base_16.base0E,
+   },
+}
+
+M.type = "dark"
+
+M = require("base46").override_theme(M, "vscode_dark")
+
+return M
diff --git a/lua/integrations/treesitter.lua b/lua/integrations/treesitter.lua
index 5752c58..235df20 100644
--- a/lua/integrations/treesitter.lua
+++ b/lua/integrations/treesitter.lua
@@ -87,7 +87,7 @@ return {
    },
 
    TSPunctSpecial = {
-      fg = theme.base05,
+      fg = theme.base08,
       sp = "none",
    },