diff --git a/lua/base46/integrations/treesitter.lua b/lua/base46/integrations/treesitter.lua
index bd752b4..6697f41 100644
--- a/lua/base46/integrations/treesitter.lua
+++ b/lua/base46/integrations/treesitter.lua
@@ -82,6 +82,10 @@ return {
     fg = theme.base0D,
   },
 
+  ["@method.call"] = {
+    fg = theme.base0D,
+  },
+
   ["@namespace"] = {
     fg = theme.base08,
   },
diff --git a/lua/base46/themes/mountain.lua b/lua/base46/themes/mountain.lua
index df6e125..5576677 100644
--- a/lua/base46/themes/mountain.lua
+++ b/lua/base46/themes/mountain.lua
@@ -1,3 +1,6 @@
+-- credit to original theme for existing : https://github.com/mountain-theme/Mountain
+-- NOTE: This is a modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/nightfox.lua b/lua/base46/themes/nightfox.lua
index f01b59d..bbd446f 100644
--- a/lua/base46/themes/nightfox.lua
+++ b/lua/base46/themes/nightfox.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/EdenEast/nightfox.nvim
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
@@ -49,7 +52,14 @@ M.base_16 = {
   base0C = "#7ad4d6",
   base0D = "#86abdc",
   base0E = "#9d79d6",
-  base0F = "#d85e7c",
+  base0F = "#c0c8d5",
+}
+
+M.polish_hl = {
+  ["@field.key"] = { fg = M.base_16.base05 },
+  ["@operator"] = { fg = M.base_30.dark_purple },
+  ["@keyword"] = { fg = M.base_30.teal },
+  ["@parameter"] = { fg = M.base_30.teal },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/nightowl.lua b/lua/base46/themes/nightowl.lua
index 5c4485b..0add592 100644
--- a/lua/base46/themes/nightowl.lua
+++ b/lua/base46/themes/nightowl.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/haishanh/night-owl.vim
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/nord.lua b/lua/base46/themes/nord.lua
index e727cdc..977e486 100644
--- a/lua/base46/themes/nord.lua
+++ b/lua/base46/themes/nord.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/arcticicestudio/nord-vim
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index d47b119..ab0f93f 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -38,22 +38,22 @@ M.base_30 = {
 
 -- Base16 colors taken from:
 M.base_16 = {
-  base00 = "#1B2B34", -- Confirmed
-  base01 = "#343D46", -- Confirmed
-  base02 = "#4F5B66", -- Confirmed
-  base03 = "#65737e", -- Confirmed
-  base04 = "#A7ADBa", -- Confirmed
-  base05 = "#C0C5Ce", -- Confirmed
-  base06 = "#CDD3De", -- Confirmed
-  base07 = "#D8DEE9", -- Confirmed
-  base08 = "#6cbdbc", -- Confirmed
-  base09 = "#FAC863", -- Confirmed
-  base0A = "#F99157", -- Confirmed
-  base0B = "#99C794", -- Confirmed
-  base0C = "#5aaeae", -- Confirmed
-  base0D = "#6699CC", -- Confirmed
-  base0E = "#C594C5", -- Confirmed
-  base0F = "#EC5F67", -- Confirmed
+  base00 = "#1B2B34",
+  base01 = "#343D46",
+  base02 = "#4F5B66",
+  base03 = "#65737e",
+  base04 = "#A7ADBa",
+  base05 = "#C0C5Ce",
+  base06 = "#CDD3De",
+  base07 = "#D8DEE9",
+  base08 = "#6cbdbc",
+  base09 = "#FAC863",
+  base0A = "#F99157",
+  base0B = "#99C794",
+  base0C = "#5aaeae",
+  base0D = "#6699CC",
+  base0E = "#C594C5",
+  base0F = "#EC5F67",
 }
 
 M.polish_hl = {
diff --git a/lua/base46/themes/one_light.lua b/lua/base46/themes/one_light.lua
index f8ca497..c10a1d6 100644
--- a/lua/base46/themes/one_light.lua
+++ b/lua/base46/themes/one_light.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/one-dark
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/onedark.lua b/lua/base46/themes/onedark.lua
index ca553e9..128e113 100644
--- a/lua/base46/themes/onedark.lua
+++ b/lua/base46/themes/onedark.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/one-dark
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/onenord.lua b/lua/base46/themes/onenord.lua
index 31e9f89..24af966 100644
--- a/lua/base46/themes/onenord.lua
+++ b/lua/base46/themes/onenord.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/arcticicestudio/nord-vim
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/palenight.lua b/lua/base46/themes/palenight.lua
index fcc7850..d1c7165 100644
--- a/lua/base46/themes/palenight.lua
+++ b/lua/base46/themes/palenight.lua
@@ -1,3 +1,6 @@
+-- Credits to original theme for existing https://github.com/whizkydee/vscode-palenight-theme
+-- this is a modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/pastelDark.lua b/lua/base46/themes/pastelDark.lua
index 7a46689..6abf833 100644
--- a/lua/base46/themes/pastelDark.lua
+++ b/lua/base46/themes/pastelDark.lua
@@ -54,6 +54,6 @@ M.base_16 = {
 
 M.type = "dark"
 
-M = require("base46").override_theme(M, "javacafe")
+M = require("base46").override_theme(M, "pastelDark")
 
 return M
diff --git a/lua/base46/themes/penumbra_dark.lua b/lua/base46/themes/penumbra_dark.lua
index f1e8b3b..c0b19a3 100644
--- a/lua/base46/themes/penumbra_dark.lua
+++ b/lua/base46/themes/penumbra_dark.lua
@@ -38,10 +38,10 @@ M.base_30 = {
 
 M.base_16 = {
   base00 = "#303338",
-  base01 = "#3d4045",
-  base02 = "#484b50",
-  base03 = "#515459",
-  base04 = "#5c5f64",
+  base01 = "#3a3d42",
+  base02 = "#3d4045",
+  base03 = "#484b50",
+  base04 = "#515459",
   base05 = "#CECECE",
   base06 = "#F2E6D4",
   base07 = "#FFF7ED",
diff --git a/lua/base46/themes/radium.lua b/lua/base46/themes/radium.lua
index 34e6726..ca24352 100644
--- a/lua/base46/themes/radium.lua
+++ b/lua/base46/themes/radium.lua
@@ -1,3 +1,6 @@
+-- credits to original radium theme from https://github.com/dharmx
+-- this is a modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/rosepine.lua b/lua/base46/themes/rosepine.lua
index 2061cd6..cd16863 100644
--- a/lua/base46/themes/rosepine.lua
+++ b/lua/base46/themes/rosepine.lua
@@ -1,3 +1,6 @@
+-- credits to original theme https://rosepinetheme.com/
+-- this is a modified version of it
+
 local M = {}
 
 M.base_30 = {
@@ -36,20 +39,20 @@ M.base_30 = {
 M.base_16 = {
   base00 = "#191724",
   base01 = "#1f1d2e",
-  base02 = "#403d52",
+  base02 = "#26233a",
   base03 = "#6e6a86",
   base04 = "#908caa",
   base05 = "#e0def4",
-  base06 = "#cecacd",
-  base07 = "#fffaf3",
-  base08 = "#e2e1e7",
-  base09 = "#eb6f92",
-  base0A = "#f6c177",
-  base0B = "#ebbcba",
-  base0C = "#4d90ab",
-  base0D = "#93c6cf",
-  base0E = "#c4a7e7",
-  base0F = "#e5e5e5",
+  base06 = "#e0def4",
+  base07 = "#524f67",
+  base08 = "#eb6f92",
+  base09 = "#f6c177",
+  base0A = "#ebbcba",
+  base0B = "#31748f",
+  base0C = "#9ccfd8",
+  base0D = "#c4a7e7",
+  base0E = "#f6c177",
+  base0F = "#524f67",
 }
 
 M = require("base46").override_theme(M, "rosepine")
diff --git a/lua/base46/themes/rxyhn.lua b/lua/base46/themes/rxyhn.lua
index 6f2c817..2b48167 100644
--- a/lua/base46/themes/rxyhn.lua
+++ b/lua/base46/themes/rxyhn.lua
@@ -1,3 +1,6 @@
+-- credits to rice made by https://github.com/rxyhn
+-- This theme is made for @rxyhn's rice :D
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/solarized_dark.lua b/lua/base46/themes/solarized_dark.lua
index 3aa80c9..f696a4e 100644
--- a/lua/base46/themes/solarized_dark.lua
+++ b/lua/base46/themes/solarized_dark.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/altercation/solarized
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
@@ -35,10 +38,10 @@ M.base_30 = {
 
 M.base_16 = {
   base00 = "#002b36",
-  base01 = "#073642",
-  base02 = "#586e75",
-  base03 = "#657b83",
-  base04 = "#839496",
+  base01 = "#06313c",
+  base02 = "#0a3540",
+  base03 = "#133e49",
+  base04 = "#1b4651",
   base05 = "#93a1a1",
   base06 = "#eee8d5",
   base07 = "#fdf6e3",
diff --git a/lua/base46/themes/sweetpastel.lua b/lua/base46/themes/sweetpastel.lua
index 27f8ab8..f576e07 100644
--- a/lua/base46/themes/sweetpastel.lua
+++ b/lua/base46/themes/sweetpastel.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/SweetPastel/pastel
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
diff --git a/lua/base46/themes/tokyodark.lua b/lua/base46/themes/tokyodark.lua
index b26be7d..41564f1 100644
--- a/lua/base46/themes/tokyodark.lua
+++ b/lua/base46/themes/tokyodark.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/tiagovla/tokyodark.nvim
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
@@ -8,14 +11,14 @@ M.base_30 = {
   one_bg = "#1d1e29",
   one_bg2 = "#252631",
   one_bg3 = "#252631",
-  grey = "#40414c",
+  grey = "#474853",
   grey_fg = "#474853",
   grey_fg2 = "#4e4f5a",
   light_grey = "#545560",
   red = "#ee6d85",
   baby_pink = "#fd7c94",
   pink = "#fe6D85",
-  line = "#191a25",
+  line = "#252631",
   green = "#98c379",
   vibrant_green = "#95c561",
   nord_blue = "#648ce1",
diff --git a/lua/base46/themes/tokyonight.lua b/lua/base46/themes/tokyonight.lua
index 14e4c3c..5ecc000 100644
--- a/lua/base46/themes/tokyonight.lua
+++ b/lua/base46/themes/tokyonight.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://github.com/tiagovla/tokyonight.nvim
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
@@ -34,28 +37,31 @@ M.base_30 = {
 }
 
 M.base_16 = {
-  base00 = "#1A1B26",
-  base01 = "#3b4261",
-  base02 = "#3b4261",
-  base03 = "#545c7e",
-  base04 = "#565c64",
+  base00 = "#1a1b26",
+  base01 = "#16161e",
+  base02 = "#2f3549",
+  base03 = "#444b6a",
+  base04 = "#787c99",
   base05 = "#a9b1d6",
-  base06 = "#bbc5f0",
-  base07 = "#c0caf5",
-  base08 = "#f7768e",
+  base06 = "#cbccd1",
+  base07 = "#d5d6db",
+  base08 = "#73daca",
   base09 = "#ff9e64",
-  base0A = "#ffd089",
+  base0A = "#0db9d7",
   base0B = "#9ece6a",
-  base0C = "#2ac3de",
-  base0D = "#7aa2f7",
+  base0C = "#b4f9f8",
+  base0D = "#2ac3de",
   base0E = "#bb9af7",
-  base0F = "#c0caf5",
+  base0F = "#f7768e",
 }
 
 M.polish_hl = {
   ["@variable"] = { fg = M.base_16.base05 },
-  ["@function.builtin"] = { fg = M.base_30.cyan },
-  ["@parameter"] = { fg = M.base_30.red },
+  ["@punctuation.bracket"] = { fg = M.base_30.purple },
+  ["@method.call"] = { fg = M.base_30.red },
+  ["@function.call"] = { fg = M.base_30.blue },
+  ["@constant"] = { fg = M.base_30.orange },
+  ["@parameter"] = { fg = M.base_30.orange },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/tomorrow_night.lua b/lua/base46/themes/tomorrow_night.lua
index 805dbed..7d993c7 100644
--- a/lua/base46/themes/tomorrow_night.lua
+++ b/lua/base46/themes/tomorrow_night.lua
@@ -1,3 +1,6 @@
+-- Credits to original https://chriskempson/tomorrow-theme
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
@@ -34,28 +37,29 @@ M.base_30 = {
 }
 
 M.base_16 = {
-  base0A = "#f0c674",
-  base04 = "#b4b7b4",
-  base07 = "#ffffff",
-  base05 = "#c5c8c6",
-  base0E = "#b294bb",
-  base0D = "#81a2be",
-  base0C = "#8abeb7",
-  base0B = "#b5bd68",
+  base00 = "#1d1f21",
+  base01 = "#282a2e",
   base02 = "#373b41",
-  base0F = "#a3685a",
   base03 = "#969896",
+  base04 = "#b4b7b4",
+  base05 = "#c5c8c6",
+  base06 = "#e0e0e0",
+  base07 = "#ffffff",
   base08 = "#cc6666",
-  base01 = "#282a2e",
-  base00 = "#1d1f21",
   base09 = "#de935f",
-  base06 = "#e0e0e0",
+  base0A = "#f0c674",
+  base0B = "#b5bd68",
+  base0C = "#8abeb7",
+  base0D = "#81a2be",
+  base0E = "#b294bb",
+  base0F = "#a3685a",
 }
 
 M.type = "dark"
 
 M.polish_hl = {
-  PmenuSel = { fg = M.base_30.black, bg = M.base_30.red },
+  ["@function.builtin"] = { fg = M.base_30.yellow },
+  -- ["@punctuation.bracket"] = { fg = M.base_30.yellow },
 }
 
 M = require("base46").override_theme(M, "tomorrow_night")
diff --git a/lua/base46/themes/vscode_dark.lua b/lua/base46/themes/vscode_dark.lua
index e4631ea..f9801f0 100644
--- a/lua/base46/themes/vscode_dark.lua
+++ b/lua/base46/themes/vscode_dark.lua
@@ -1,3 +1,6 @@
+-- Thanks to original theme for existing https://github.com/microsoft/vscode/blob/main/extensions/theme-defaults/themes/dark_plus.json
+-- this is a modified version of it
+
 local M = {}
 
 M.base_30 = {
@@ -55,13 +58,12 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  luaTSField = { fg = M.base_30.teal },
   ["@parameter"] = { fg = M.base_30.blue },
   ["@keyword"] = { fg = M.base_30.blue },
   ["@variable"] = { fg = M.base_30.cyan },
   ["@field.key"] = { fg = M.base_30.green1 },
-  ["@keywordreturn"] = { fg = M.base_16.base0E },
-  ["@keywordfunction"] = { fg = M.base_30.teal },
+  ["@keyword.return"] = { fg = M.base_16.base0E },
+  ["@keyword.function"] = { fg = M.base_30.teal },
 }
 
 M.type = "dark"
diff --git a/lua/base46/themes/wombat.lua b/lua/base46/themes/wombat.lua
index 71f5025..cbabdac 100644
--- a/lua/base46/themes/wombat.lua
+++ b/lua/base46/themes/wombat.lua
@@ -1,3 +1,6 @@
+-- Credits to original theme https://github.com/arcticicestudio/nord-vim
+-- This is modified version of it
+
 local M = {}
 
 M.base_30 = {
@@ -42,21 +45,18 @@ M.base_16 = {
   base05 = "#d6d2c9",
   base06 = "#ddd9d0",
   base07 = "#e4e0d7",
-  base08 = "#FF8F7E",
-  base09 = "#FFCC66",
+  base08 = "#FFCC66",
+  base09 = "#dc8cff",
   base0A = "#efdeab",
   base0B = "#AEE474",
   base0C = "#7EB6BC",
   base0D = "#88B8F6",
-  base0E = "#dc8cff",
+  base0E = "#FF8F7E",
   base0F = "#dc8c64",
 }
 
 M.polish_hl = {
-  ["@include"] = { fg = M.base_30.red },
-  ["@constructor"] = { fg = M.base_30.orange },
-  ["@variable"] = { link = "@constructor" },
-  ["@conditional"] = { link = "@include" },
+  ["@punctuation.bracket"] = { fg = M.base_30.sun },
 }
 
 M.type = "dark"