diff --git a/lua/base46/integrations/treesitter.lua b/lua/base46/integrations/treesitter.lua
index df5f9cd..bd752b4 100644
--- a/lua/base46/integrations/treesitter.lua
+++ b/lua/base46/integrations/treesitter.lua
@@ -18,6 +18,10 @@ return {
     fg = theme.base0C,
   },
 
+  ["@constant"] = {
+    fg = theme.base08,
+  },
+
   ["@constant.builtin"] = {
     fg = theme.base09,
   },
@@ -66,6 +70,10 @@ return {
     fg = theme.base0D,
   },
 
+  ["@operator"] = {
+    fg = theme.base05,
+  },
+
   ["@keyword.operator"] = {
     fg = theme.base0E,
   },
@@ -102,6 +110,10 @@ return {
     fg = theme.base08,
   },
 
+  ["@string"] = {
+    fg = theme.base0B,
+  },
+
   ["@string.regex"] = {
     fg = theme.base0C,
   },
@@ -110,6 +122,10 @@ return {
     fg = theme.base0C,
   },
 
+  ["@string.special"] = {
+    fg = theme.base0C,
+  },
+
   ["@symbol"] = {
     fg = theme.base0B,
   },
diff --git a/lua/base46/themes/aquarium.lua b/lua/base46/themes/aquarium.lua
index 35bfd0a..2d61cff 100644
--- a/lua/base46/themes/aquarium.lua
+++ b/lua/base46/themes/aquarium.lua
@@ -1,3 +1,6 @@
+-- credits to original theme https://github.com/FrenzyExists/aquarium-vim
+-- This is just a modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/ashes.lua b/lua/base46/themes/ashes.lua
index 40382e6..f91e329 100644
--- a/lua/base46/themes/ashes.lua
+++ b/lua/base46/themes/ashes.lua
@@ -1,3 +1,6 @@
+-- credits to original theme https://github.com/chriskempson/base16-vim/blob/master/colors/base16-ashes.vim
+-- This is just a modified version of it
+
 local M = {}
 
 M.base_30 = {
@@ -27,7 +30,7 @@ M.base_30 = {
   teal = "#8fb4b5",
   orange = "#c7ae95",
   cyan = "#9eb7d0",
-  statusline_bg = "#24282b",
+  statusline_bg = "#23272a",
   lightbg = "#303437",
   pmenu_bg = "#99c366",
   folder_bg = "#8ca5be",
diff --git a/lua/base46/themes/ayu_dark.lua b/lua/base46/themes/ayu_dark.lua
index bf758d8..a2e625e 100644
--- a/lua/base46/themes/ayu_dark.lua
+++ b/lua/base46/themes/ayu_dark.lua
@@ -1,3 +1,6 @@
+-- credits to original theme https://github.com/ayu-theme/ayu-vim (dark)
+-- This is just a modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/ayu_light.lua b/lua/base46/themes/ayu_light.lua
index 4d94fc9..597fcba 100644
--- a/lua/base46/themes/ayu_light.lua
+++ b/lua/base46/themes/ayu_light.lua
@@ -1,13 +1,13 @@
--- credit to original theme for existing https://github.com/ayu-theme/ayu-vim
+-- credit to original theme for existing https://github.com/ayu-theme/ayu-vim (light)
 -- NOTE : This is a modified version of it
 
 local M = {}
 
 M.base_30 = {
   white = "#26292f",
-  darker_black = "#ededed",
+  darker_black = "#f3f3f3",
   black = "#fafafa", --  nvim bg
-  black2 = "#e3e3e3",
+  black2 = "#efefef",
   one_bg = "#ebebeb",
   one_bg2 = "#e1e1e1", -- Highlight of context
   one_bg3 = "#d7d7d7",
@@ -39,8 +39,8 @@ M.base_30 = {
 M.base_16 = {
   base00 = "#fafafa",
   base01 = "#f0f0f0",
-  base02 = "#e6e6e6",
-  base03 = "#dcdcdc",
+  base02 = "#eeeeee",
+  base03 = "#dfdfdf",
   base04 = "#d2d2d2",
   base05 = "#5C6166",
   base06 = "#52575c",
diff --git a/lua/base46/themes/blossom.lua b/lua/base46/themes/blossom.lua
index 0c7271d..bc16a7a 100644
--- a/lua/base46/themes/blossom.lua
+++ b/lua/base46/themes/blossom.lua
@@ -1,3 +1,6 @@
+-- credits to original theme for existing https://github.com/blossom-theme/blossom.vim
+-- This is just a modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/catppuccin_latte.lua b/lua/base46/themes/catppuccin_latte.lua
deleted file mode 100644
index c02a561..0000000
--- a/lua/base46/themes/catppuccin_latte.lua
+++ /dev/null
@@ -1,72 +0,0 @@
-local M = {}
-
-M.base_30 = {
-  white = "#4C4F69",
-  darker_black = "#e6e8ec",
-  black = "#EFF1F5", --  nvim bg
-  black2 = "#e0e2e6",
-  one_bg = "#e4e6ea", -- real bg of onedark
-  one_bg2 = "#d9dbdf",
-  one_bg3 = "#ced0d4",
-  grey = "#c3c5c9",
-  grey_fg = "#b9bbbf",
-  grey_fg2 = "#b0b2b6",
-  light_grey = "#a6a8ac",
-  red = "#D20F39",
-  baby_pink = "#DD7878",
-  pink = "#ea76cb",
-  line = "#d9dbdf", -- for lines like vertsplit
-  green = "#40A02B",
-  vibrant_green = "#7eca9c",
-  nord_blue = "#7287FD",
-  blue = "#1e66f5",
-  yellow = "#df8e1d",
-  sun = "#dea95f",
-  purple = "#8839EF",
-  dark_purple = "#7c2de3",
-  teal = "#179299",
-  orange = "#FE640B",
-  cyan = "#04A5E5",
-  statusline_bg = "#e4e6ea",
-  lightbg = "#d9dbdf",
-  pmenu_bg = "#7287FD",
-  folder_bg = "#6C6C6C",
-}
-
-M.base_16 = {
-  base00 = "#EFF1F5",
-  base01 = "#e4e6ea",
-  base02 = "#d9dbdf",
-  base03 = "#ced0d4",
-  base04 = "#c3c5c9",
-  base05 = "#4C4F69",
-  base06 = "#474a64",
-  base07 = "#41445e",
-  base08 = "#D20F39",
-  base09 = "#7c2de3",
-  base0A = "#df8e1d",
-  base0B = "#40A02B",
-  base0C = "#179299",
-  base0D = "#1e66f5",
-  base0E = "#8839EF",
-  base0F = "#62657f",
-}
-
-M.type = "light"
-
-M.polish_hl = {
-  TelescopePromptPrefix = { fg = M.base_30.white },
-  TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white },
-  FloatBorder = { fg = M.base_16.base05 },
-  DiffAdd = { fg = M.base_16.base05 },
-  TbLineThemeToggleBtn = { bg = M.base_30.one_bg3 },
-  WhichKeyDesc = { fg = M.base_30.white },
-  Pmenu = { bg = M.base_30.black2 },
-  St_pos_text = { fg = M.base_30.white },
-  ["@variable.builtin"] = { fg = M.base_30.red },
-  ["@property"] = { fg = M.base_30.teal },
-}
-
-M = require("base46").override_theme(M, "catppuccin_latte")
-
-return M
diff --git a/lua/base46/themes/chadracula.lua b/lua/base46/themes/chadracula.lua
index a8d9e6b..cb58121 100644
--- a/lua/base46/themes/chadracula.lua
+++ b/lua/base46/themes/chadracula.lua
@@ -1,3 +1,6 @@
+-- Credits to original theme https://github.com/dracula/vim
+-- This is a modified version 
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/chocolate.lua b/lua/base46/themes/chocolate.lua
index 0106be0..7f2c02a 100644
--- a/lua/base46/themes/chocolate.lua
+++ b/lua/base46/themes/chocolate.lua
@@ -39,10 +39,10 @@ M.base_30 = {
 
 M.base_16 = {
   base00 = "#252221",
-  base01 = "#2f2c2b",
-  base02 = "#393635",
-  base03 = "#43403f",
-  base04 = "#4d4a49",
+  base01 = "#2b2827",
+  base02 = "#2f2c2b",
+  base03 = "#393635",
+  base04 = "#43403f",
   base05 = "#c8bAA4",
   base06 = "#beae94",
   base07 = "#cdc0ad",
diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua
index ed00fe2..4f41510 100644
--- a/lua/base46/themes/dark_horizon.lua
+++ b/lua/base46/themes/dark_horizon.lua
@@ -1,3 +1,6 @@
+-- Credits to original theme https://github.com/michael-ball/base16-horizon-scheme 
+-- This is a modified version 
+
 local M = {}
 
 M.base_30 = {
@@ -12,7 +15,7 @@ M.base_30 = {
   grey_fg = "#404040",
   grey_fg2 = "#4a4a4a",
   light_grey = "#525252",
-  red = "#dc322f",
+  red = "#db627e",
   baby_pink = "#a72e5b",
   pink = "#ff75a0",
   line = "#1d1d1d", -- for lines like vertsplit
@@ -20,6 +23,7 @@ M.base_30 = {
   vibrant_green = "#b9e75b",
   nord_blue = "#18a3af",
   blue = "#25B0BC",
+  seablue = "#169AC9",
   yellow = "#fdb830",
   sun = "#ffc038",
   purple = "#da70d6",
@@ -42,27 +46,22 @@ M.base_16 = {
   base05 = "#c9c7be",
   base06 = "#E6E1CF",
   base07 = "#D9D7CE",
-  base08 = "#D9D7CE", -- Confirmed: Variables Confirmed
+  base08 = "#db627e", -- Confirmed: Variables Confirmed
   base09 = "#eaa273", -- Confirmed: Integers, Booleans
-  base0A = "#825aff", -- Classes
+  base0A = "#169AC9", -- Classes
   base0B = "#E3A587", -- Confirmed: Strings
   base0C = "#F09483", -- Escape characters, Regular expressions
-  base0D = "#FFA500", -- Functions, Methods
-  base0E = "#2ca9b4", -- Confirmed: Keywords, Storage, Selector, Markup
+  base0D = "#32d5e3", -- Functions, Methods
+  base0E = "#6BE4E6", -- Confirmed: Keywords, Storage, Selector, Markup
   base0F = "#d75271", -- Deprecated, Opening/Closing embedded language tags
 }
 
 M.polish_hl = {
   Include = { fg = M.base_16.base0E, bold = true },
-  luaTSField = { fg = M.base_16.base0E },
-  Repeat = { fg = M.base_16.base0E },
-  ["@variable"] = { fg = M.base_16.base08 },
   ["@property"] = { fg = M.base_16.base0E },
   ["@tag.delimiter"] = { fg = M.base_16.base05 },
-  ["@function"] = { fg = M.base_30.orange },
-  ["@parameter"] = { fg = M.base_16.base0F },
-  ["@constructor"] = { fg = M.base_16.base0A },
-  ["@tag.attribute"] = { fg = M.base_16.orange },
+  ["@punctuation.bracket"] = { fg = M.base_30.yellow },
+  ["@punctuation.delimiter"] = { fg = M.base_30.yellow },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/decay.lua b/lua/base46/themes/decay.lua
index c263b2b..165afe9 100644
--- a/lua/base46/themes/decay.lua
+++ b/lua/base46/themes/decay.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/decaycs/decay.nvim
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
@@ -12,21 +15,21 @@ M.base_30 = {
   grey_fg = "#494d52",
   grey_fg2 = "#505459",
   light_grey = "#5a5e63",
-  red = "#e05f65",
-  baby_pink = "#ea696f",
-  pink = "#c68aee",
+  red = "#e26c7c",
+  baby_pink = "#c79bf0",
+  pink = "#c296eb",
   line = "#282d35", -- for lines like vertsplit
   green = "#78DBA9",
   vibrant_green = "#87eab8",
-  blue = "#70a5eb",
-  nord_blue = "#74bee9",
-  yellow = "#f1cf8a",
-  sun = "#e7c580",
+  blue = "#86aaec",
+  nord_blue = "#96b5ee",
+  yellow = "#ecd3a0",
+  sun = "#f1d8a5",
   purple = "#c68aee",
   dark_purple = "#b77bdf",
   teal = "#7ddac5",
   orange = "#e9a180",
-  cyan = "#74bee9",
+  cyan = "#98d3ee",
   statusline_bg = "#1c2026",
   lightbg = "#2b3038",
   pmenu_bg = "#7ddac5",
@@ -42,14 +45,20 @@ M.base_16 = {
   base05 = "#b6beca",
   base06 = "#dee1e6",
   base07 = "#dee1e6",
-  base08 = "#e05f65",
+  base08 = "#70A5EB",
   base09 = "#e9a180",
   base0A = "#f1cf8a",
   base0B = "#78DBA9",
-  base0C = "#9cd1ff",
-  base0D = "#74bee9",
+  base0C = "#e26c7c",
+  base0D = "#86aaec",
   base0E = "#c68aee",
-  base0F = "#e05f65",
+  base0F = "#9cd1ff",
+}
+
+M.polish_hl = {
+  ["@constant"] = {
+    fg = M.base_30.yellow,
+  },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/doomchad.lua b/lua/base46/themes/doomchad.lua
index 10d2227..4e9f09c 100644
--- a/lua/base46/themes/doomchad.lua
+++ b/lua/base46/themes/doomchad.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/NTBBloodbath/doom-one.nvim
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
@@ -19,7 +22,7 @@ M.base_30 = {
   green = "#98be65",
   vibrant_green = "#a9cf76",
   nord_blue = "#47a5e5",
-  blue = "#61afef",
+  blue = "#51afef",
   yellow = "#ECBE7B",
   sun = "#f2c481",
   purple = "#dc8ef3",
@@ -47,13 +50,14 @@ M.base_16 = {
   base0A = "#ECBE7B",
   base0B = "#98be65",
   base0C = "#66c4ff",
-  base0D = "#48a6e6",
-  base0E = "#9c94d4",
+  base0D = "#dc8ef3",
+  base0E = "#48a6e6",
   base0F = "#c85a50",
 }
 
 M.polish_hl = {
   ["@field"] = { fg = M.base_30.blue },
+  ["@punctuation.bracket"] = { fg = M.base_30.yellow },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/everblush.lua b/lua/base46/themes/everblush.lua
index 9779dc0..3da2faf 100644
--- a/lua/base46/themes/everblush.lua
+++ b/lua/base46/themes/everblush.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/Everblush/nvim
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/everforest.lua b/lua/base46/themes/everforest.lua
index ecdf77e..e81db4f 100644
--- a/lua/base46/themes/everforest.lua
+++ b/lua/base46/themes/everforest.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/sainnhe/everforest
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/everforest_light.lua b/lua/base46/themes/everforest_light.lua
index 18001b2..b535747 100644
--- a/lua/base46/themes/everforest_light.lua
+++ b/lua/base46/themes/everforest_light.lua
@@ -1,17 +1,20 @@
+-- Credits to original https://github.com/sainnhe/everforest
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
   white = "#272f35",
   darker_black = "#f5efde",
   black = "#fff9e8", --  nvim bg
-  black2 = "#ebe5d4",
-  one_bg = "#c6c2aa",
-  one_bg2 = "#b6b29a",
-  one_bg3 = "#a6a28a",
-  grey = "#a6b0a0",
-  grey_fg = "#939f91",
-  grey_fg2 = "#829181",
-  light_grey = "#798878",
+  black2 = "#F0EAD9",
+  one_bg = "#E0DAC9",
+  one_bg2 = "#D1CBBA",
+  one_bg3 = "#C2BCAB",
+  grey = "#B3AD9C",
+  grey_fg = "#A39D8C",
+  grey_fg2 = "#948E7D",
+  light_grey = "#857F6E",
   red = "#c85552",
   baby_pink = "#ce8196",
   pink = "#ef6590",
diff --git a/lua/base46/themes/falcon.lua b/lua/base46/themes/falcon.lua
index 711cc40..fd42f16 100644
--- a/lua/base46/themes/falcon.lua
+++ b/lua/base46/themes/falcon.lua
@@ -7,9 +7,9 @@ M.base_30 = {
   white = "#F8F8FF",
   white2 = "#DFDFE5",
   tan = "#CFC1B2",
-  darker_black = "#000015",
+  darker_black = "#0c0c2d",
   black = "#020222", --  nvim bg
-  black2 = "#0b0b2b",
+  black2 = "#1A1A3A",
   one_bg = "#161636",
   one_bg2 = "#202040",
   one_bg3 = "#2a2a4a",
diff --git a/lua/base46/themes/github_dark.lua b/lua/base46/themes/github_dark.lua
index e353ffa..3330aee 100644
--- a/lua/base46/themes/github_dark.lua
+++ b/lua/base46/themes/github_dark.lua
@@ -45,12 +45,12 @@ M.base_16 = {
   base05 = "#c9d1d9", -- Default fg (caret, delimiters, Operators)
   base06 = "#d3dbe3", -- Light fg (not often used)
   base07 = "#dde5ed", -- Light bg (not often used)
-  base08 = "#83caff", -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+  base08 = "#B392E9", -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
   base09 = "#ffab70", -- Integers, Boolean, Constants, XML Attributes, Markup Link Url
   base0A = "#ffdf5d", -- Classes, Markup Bold, Search Text Background
   base0B = "#a5d6ff", -- Strings, Inherited Class, Markup Code, Diff Inserted
   base0C = "#83caff", -- Support, regex, escape chars
-  base0D = "#b9a6ff", -- Function, methods, headings
+  base0D = "#6AB1F0", -- Function, methods, headings
   base0E = "#ff7f8d", -- Keywords
   base0F = "#85e89d", -- Deprecated, open/close embedded tags
 }
@@ -58,11 +58,11 @@ M.base_16 = {
 M.type = "dark"
 
 M.polish_hl = {
-  PmenuSel = {
-    fg = M.base_30.white,
+  ["@punctuation.bracket"] = {
+    fg = M.base_30.orange,
   },
 
-  ["@punctuation.bracket"] = {
+  ["@string"] = {
     fg = M.base_30.white,
   },
 
diff --git a/lua/base46/themes/github_light.lua b/lua/base46/themes/github_light.lua
index 12f4088..28c0a3f 100644
--- a/lua/base46/themes/github_light.lua
+++ b/lua/base46/themes/github_light.lua
@@ -45,21 +45,21 @@ M.base_16 = {
   base05 = "#383d42", -- Default fg (caret, delimiters, Operators)
   base06 = "#2e3338", -- Light fg (not often used)
   base07 = "#24292e", -- Light bg (not often used)
-  base08 = "#044289", -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+  base08 = "#5a32a3", -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
   base09 = "#b93a86", -- Integers, Boolean, Constants, XML Attributes, Markup Link Url
   base0A = "#b08800", -- Classes, Markup Bold, Search Text Background
   base0B = "#4c2889", -- Strings, Inherited Class, Markup Code, Diff Inserted
   base0C = "#8263EB", -- Support, regex, escape chars
   base0D = "#005cc5", -- Function, methods, headings
   base0E = "#DE2C2E", -- Keywords
-  base0F = "#18654B", -- Deprecated, open/close embedded tags
+  base0F = "#044289", -- Deprecated, open/close embedded tags
 }
 
 M.type = "light"
 
 M.polish_hl = {
   ["@punctuation.bracket"] = {
-    fg = M.base_30.folder_bg,
+    fg = M.base_30.blue,
   },
 
   ["@field.key"] = {
@@ -77,6 +77,10 @@ M.polish_hl = {
   Tag = {
     fg = M.base_30.vibrant_green,
   },
+
+  ["@operator"] = {
+    fg = M.base_30.orange
+  }
 }
 
 M = require("base46").override_theme(M, "github_light")
diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
deleted file mode 100644
index 0851df6..0000000
--- a/lua/base46/themes/gruvbox_material.lua
+++ /dev/null
@@ -1,66 +0,0 @@
-local M = {}
-
-M.base_30 = {
-  white = "#ebdbb2",
-  darker_black = "#222222",
-  black = "#282828", --  nvim bg
-  black2 = "#2e2e2e",
-  one_bg = "#323232",
-  one_bg2 = "#3b3b3b",
-  one_bg3 = "#434343",
-  grey = "#505050",
-  grey_fg = "#5a5a5a",
-  grey_fg2 = "#646464",
-  light_grey = "#6c6c6c",
-  red = "#ea6962",
-  baby_pink = "#ce8196",
-  pink = "#ff75a0",
-  line = "#373737", -- for lines like vertsplit
-  green = "#89b482",
-  vibrant_green = "#a9b665",
-  nord_blue = "#6f8faf",
-  blue = "#6d8dad",
-  yellow = "#d8a657",
-  sun = "#eab869",
-  purple = "#d3869b",
-  dark_purple = "#d3869b",
-  teal = "#749689",
-  orange = "#e78a4e",
-  cyan = "#89b482",
-  statusline_bg = "#2c2c2c",
-  lightbg = "#393939",
-  pmenu_bg = "#89b482",
-  folder_bg = "#6d8dad",
-}
-
-M.base_16 = {
-  base0A = "#d8a657",
-  base04 = "#d4be98",
-  base07 = "#c7b89d",
-  base05 = "#c0b196",
-  base0E = "#ea6962",
-  base0D = "#a9b665",
-  base0C = "#89b482",
-  base0B = "#89b482",
-  base02 = "#323232",
-  base0F = "#dd8044",
-  base03 = "#434343",
-  base08 = "#7daea3",
-  base01 = "#2e2e2e",
-  base00 = "#282828",
-  base09 = "#e78a4e",
-  base06 = "#d4be98",
-}
-
-M.polish_hl = {
-  Include = { fg = M.base_16.base0E },
-  Repeat = { fg = M.base_16.base0E },
-  ["@variable"] = { fg = M.base_16.base08 },
-  ["@property"] = { fg = M.base_16.base0C },
-}
-
-M.type = "dark"
-
-M = require("base46").override_theme(M, "gruvbox_material")
-
-return M
diff --git a/lua/base46/themes/gruvchad.lua b/lua/base46/themes/gruvchad.lua
index b4b0743..b9023ba 100644
--- a/lua/base46/themes/gruvchad.lua
+++ b/lua/base46/themes/gruvchad.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/sainnhe/gruvbox-material
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
@@ -34,22 +37,22 @@ M.base_30 = {
 }
 
 M.base_16 = {
-  base0A = "#e0c080",
-  base04 = "#d4be98",
-  base07 = "#c7b89d",
-  base05 = "#c0b196",
-  base0E = "#d3869b",
-  base0D = "#7daea3",
-  base0C = "#86b17f",
-  base0B = "#a9b665",
+  base00 = "#1e2122",
+  base01 = "#2c2f30",
   base02 = "#36393a",
-  base0F = "#d65d0e",
   base03 = "#404344",
+  base04 = "#d4be98",
+  base05 = "#c0b196",
+  base06 = "#c3b499",
+  base07 = "#c7b89d",
   base08 = "#ec6b64",
-  base01 = "#2c2f30",
-  base00 = "#1e2122",
   base09 = "#e78a4e",
-  base06 = "#c3b499",
+  base0A = "#e0c080",
+  base0B = "#a9b665",
+  base0C = "#86b17f",
+  base0D = "#7daea3",
+  base0E = "#d3869b",
+  base0F = "#d65d0e",
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/jellybeans.lua b/lua/base46/themes/jellybeans.lua
index 4a78cb1..f8fedfd 100644
--- a/lua/base46/themes/jellybeans.lua
+++ b/lua/base46/themes/jellybeans.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/NTBBloodbath/doom-one.nvim
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
@@ -42,11 +45,11 @@ M.base_16 = {
   base05 = "#d9d9c4",
   base06 = "#dedec9",
   base07 = "#f1f1e5",
-  base08 = "#dd785a",
+  base08 = "#C6B5DA",
   base09 = "#c99f4a",
   base0A = "#e1b655",
   base0B = "#99ad6a",
-  base0C = "#7187af",
+  base0C = "#99ad6a",
   base0D = "#8fa5cd",
   base0E = "#e18be1",
   base0F = "#cf6a4c",
diff --git a/lua/base46/themes/pastelbeans.lua b/lua/base46/themes/pastelbeans.lua
new file mode 100644
index 0000000..21e1d25
--- /dev/null
+++ b/lua/base46/themes/pastelbeans.lua
@@ -0,0 +1,61 @@
+-- This theme was made by chatgpt on the request of creating base16 for jellybeans 
+
+local M = {}
+
+M.base_30 = {
+  white = "#e8e8d3",
+  darker_black = "#101010",
+  black = "#151515", --  nvim bg
+  black2 = "#1c1c1c",
+  one_bg = "#252525",
+  one_bg2 = "#2e2e2e",
+  one_bg3 = "#3a3a3a",
+  grey = "#424242",
+  grey_fg = "#474747",
+  grey_fg2 = "#4c4c4c",
+  light_grey = "#525252",
+  red = "#cf6a4c",
+  baby_pink = "#da7557",
+  pink = "#f0a0c0",
+  line = "#2d2d2d", -- for lines like vertsplit
+  green = "#99ad6a",
+  vibrant_green = "#c2cea6",
+  nord_blue = "#768cb4",
+  blue = "#8197bf",
+  yellow = "#fad07a",
+  sun = "#ffb964",
+  purple = "#ea94ea",
+  dark_purple = "#e58fe5",
+  teal = "#668799",
+  orange = "#e78a4e",
+  cyan = "#8fbfdc",
+  statusline_bg = "#191919",
+  lightbg = "#2c2c2c",
+  pmenu_bg = "#8197bf",
+  folder_bg = "#8197bf",
+}
+
+M.base_16 = {
+  base00 = "#151515",
+  base01 = "#202020",
+  base02 = "#303030",
+  base03 = "#505050",
+  base04 = "#b0b0b0",
+  base05 = "#d0d0d0",
+  base06 = "#e0e0e0",
+  base07 = "#f5f5f5",
+  base08 = "#ff9da4",
+  base09 = "#ff9d00",
+  base0A = "#ffd700",
+  base0B = "#d1f1a9",
+  base0C = "#99ffff",
+  base0D = "#bbdaff",
+  base0E = "#ebbbff",
+  base0F = "#ff79c6",
+}
+
+M.type = "dark"
+
+M = require("base46").override_theme(M, "jellybeans")
+
+return M
diff --git a/lua/base46/themes/tokyonight.lua b/lua/base46/themes/tokyonight.lua
index f89eb47..14e4c3c 100644
--- a/lua/base46/themes/tokyonight.lua
+++ b/lua/base46/themes/tokyonight.lua
@@ -53,9 +53,9 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  ["@variable"] = { fg = M.base_30.red },
+  ["@variable"] = { fg = M.base_16.base05 },
   ["@function.builtin"] = { fg = M.base_30.cyan },
-  ["@parameter"] = { fg = M.base_30.white },
+  ["@parameter"] = { fg = M.base_30.red },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/vscode_dark.lua b/lua/base46/themes/vscode_dark.lua
index ddcc871..e4631ea 100644
--- a/lua/base46/themes/vscode_dark.lua
+++ b/lua/base46/themes/vscode_dark.lua
@@ -59,7 +59,7 @@ M.polish_hl = {
   ["@parameter"] = { fg = M.base_30.blue },
   ["@keyword"] = { fg = M.base_30.blue },
   ["@variable"] = { fg = M.base_30.cyan },
-  ["@fieldkey"] = { fg = M.base_30.green1 },
+  ["@field.key"] = { fg = M.base_30.green1 },
   ["@keywordreturn"] = { fg = M.base_16.base0E },
   ["@keywordfunction"] = { fg = M.base_30.teal },
 }