From 4eaaf550f3cd1d15e7bfb08d8f7e1ca4bf71a6d7 Mon Sep 17 00:00:00 2001
From: Brian Chen <brianchen8990@gmail.com>
Date: Sun, 16 Oct 2022 21:46:41 +0200
Subject: [PATCH 1/2] feat: add oxocarbon theme

---
 lua/base46/themes/oxocarbon.lua | 75 +++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 lua/base46/themes/oxocarbon.lua

diff --git a/lua/base46/themes/oxocarbon.lua b/lua/base46/themes/oxocarbon.lua
new file mode 100644
index 0000000..396de21
--- /dev/null
+++ b/lua/base46/themes/oxocarbon.lua
@@ -0,0 +1,75 @@
+local M = {}
+
+M.base_30 = {
+  white = "#f2f4f8",
+  darker_black = "#131313",
+  black = "#1E1D2D", --  nvim bg
+  black2 = "#393939",
+  one_bg = "#2d2c3c", -- real bg of onedark
+  one_bg2 = "#363545",
+  one_bg3 = "#3e3d4d",
+  grey = "#474656",
+  grey_fg = "#4e4d5d",
+  grey_fg2 = "#525252",
+  light_grey = "#605f6f",
+  red = "#ee5396",
+  baby_pink = "#ff7eb6",
+  pink = "#be95ff",
+  line = "#383747", -- for lines like vertsplit
+  green = "#42be65",
+  vibrant_green = "#08bdba",
+  nord_blue = "#78a9ff",
+  blue = "#33b1ff",
+  yellow = "#FAE3B0",
+  sun = "#ffe9b6",
+  purple = "#d0a9e5",
+  dark_purple = "#c7a0dc",
+  teal = "#B5E8E0",
+  orange = "#F8BD96",
+  cyan = "#3ddbd9",
+  statusline_bg = "#393939",
+  lightbg = "#262626",
+  pmenu_bg = "#3ddbd9",
+  folder_bg = "#78a9ff",
+  lavender = "#c7d1ff",
+}
+
+M.base_16 = {
+  base00 = "#161616",
+  base01 = "#262626",
+  base02 = "#393939",
+  base03 = "#525252",
+  base04 = "#dde1e6",
+  base05 = "#f2f4f8",
+  base06 = "#ffffff",
+  base07 = "#08bdba",
+  base08 = "#3ddbd9",
+  base09 = "#78a9ff",
+  base0A = "#ee5396",
+  base0B = "#33b1ff",
+  base0C = "#ff7eb6",
+  base0D = "#42be65",
+  base0E = "#be95ff",
+  base0F = "#82cfff",
+}
+
+M.polish_hl = {
+  Function = {
+    fg = M.base_16.base0C,
+    bold = true,
+  },
+  String = {
+    fg = M.base_16.base0E,
+  },
+  TSVariable = { fg = M.base_30.lavender },
+  TSProperty = { fg = M.base_30.teal },
+  TSVariableBuiltin = { fg = M.base_30.red },
+  Operator = { fg = M.base_30.dark_purple },
+  TSAttribute = { fg = M.base_30.purple },
+}
+
+vim.opt.bg = "dark"
+
+M = require("base46").override_theme(M, "oxocarbon")
+
+return M

From df2b1d4e48b95b7555f73830fda09322aec64fa8 Mon Sep 17 00:00:00 2001
From: Sidhanth Rathod <siduck@tutanota.com>
Date: Fri, 11 Nov 2022 08:17:15 +0530
Subject: [PATCH 2/2] Improve oxocarbon theme & add credits

---
 lua/base46/themes/oxocarbon.lua | 42 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/lua/base46/themes/oxocarbon.lua b/lua/base46/themes/oxocarbon.lua
index 396de21..9033479 100644
--- a/lua/base46/themes/oxocarbon.lua
+++ b/lua/base46/themes/oxocarbon.lua
@@ -1,17 +1,20 @@
+-- Credits to original theme for existing https://github.com/shaunsingh/oxocarbon.nvim
+-- this is a modified version of it
+
 local M = {}
 
 M.base_30 = {
   white = "#f2f4f8",
-  darker_black = "#131313",
-  black = "#1E1D2D", --  nvim bg
-  black2 = "#393939",
-  one_bg = "#2d2c3c", -- real bg of onedark
-  one_bg2 = "#363545",
-  one_bg3 = "#3e3d4d",
-  grey = "#474656",
-  grey_fg = "#4e4d5d",
-  grey_fg2 = "#525252",
-  light_grey = "#605f6f",
+  darker_black = "#0f0f0f",
+  black = "#161616", --  nvim bg
+  black2 = "#202020",
+  one_bg = "#2a2a2a", -- real bg of onedark
+  one_bg2 = "#343434",
+  one_bg3 = "#3c3c3c",
+  grey = "#464646",
+  grey_fg = "#4c4c4c",
+  grey_fg2 = "#555555",
+  light_grey = "#5f5f5f",
   red = "#ee5396",
   baby_pink = "#ff7eb6",
   pink = "#be95ff",
@@ -27,8 +30,8 @@ M.base_30 = {
   teal = "#B5E8E0",
   orange = "#F8BD96",
   cyan = "#3ddbd9",
-  statusline_bg = "#393939",
-  lightbg = "#262626",
+  statusline_bg = "#202020",
+  lightbg = "#2a2a2a",
   pmenu_bg = "#3ddbd9",
   folder_bg = "#78a9ff",
   lavender = "#c7d1ff",
@@ -54,18 +57,13 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  Function = {
-    fg = M.base_16.base0C,
-    bold = true,
+  Conditional = {
+    fg = M.base_30.nord_blue,
   },
-  String = {
-    fg = M.base_16.base0E,
+
+  Tag = {
+    fg = M.base_30.white,
   },
-  TSVariable = { fg = M.base_30.lavender },
-  TSProperty = { fg = M.base_30.teal },
-  TSVariableBuiltin = { fg = M.base_30.red },
-  Operator = { fg = M.base_30.dark_purple },
-  TSAttribute = { fg = M.base_30.purple },
 }
 
 vim.opt.bg = "dark"