From b2011ca877291e6f5b774099168672c60603eafa Mon Sep 17 00:00:00 2001
From: Mrcuve0 <36898760+Mrcuve0@users.noreply.github.com>
Date: Thu, 1 Sep 2022 20:43:34 +0200
Subject: [PATCH 1/4] Add "light" and "dark_default" basic themes

---
 lua/base46/themes/github_dark_default.lua | 76 ++++++++++++++++++++++
 lua/base46/themes/github_light.lua        | 77 +++++++++++++++++++++++
 2 files changed, 153 insertions(+)
 create mode 100644 lua/base46/themes/github_dark_default.lua
 create mode 100644 lua/base46/themes/github_light.lua

diff --git a/lua/base46/themes/github_dark_default.lua b/lua/base46/themes/github_dark_default.lua
new file mode 100644
index 0000000..5ed1d70
--- /dev/null
+++ b/lua/base46/themes/github_dark_default.lua
@@ -0,0 +1,76 @@
+--
+local M = {}
+
+M.base_30 = {
+  white = "#c9d1d9",
+  darker_black = "#010409",
+  black = "#0d1117", --  nvim bg
+  black2 = "#2d3139",
+  one_bg = "#20262c",
+  one_bg2 = "#30363d", -- StatusBar (filename)
+  one_bg3 = "#c5cbd3",
+  grey = "#6e7681", -- Line numbers (shouldn't be base01?)
+  grey_fg = "#8b949e", -- Why this affects comments?
+  grey_fg2 = "#99a4b2",
+  light_grey = "#8b97a7",
+  red = "#ff7b72", -- StatusBar (username)
+  baby_pink = "#ffb8b3",
+  pink = "#d2a8ff",
+  line = "#30363d", -- for lines like vertsplit
+  green = "#3fb950", -- StatusBar (file percentage)
+  vibrant_green = "#56d364",
+  nord_blue = "#58a6ff", -- Mode indicator
+  blue = "#79c0ff",
+  yellow = "#e3b341", --"#d29922",
+  sun = "#d29922", --"#e3b341",
+  purple = "#8965cd",
+  dark_purple = "#5a32a3",
+  teal = "#39c5cf",
+  orange = "#ffa657",
+  cyan = "#56d4dd",
+  statusline_bg = "#0d1117",
+  lightbg = "#30363d",
+  pmenu_bg = "#c5cbd3", -- Command bar suggestions
+  folder_bg = "#8b949e",
+}
+
+M.base_16 = {
+  base00 = "#0d1117", -- Default bg
+  base01 = "#010409", -- Lighter bg (status bar, line number, folding mks)
+  base02 = "#193047", -- Selection bg
+  base03 = "#8b949e", -- Comments, invisibles, line hl
+  base04 = "#666666", -- Dark fg (status bars)
+  base05 = "#c9d1d9", -- Default fg (caret, delimiters, Operators)
+  base06 = "#c9d1d9", -- Light fg (not often used)
+  base07 = "#0d1117", -- Light bg (not often used)
+  base08 = "#ffa657", -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+-- Change "Variables" with "parameters"
+  base09 = "#4cb0ff", -- Integers, Boolean, Constants, XML Attributes, Markup Link Url
+  base0A = "#ff7b72", -- Classes, Markup Bold, Search Text Background
+  base0B = "#a5d6ff", -- Strings, Inherited Class, Markup Code, Diff Inserted
+  -- "%p" should be recognized as 
+  base0C = "#79c0ff", -- Support, regex, escape chars
+  base0D = "#b9a6ff", -- Function, methods, headings
+  -- #include should not be parsed as a heading if .c
+  base0E = "#ff7b72", -- Keywords
+  base0F = "#c9d1d9", -- Deprecated, open/close embedded tags
+}
+
+vim.opt.bg = "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 },
+  TSVariableBuiltin = { fg = M.base_30.red },
+  TSProperty = { fg = M.base_30.teal },
+}
+
+M = require("base46").override_theme(M, "github_light")
+
+return M
diff --git a/lua/base46/themes/github_light.lua b/lua/base46/themes/github_light.lua
new file mode 100644
index 0000000..2000fcf
--- /dev/null
+++ b/lua/base46/themes/github_light.lua
@@ -0,0 +1,77 @@
+
+local M = {}
+
+M.base_30 = {
+  white = "#24292e",
+  darker_black = "#f6f8fa",
+  black = "#ffffff", --  nvim bg
+  -- black2 = "#f6f8fa",
+  black2 = "#d4d8de",
+  one_bg = "#e1e4e8",
+  one_bg2 = "#d4d8de", -- StatusBar (filename)
+  one_bg3 = "#c5cbd3",
+  grey = "#babbbd", -- Line numbers (shouldn't be base01?)
+  grey_fg = "#6a737d", -- Why this affects comments?
+  grey_fg2 = "#99a4b2",
+  light_grey = "#8b97a7",
+  red = "#cb2431", -- StatusBar (username)
+  baby_pink = "#fae5e7",
+  pink = "#dd3c49",
+  line = "#babbbd", -- for lines like vertsplit
+  green = "#28a745", -- StatusBar (file percentage)
+  vibrant_green = "#d4f8db",
+  nord_blue = "#044289", -- Mode indicator
+  blue = "#005cc5",
+  yellow = "#b08800",
+  sun = "#dbab09",
+  purple = "#6f42c1",
+  dark_purple = "#5a32a3",
+  teal = "#3192aa",
+  orange = "#e36209",
+  cyan = "#0598bc",
+  statusline_bg = "#e1e4e8",
+  lightbg = "#d4d8de",
+  pmenu_bg = "#032f62",
+  folder_bg = "#6a737d",
+}
+
+M.base_16 = {
+  base00 = "#ffffff", -- Default bg
+  base01 = "#f6f8fa", -- Lighter bg (status bar, line number, folding mks)
+  base02 = "#dbe9f9", -- Selection bg
+  base03 = "#6a737d", -- Comments, invisibles, line hl
+  base04 = "#666666", -- Dark fg (status bars)
+  base05 = "#24292e", -- Default fg (caret, delimiters, Operators)
+  base06 = "#24292e", -- Light fg (not often used)
+  base07 = "#ffffff", -- Light bg (not often used)
+  base08 = "#e36209", -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+  -- Change "Variables" with "parameters"
+  base09 = "#005cc5", -- Integers, Boolean, Constants, XML Attributes, Markup Link Url
+  base0A = "#b31d28", -- Classes, Markup Bold, Search Text Background
+  base0B = "#032f62", -- Strings, Inherited Class, Markup Code, Diff Inserted
+  -- "%p" should be recognized as 
+  base0C = "#005cc5", -- Support, regex, escape chars
+  base0D = "#6f42c1", -- Function, methods, headings
+  -- #include should not be parsed as a heading if .c
+  base0E = "#d73a49", -- Keywords
+  base0F = "#24292e", -- Deprecated, open/close embedded tags
+}
+
+vim.opt.bg = "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 },
+  TSVariableBuiltin = { fg = M.base_30.red },
+  TSProperty = { fg = M.base_30.teal },
+}
+
+M = require("base46").override_theme(M, "github_light")
+
+return M

From 8ab87b12415eca62f4c2122776588bfec6df5d69 Mon Sep 17 00:00:00 2001
From: Sidhanth Rathod <siduck@tutanota.com>
Date: Sat, 12 Nov 2022 08:11:15 +0530
Subject: [PATCH 2/4] Improve github dark theme

---
 lua/base46/themes/github_dark_default.lua | 102 ++++++++++++----------
 1 file changed, 58 insertions(+), 44 deletions(-)

diff --git a/lua/base46/themes/github_dark_default.lua b/lua/base46/themes/github_dark_default.lua
index 5ed1d70..5c53af5 100644
--- a/lua/base46/themes/github_dark_default.lua
+++ b/lua/base46/themes/github_dark_default.lua
@@ -1,76 +1,90 @@
---
+-- 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 = "#c9d1d9",
   darker_black = "#010409",
   black = "#0d1117", --  nvim bg
-  black2 = "#2d3139",
-  one_bg = "#20262c",
-  one_bg2 = "#30363d", -- StatusBar (filename)
-  one_bg3 = "#c5cbd3",
-  grey = "#6e7681", -- Line numbers (shouldn't be base01?)
-  grey_fg = "#8b949e", -- Why this affects comments?
-  grey_fg2 = "#99a4b2",
-  light_grey = "#8b97a7",
+  black2 = "#1a1e24",
+  one_bg = "#1c2026",
+  one_bg2 = "#262a30", -- StatusBar (filename)
+  one_bg3 = "#30343a",
+  grey = "#3d4147", -- Line numbers (shouldn't be base01?)
+  grey_fg = "#494d53", -- Why this affects comments?
+  grey_fg2 = "#53575d",
+  light_grey = "#5d6167",
   red = "#ff7b72", -- StatusBar (username)
-  baby_pink = "#ffb8b3",
-  pink = "#d2a8ff",
-  line = "#30363d", -- for lines like vertsplit
-  green = "#3fb950", -- StatusBar (file percentage)
-  vibrant_green = "#56d364",
+  baby_pink = "#ffa198",
+  pink = "#ec6cb9",
+  line = "#1c2026", -- for lines like vertsplit
+  green = "#56d364", -- StatusBar (file percentage)
+  vibrant_green = "#85e89d",
   nord_blue = "#58a6ff", -- Mode indicator
   blue = "#79c0ff",
   yellow = "#e3b341", --"#d29922",
   sun = "#d29922", --"#e3b341",
-  purple = "#8965cd",
-  dark_purple = "#5a32a3",
+  purple = "#d2a8ff",
+  dark_purple = "#bc8cff",
   teal = "#39c5cf",
   orange = "#ffa657",
   cyan = "#56d4dd",
-  statusline_bg = "#0d1117",
-  lightbg = "#30363d",
-  pmenu_bg = "#c5cbd3", -- Command bar suggestions
-  folder_bg = "#8b949e",
+  statusline_bg = "#171b21",
+  lightbg = "#262a30",
+  pmenu_bg = "#3d4147", -- Command bar suggestions
+  folder_bg = "#58a6ff",
 }
 
 M.base_16 = {
   base00 = "#0d1117", -- Default bg
-  base01 = "#010409", -- Lighter bg (status bar, line number, folding mks)
-  base02 = "#193047", -- Selection bg
-  base03 = "#8b949e", -- Comments, invisibles, line hl
-  base04 = "#666666", -- Dark fg (status bars)
+  base01 = "#1c2026", -- Lighter bg (status bar, line number, folding mks)
+  base02 = "#262a30", -- Selection bg
+  base03 = "#30343a", -- Comments, invisibles, line hl
+  base04 = "#3d4147", -- Dark fg (status bars)
   base05 = "#c9d1d9", -- Default fg (caret, delimiters, Operators)
-  base06 = "#c9d1d9", -- Light fg (not often used)
-  base07 = "#0d1117", -- Light bg (not often used)
-  base08 = "#ffa657", -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
--- Change "Variables" with "parameters"
+  base06 = "#d3dbe3", -- Light fg (not often used)
+  base07 = "#dde5ed", -- Light bg (not often used)
+  base08 = "#79c0ff", -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
   base09 = "#4cb0ff", -- Integers, Boolean, Constants, XML Attributes, Markup Link Url
-  base0A = "#ff7b72", -- Classes, Markup Bold, Search Text Background
+  base0A = "#e3b341", -- Classes, Markup Bold, Search Text Background
   base0B = "#a5d6ff", -- Strings, Inherited Class, Markup Code, Diff Inserted
-  -- "%p" should be recognized as 
   base0C = "#79c0ff", -- Support, regex, escape chars
   base0D = "#b9a6ff", -- Function, methods, headings
-  -- #include should not be parsed as a heading if .c
   base0E = "#ff7b72", -- Keywords
-  base0F = "#c9d1d9", -- Deprecated, open/close embedded tags
+  base0F = "#ffa657", -- Deprecated, open/close embedded tags
 }
 
-vim.opt.bg = "light"
+vim.opt.bg = "dark"
 
 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 },
-  TSVariableBuiltin = { fg = M.base_30.red },
-  TSProperty = { fg = M.base_30.teal },
+  PmenuSel = {
+    fg = M.base_30.white,
+  },
+
+  ["@punctuation.bracket"] = {
+    fg = M.base_30.white,
+  },
+
+  ["@field.key"] = {
+    fg = M.base_30.white,
+  },
+
+  Constant = {
+    fg = M.base_16.base07,
+  },
+
+  ["@constructor"] = {
+    fg = M.base_30.vibrant_green,
+    bold = true,
+  },
+
+  Tag = {
+    bold = true,
+    fg = M.base_30.vibrant_green,
+  },
 }
 
-M = require("base46").override_theme(M, "github_light")
+M = require("base46").override_theme(M, "github_dark_default")
 
 return M

From 8ba2ae7e41ba587e5a25c7fd14ba81b18b3d8223 Mon Sep 17 00:00:00 2001
From: Sidhanth Rathod <siduck@tutanota.com>
Date: Sat, 12 Nov 2022 11:10:37 +0530
Subject: [PATCH 3/4] Polish github_light theme

---
 lua/base46/themes/github_light.lua | 115 +++++++++++++++--------------
 1 file changed, 61 insertions(+), 54 deletions(-)

diff --git a/lua/base46/themes/github_light.lua b/lua/base46/themes/github_light.lua
index 2000fcf..aa1bda5 100644
--- a/lua/base46/themes/github_light.lua
+++ b/lua/base46/themes/github_light.lua
@@ -1,75 +1,82 @@
+-- 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 = "#f6f8fa",
+  darker_black = "#f3f5f7",
   black = "#ffffff", --  nvim bg
-  -- black2 = "#f6f8fa",
-  black2 = "#d4d8de",
-  one_bg = "#e1e4e8",
-  one_bg2 = "#d4d8de", -- StatusBar (filename)
-  one_bg3 = "#c5cbd3",
-  grey = "#babbbd", -- Line numbers (shouldn't be base01?)
-  grey_fg = "#6a737d", -- Why this affects comments?
-  grey_fg2 = "#99a4b2",
-  light_grey = "#8b97a7",
-  red = "#cb2431", -- StatusBar (username)
-  baby_pink = "#fae5e7",
-  pink = "#dd3c49",
-  line = "#babbbd", -- for lines like vertsplit
-  green = "#28a745", -- StatusBar (file percentage)
-  vibrant_green = "#d4f8db",
-  nord_blue = "#044289", -- Mode indicator
-  blue = "#005cc5",
-  yellow = "#b08800",
-  sun = "#dbab09",
-  purple = "#6f42c1",
+  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 = "#3192aa",
-  orange = "#e36209",
+  teal = "#22839b",
+  orange = "#d15704",
   cyan = "#0598bc",
-  statusline_bg = "#e1e4e8",
-  lightbg = "#d4d8de",
-  pmenu_bg = "#032f62",
+  statusline_bg = "#edeff1",
+  lightbg = "#e1e3e5",
+  pmenu_bg = "#8263EB",
   folder_bg = "#6a737d",
 }
 
 M.base_16 = {
   base00 = "#ffffff", -- Default bg
-  base01 = "#f6f8fa", -- Lighter bg (status bar, line number, folding mks)
-  base02 = "#dbe9f9", -- Selection bg
-  base03 = "#6a737d", -- Comments, invisibles, line hl
-  base04 = "#666666", -- Dark fg (status bars)
-  base05 = "#24292e", -- Default fg (caret, delimiters, Operators)
-  base06 = "#24292e", -- Light fg (not often used)
-  base07 = "#ffffff", -- Light bg (not often used)
-  base08 = "#e36209", -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
-  -- Change "Variables" with "parameters"
-  base09 = "#005cc5", -- Integers, Boolean, Constants, XML Attributes, Markup Link Url
-  base0A = "#b31d28", -- Classes, Markup Bold, Search Text Background
-  base0B = "#032f62", -- Strings, Inherited Class, Markup Code, Diff Inserted
-  -- "%p" should be recognized as 
-  base0C = "#005cc5", -- Support, regex, escape chars
-  base0D = "#6f42c1", -- Function, methods, headings
-  -- #include should not be parsed as a heading if .c
-  base0E = "#d73a49", -- Keywords
-  base0F = "#24292e", -- Deprecated, open/close embedded tags
+  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 = {
-  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 },
-  TSVariableBuiltin = { fg = M.base_30.red },
-  TSProperty = { fg = M.base_30.teal },
+  ["@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")

From 7cde623fb0f81a6af676616d91f006817ac164b7 Mon Sep 17 00:00:00 2001
From: Sidhanth Rathod <siduck@tutanota.com>
Date: Sat, 12 Nov 2022 11:35:17 +0530
Subject: [PATCH 4/4] replace github_dark_default with github_dark

---
 lua/base46/themes/github_dark.lua         | 85 +++++++++++++++++++++
 lua/base46/themes/github_dark_default.lua | 90 -----------------------
 2 files changed, 85 insertions(+), 90 deletions(-)
 create mode 100644 lua/base46/themes/github_dark.lua
 delete mode 100644 lua/base46/themes/github_dark_default.lua

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_dark_default.lua b/lua/base46/themes/github_dark_default.lua
deleted file mode 100644
index 5c53af5..0000000
--- a/lua/base46/themes/github_dark_default.lua
+++ /dev/null
@@ -1,90 +0,0 @@
--- 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 = "#c9d1d9",
-  darker_black = "#010409",
-  black = "#0d1117", --  nvim bg
-  black2 = "#1a1e24",
-  one_bg = "#1c2026",
-  one_bg2 = "#262a30", -- StatusBar (filename)
-  one_bg3 = "#30343a",
-  grey = "#3d4147", -- Line numbers (shouldn't be base01?)
-  grey_fg = "#494d53", -- Why this affects comments?
-  grey_fg2 = "#53575d",
-  light_grey = "#5d6167",
-  red = "#ff7b72", -- StatusBar (username)
-  baby_pink = "#ffa198",
-  pink = "#ec6cb9",
-  line = "#1c2026", -- for lines like vertsplit
-  green = "#56d364", -- StatusBar (file percentage)
-  vibrant_green = "#85e89d",
-  nord_blue = "#58a6ff", -- Mode indicator
-  blue = "#79c0ff",
-  yellow = "#e3b341", --"#d29922",
-  sun = "#d29922", --"#e3b341",
-  purple = "#d2a8ff",
-  dark_purple = "#bc8cff",
-  teal = "#39c5cf",
-  orange = "#ffa657",
-  cyan = "#56d4dd",
-  statusline_bg = "#171b21",
-  lightbg = "#262a30",
-  pmenu_bg = "#3d4147", -- Command bar suggestions
-  folder_bg = "#58a6ff",
-}
-
-M.base_16 = {
-  base00 = "#0d1117", -- Default bg
-  base01 = "#1c2026", -- Lighter bg (status bar, line number, folding mks)
-  base02 = "#262a30", -- Selection bg
-  base03 = "#30343a", -- Comments, invisibles, line hl
-  base04 = "#3d4147", -- 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 = "#79c0ff", -- Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
-  base09 = "#4cb0ff", -- Integers, Boolean, Constants, XML Attributes, Markup Link Url
-  base0A = "#e3b341", -- Classes, Markup Bold, Search Text Background
-  base0B = "#a5d6ff", -- Strings, Inherited Class, Markup Code, Diff Inserted
-  base0C = "#79c0ff", -- Support, regex, escape chars
-  base0D = "#b9a6ff", -- Function, methods, headings
-  base0E = "#ff7b72", -- Keywords
-  base0F = "#ffa657", -- 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,
-  },
-
-  Constant = {
-    fg = M.base_16.base07,
-  },
-
-  ["@constructor"] = {
-    fg = M.base_30.vibrant_green,
-    bold = true,
-  },
-
-  Tag = {
-    bold = true,
-    fg = M.base_30.vibrant_green,
-  },
-}
-
-M = require("base46").override_theme(M, "github_dark_default")
-
-return M