diff --git a/lua/base46/themes/github_dark.lua b/lua/base46/themes/github_dark.lua
new file mode 100644
index 0000000..7293a25
--- /dev/null
+++ b/lua/base46/themes/github_dark.lua
@@ -0,0 +1,85 @@
+-- credits to original theme for existing https://github.com/primer/github-vscode-theme
+-- This is a modified version of it
+
+local M = {}
+
+M.base_30 = {
+  white = "#d3dbe3",
+  darker_black = "#1F2428",
+  black = "#24292E", --  nvim bg
+  black2 = "#2e3338",
+  one_bg = "#33383d",
+  one_bg2 = "#383d42", -- StatusBar (filename)
+  one_bg3 = "#42474c",
+  grey = "#4c5156", -- Line numbers (shouldn't be base01?)
+  grey_fg = "#565b60", -- Why this affects comments?
+  grey_fg2 = "#60656a",
+  light_grey = "#6a6f74",
+  red = "#ff7f8d", -- StatusBar (username)
+  baby_pink = "#ffa198",
+  pink = "#ec6cb9",
+  line = "#33383d", -- for lines like vertsplit
+  green = "#56d364", -- StatusBar (file percentage)
+  vibrant_green = "#85e89d",
+  nord_blue = "#58a6ff", -- Mode indicator
+  blue = "#79c0ff",
+  yellow = "#ffdf5d",
+  sun = "#ffea7f",
+  purple = "#d2a8ff",
+  dark_purple = "#bc8cff",
+  teal = "#39c5cf",
+  orange = "#ffab70",
+  cyan = "#56d4dd",
+  statusline_bg = "#2b3035",
+  lightbg = "#383d42",
+  pmenu_bg = "#3d4147", -- Command bar suggestions
+  folder_bg = "#58a6ff",
+}
+
+M.base_16 = {
+  base00 = "#24292E", -- Default bg
+  base01 = "#33383d", -- Lighter bg (status bar, line number, folding mks)
+  base02 = "#383d42", -- Selection bg
+  base03 = "#42474c", -- Comments, invisibles, line hl
+  base04 = "#4c5156", -- Dark fg (status bars)
+  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
+  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
+  base0E = "#ff7f8d", -- Keywords
+  base0F = "#85e89d", -- Deprecated, open/close embedded tags
+}
+
+vim.opt.bg = "dark"
+
+M.polish_hl = {
+  PmenuSel = {
+    fg = M.base_30.white,
+  },
+
+  ["@punctuation.bracket"] = {
+    fg = M.base_30.white,
+  },
+
+  ["@field.key"] = {
+    fg = M.base_30.white,
+  },
+
+  ["@constructor"] = {
+    fg = M.base_30.vibrant_green,
+    bold = true,
+  },
+
+  ["@tag.attribute"] = {
+    link = "@method",
+  },
+}
+
+M = require("base46").override_theme(M, "github_dark")
+
+return M
diff --git a/lua/base46/themes/github_light.lua b/lua/base46/themes/github_light.lua
new file mode 100644
index 0000000..aa1bda5
--- /dev/null
+++ b/lua/base46/themes/github_light.lua
@@ -0,0 +1,84 @@
+-- credits to original theme for existing https://github.com/primer/github-vscode-theme
+-- This is a modified version of it
+
+local M = {}
+
+M.base_30 = {
+  white = "#24292e",
+  darker_black = "#f3f5f7",
+  black = "#ffffff", --  nvim bg
+  black2 = "#edeff1",
+  one_bg = "#eaecee",
+  one_bg2 = "#e1e3e5", -- StatusBar (filename)
+  one_bg3 = "#d7d9db",
+  grey = "#c7c9cb", -- Line numbers )
+  grey_fg = "#bcbec0",
+  grey_fg2 = "#b1b3b5",
+  light_grey = "#a6a8aa",
+  red = "#DE2C2E", -- StatusBar (username)
+  baby_pink = "#ea4aaa",
+  pink = "#b93a86",
+  line = "#eaecee", -- for lines like vertsplit
+  green = "#18654B", 
+  vibrant_green = "#28a745",
+  nord_blue = "#0366d6", -- Mode indicator
+  blue = "#0D7FDD",
+  yellow = "#dbab09",
+  sun = "#f9c513",
+  purple = "#8263EB",
+  dark_purple = "#5a32a3",
+  teal = "#22839b",
+  orange = "#d15704",
+  cyan = "#0598bc",
+  statusline_bg = "#edeff1",
+  lightbg = "#e1e3e5",
+  pmenu_bg = "#8263EB",
+  folder_bg = "#6a737d",
+}
+
+M.base_16 = {
+  base00 = "#ffffff", -- Default bg
+  base01 = "#edeff1", -- Lighter bg (status bar, line number, folding mks)
+  base02 = "#e1e3e5", -- Selection bg
+  base03 = "#d7d9db", -- Comments, invisibles, line hl
+  base04 = "#c7c9cb", -- Dark fg (status bars)
+  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
+  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
+}
+
+vim.opt.bg = "light"
+
+M.polish_hl = {
+  ["@punctuation.bracket"] = {
+    fg = M.base_30.folder_bg,
+  },
+
+  ["@field.key"] = {
+    fg = M.base_30.white,
+  },
+
+  Constant = {
+    fg = M.base_16.base07,
+  },
+
+  ["@constructor"] = {
+    fg = M.base_30.vibrant_green,
+  },
+
+  Tag = {
+    fg = M.base_30.vibrant_green,
+  },
+}
+
+M = require("base46").override_theme(M, "github_light")
+
+return M