From e02acd7121b1f39c1066fbf829fa922e400dc300 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Fri, 7 Oct 2022 11:28:56 +0400
Subject: [PATCH 01/23] Created file with dark_horizon as template

---
 lua/base46/themes/oceanic-next.lua | 72 ++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 lua/base46/themes/oceanic-next.lua

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
new file mode 100644
index 0000000..18f0cc3
--- /dev/null
+++ b/lua/base46/themes/oceanic-next.lua
@@ -0,0 +1,72 @@
+local M = {}
+
+M.base_30 = {
+  white = "#FFFFFF",
+  darker_black = "#080808",
+  black = "#0e0e0e", --  nvim bg
+  black2 = "#181818",
+  one_bg = "#1c1c1c",
+  one_bg2 = "#212121",
+  one_bg3 = "#292929",
+  grey = "#363636",
+  grey_fg = "#404040",
+  grey_fg2 = "#4a4a4a",
+  light_grey = "#525252",
+  red = "#dc322f",
+  baby_pink = "#a72e5b",
+  pink = "#ff75a0",
+  line = "#1d1d1d", -- for lines like vertsplit
+  green = "#AAD84C",
+  vibrant_green = "#b9e75b",
+  nord_blue = "#18a3af",
+  blue = "#25B0BC",
+  yellow = "#fdb830",
+  sun = "#ffc038",
+  purple = "#da70d6",
+  dark_purple = "#c65cc2",
+  teal = "#749689",
+  orange = "#FFA500",
+  cyan = "#6BE4E6",
+  statusline_bg = "#181818",
+  lightbg = "#292929",
+  pmenu_bg = "#15bf84",
+  folder_bg = "#07929e",
+}
+
+M.base_16 = {
+  base00 = "#0e0e0e",
+  base01 = "#181818",
+  base02 = "#292929",
+  base03 = "#363636",
+  base04 = "#3f4248",
+  base05 = "#c9c7be",
+  base06 = "#E6E1CF",
+  base07 = "#D9D7CE",
+  base08 = "#D9D7CE", -- Confirmed: Variables Confirmed
+  base09 = "#eaa273", -- Confirmed: Integers, Booleans
+  base0A = "#825aff", -- Classes
+  base0B = "#E3A587", -- Confirmed: Strings
+  base0C = "#F09483", -- Escape characters, Regular expressions
+  base0D = "#FFA500", -- Functions, Methods
+  base0E = "#2ca9b4", -- Confirmed: Keywords, Storage, Selector, Markup
+  base0F = "#d75271", -- Deprecated, Opening/Closing embedded language tags
+}
+
+M.polish_hl = {
+  Include = { fg = M.base_16.base0E, bold = true },
+  TSVariable = { fg = M.base_16.base08 },
+  TSProperty = { fg = M.base_16.base0E },
+  Repeat = { fg = M.base_16.base0E },
+  TSTagDelimiter = { fg = M.base_16.base05 },
+  TSFunction = { fg = M.base_30.orange },
+  luaTSField = { fg = M.base_16.base0E },
+  TSParameter = { fg = M.base_16.base0F },
+  TSConstructor = { fg = M.base_16.base0A },
+  TSTagAttribute = { fg = M.base_16.orange },
+}
+
+vim.opt.bg = "dark"
+
+M = require("base46").override_theme(M, "oceanic-next")
+
+return M

From f4df5fb1c88a2f688fe8a2b8efbf1570f270f17d Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Sun, 9 Oct 2022 13:16:38 +0400
Subject: [PATCH 02/23] Added basic colors from github repo

---
 lua/base46/themes/oceanic-next.lua | 48 +++++++++++++++---------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 18f0cc3..d8038d2 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -1,7 +1,7 @@
 local M = {}
 
 M.base_30 = {
-  white = "#FFFFFF",
+  white = "#ffffff",
   darker_black = "#080808",
   black = "#0e0e0e", --  nvim bg
   black2 = "#181818",
@@ -12,21 +12,21 @@ M.base_30 = {
   grey_fg = "#404040",
   grey_fg2 = "#4a4a4a",
   light_grey = "#525252",
-  red = "#dc322f",
+  red = "#ec5f67", -- Confirmed
   baby_pink = "#a72e5b",
   pink = "#ff75a0",
   line = "#1d1d1d", -- for lines like vertsplit
-  green = "#AAD84C",
+  green = "#99c794", -- Confirmed
   vibrant_green = "#b9e75b",
   nord_blue = "#18a3af",
-  blue = "#25B0BC",
-  yellow = "#fdb830",
+  blue = "#6699cc", -- Confirmed
+  yellow = "#fac863", -- Confirmed
   sun = "#ffc038",
-  purple = "#da70d6",
+  purple = "#c594c5", -- Confirmed
   dark_purple = "#c65cc2",
   teal = "#749689",
-  orange = "#FFA500",
-  cyan = "#6BE4E6",
+  orange = "#f99157", -- Confirmed
+  cyan = "#62b3b2", -- Confirmed
   statusline_bg = "#181818",
   lightbg = "#292929",
   pmenu_bg = "#15bf84",
@@ -34,22 +34,22 @@ M.base_30 = {
 }
 
 M.base_16 = {
-  base00 = "#0e0e0e",
-  base01 = "#181818",
-  base02 = "#292929",
-  base03 = "#363636",
-  base04 = "#3f4248",
-  base05 = "#c9c7be",
-  base06 = "#E6E1CF",
-  base07 = "#D9D7CE",
-  base08 = "#D9D7CE", -- Confirmed: Variables Confirmed
-  base09 = "#eaa273", -- Confirmed: Integers, Booleans
-  base0A = "#825aff", -- Classes
-  base0B = "#E3A587", -- Confirmed: Strings
-  base0C = "#F09483", -- Escape characters, Regular expressions
-  base0D = "#FFA500", -- Functions, Methods
-  base0E = "#2ca9b4", -- Confirmed: Keywords, Storage, Selector, Markup
-  base0F = "#d75271", -- Deprecated, Opening/Closing embedded language tags
+  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 = "#D9D7CE",
+  base09 = "#eaa273",
+  base0A = "#825aff",
+  base0B = "#E3A587",
+  base0C = "#F09483",
+  base0D = "#FFA500",
+  base0E = "#2ca9b4",
+  base0F = "#d75271",
 }
 
 M.polish_hl = {

From e9fe50b55cdef803af25dd46e4ad6238d204a2a7 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Sun, 9 Oct 2022 13:33:24 +0400
Subject: [PATCH 03/23] Cleaned up code

---
 lua/base46/themes/oceanic-next.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index d8038d2..772dc37 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -1,7 +1,7 @@
 local M = {}
 
 M.base_30 = {
-  white = "#ffffff",
+  white = "#ffffff", -- confirmed
   darker_black = "#080808",
   black = "#0e0e0e", --  nvim bg
   black2 = "#181818",

From 8f6ceebe5e3d44bb7bbc663d221b93f498a77e24 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Mon, 10 Oct 2022 01:48:00 +0400
Subject: [PATCH 04/23] Completed base background colors

---
 lua/base46/themes/oceanic-next.lua | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 772dc37..596a422 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -2,18 +2,18 @@ local M = {}
 
 M.base_30 = {
   white = "#ffffff", -- confirmed
-  darker_black = "#080808",
-  black = "#0e0e0e", --  nvim bg
-  black2 = "#181818",
-  one_bg = "#1c1c1c",
-  one_bg2 = "#212121",
-  one_bg3 = "#292929",
-  grey = "#363636",
-  grey_fg = "#404040",
-  grey_fg2 = "#4a4a4a",
-  light_grey = "#525252",
+  darker_black = "#15252e",
+  black = "#1b2b34", --  nvim bg
+  black2 = "#21313a",
+  one_bg = "#25353e",
+  one_bg2 = "#2e3e47",
+  one_bg3 = "#36464f",
+  grey = "#43535c",
+  grey_fg = "#4d5d66",
+  grey_fg2 = "#576770",
+  light_grey = "#5f6f78", -- TESTING
   red = "#ec5f67", -- Confirmed
-  baby_pink = "#a72e5b",
+  baby_pink = "#ff7d85", -- TESTING
   pink = "#ff75a0",
   line = "#1d1d1d", -- for lines like vertsplit
   green = "#99c794", -- Confirmed

From c63e7205e004f6527ccd55601a6379746c41f6f1 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Mon, 10 Oct 2022 02:04:46 +0400
Subject: [PATCH 05/23] Changed colors for status line

---
 lua/base46/themes/oceanic-next.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 596a422..fcf9fc9 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -15,7 +15,7 @@ M.base_30 = {
   red = "#ec5f67", -- Confirmed
   baby_pink = "#ff7d85", -- TESTING
   pink = "#ff75a0",
-  line = "#1d1d1d", -- for lines like vertsplit
+  line = "#2a3a43", -- for lines like vertsplit
   green = "#99c794", -- Confirmed
   vibrant_green = "#b9e75b",
   nord_blue = "#18a3af",
@@ -27,8 +27,8 @@ M.base_30 = {
   teal = "#749689",
   orange = "#f99157", -- Confirmed
   cyan = "#62b3b2", -- Confirmed
-  statusline_bg = "#181818",
-  lightbg = "#292929",
+  statusline_bg = "#1f2f38", -- Confirmed
+  lightbg = "#2c3c45", -- Confirmed
   pmenu_bg = "#15bf84",
   folder_bg = "#07929e",
 }

From f0d6c80922222de9fa5315b777980064b9fe63c0 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Mon, 10 Oct 2022 02:09:08 +0400
Subject: [PATCH 06/23] Completed base16 colors

---
 lua/base46/themes/oceanic-next.lua | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index fcf9fc9..bd70ae8 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -42,14 +42,14 @@ M.base_16 = {
   base05 = "#c0c5ce", -- Confirmed
   base06 = "#cdd3de", -- Confirmed
   base07 = "#d8dee9", -- Confirmed
-  base08 = "#D9D7CE",
-  base09 = "#eaa273",
-  base0A = "#825aff",
-  base0B = "#E3A587",
-  base0C = "#F09483",
-  base0D = "#FFA500",
-  base0E = "#2ca9b4",
-  base0F = "#d75271",
+  base08 = "#ca1243",
+  base09 = "#d75f00",
+  base0A = "#c18401",
+  base0B = "#50a14f",
+  base0C = "#0184bc",
+  base0D = "#4078f2",
+  base0E = "#a626a4",
+  base0F = "#986801",
 }
 
 M.polish_hl = {

From 8a17466435f4d49a74371c9b694ca85a4490adfe Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Mon, 10 Oct 2022 09:58:06 +0400
Subject: [PATCH 07/23] Added colors to base30

---
 lua/base46/themes/oceanic-next.lua | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index bd70ae8..48b58e0 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -18,10 +18,10 @@ M.base_30 = {
   line = "#2a3a43", -- for lines like vertsplit
   green = "#99c794", -- Confirmed
   vibrant_green = "#b9e75b",
-  nord_blue = "#18a3af",
+  nord_blue = "#598cbf", -- Confirmed
   blue = "#6699cc", -- Confirmed
   yellow = "#fac863", -- Confirmed
-  sun = "#ffc038",
+  sun = "#ffd06b", -- Confirmed
   purple = "#c594c5", -- Confirmed
   dark_purple = "#c65cc2",
   teal = "#749689",
@@ -30,7 +30,7 @@ M.base_30 = {
   statusline_bg = "#1f2f38", -- Confirmed
   lightbg = "#2c3c45", -- Confirmed
   pmenu_bg = "#15bf84",
-  folder_bg = "#07929e",
+  folder_bg = "#598cbf", -- Confirmed
 }
 
 M.base_16 = {
@@ -42,14 +42,14 @@ M.base_16 = {
   base05 = "#c0c5ce", -- Confirmed
   base06 = "#cdd3de", -- Confirmed
   base07 = "#d8dee9", -- Confirmed
-  base08 = "#ca1243",
-  base09 = "#d75f00",
-  base0A = "#c18401",
-  base0B = "#50a14f",
-  base0C = "#0184bc",
-  base0D = "#4078f2",
-  base0E = "#a626a4",
-  base0F = "#986801",
+  base08 = "#ca1243", -- Confirmed
+  base09 = "#d75f00", -- Confirmed
+  base0A = "#c18401", -- Confirmed
+  base0B = "#50a14f", -- Confirmed
+  base0C = "#0184bc", -- Confirmed
+  base0D = "#4078f2", -- Confirmed
+  base0E = "#a626a4", -- Confirmed
+  base0F = "#986801", -- Confirmed
 }
 
 M.polish_hl = {

From e61c82a5a88940b5965713e5a59751c138ec9465 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Mon, 10 Oct 2022 10:05:17 +0400
Subject: [PATCH 08/23] Changed colors of pink, dark purple and teal

---
 lua/base46/themes/oceanic-next.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 48b58e0..f5ecba3 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -14,7 +14,7 @@ M.base_30 = {
   light_grey = "#5f6f78", -- TESTING
   red = "#ec5f67", -- Confirmed
   baby_pink = "#ff7d85", -- TESTING
-  pink = "#ff75a0",
+  pink = "#ffafb7",
   line = "#2a3a43", -- for lines like vertsplit
   green = "#99c794", -- Confirmed
   vibrant_green = "#b9e75b",
@@ -23,8 +23,8 @@ M.base_30 = {
   yellow = "#fac863", -- Confirmed
   sun = "#ffd06b", -- Confirmed
   purple = "#c594c5", -- Confirmed
-  dark_purple = "#c65cc2",
-  teal = "#749689",
+  dark_purple = "#ac7bac", -- TESTING
+  teal = "#50a4a4", -- TESTING
   orange = "#f99157", -- Confirmed
   cyan = "#62b3b2", -- Confirmed
   statusline_bg = "#1f2f38", -- Confirmed

From ae3d9cb7540010087165afb99284f9c667e7d54c Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Mon, 10 Oct 2022 10:09:09 +0400
Subject: [PATCH 09/23] Added some comments for referencing

---
 lua/base46/themes/oceanic-next.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index f5ecba3..751a49b 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -33,6 +33,8 @@ M.base_30 = {
   folder_bg = "#598cbf", -- Confirmed
 }
 
+-- Base16 colors taken from:
+-- https://github.com/norcalli/nvim-base16.lua/blob/master/lua/base16.lua
 M.base_16 = {
   base00 = "#1b2b34", -- Confirmed
   base01 = "#343d46", -- Confirmed

From a2713c6dfaa8c8313e5951c3d2117d8a97d69080 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Mon, 10 Oct 2022 10:23:33 +0400
Subject: [PATCH 10/23] Changed white color

---
 lua/base46/themes/oceanic-next.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 751a49b..5a59c5b 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -1,7 +1,7 @@
 local M = {}
 
 M.base_30 = {
-  white = "#ffffff", -- confirmed
+  white = "#5fb3b3", -- confirmed
   darker_black = "#15252e",
   black = "#1b2b34", --  nvim bg
   black2 = "#21313a",

From 792a2ad0500b5c7930ddf77685a54602e05b0e1b Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Mon, 10 Oct 2022 10:46:37 +0400
Subject: [PATCH 11/23] Changed some of base16 colors

---
 lua/base46/themes/oceanic-next.lua | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 5a59c5b..04900ed 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -44,14 +44,14 @@ M.base_16 = {
   base05 = "#c0c5ce", -- Confirmed
   base06 = "#cdd3de", -- Confirmed
   base07 = "#d8dee9", -- Confirmed
-  base08 = "#ca1243", -- Confirmed
-  base09 = "#d75f00", -- Confirmed
-  base0A = "#c18401", -- Confirmed
-  base0B = "#50a14f", -- Confirmed
-  base0C = "#0184bc", -- Confirmed
-  base0D = "#4078f2", -- Confirmed
-  base0E = "#a626a4", -- Confirmed
-  base0F = "#986801", -- Confirmed
+  base08 = "#ec5f67", -- Confirmed
+  base09 = "#f99157", -- Confirmed
+  base0A = "#fac863", -- Confirmed
+  base0B = "#99c794", -- Confirmed
+  base0C = "#62b3b2", -- Confirmed
+  base0D = "#6699cc", -- Confirmed
+  base0E = "#c594c5", -- Confirmed
+  base0F = "#ab7967", -- Confirmed
 }
 
 M.polish_hl = {

From fd550d2e12d524d05e005415ac370184bbfd7fe5 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Tue, 11 Oct 2022 09:03:10 +0400
Subject: [PATCH 12/23] Clean up code

---
 lua/base46/themes/oceanic-next.lua | 62 +++++++++++++++---------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 04900ed..4fc944e 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -11,47 +11,47 @@ M.base_30 = {
   grey = "#43535c",
   grey_fg = "#4d5d66",
   grey_fg2 = "#576770",
-  light_grey = "#5f6f78", -- TESTING
-  red = "#ec5f67", -- Confirmed
-  baby_pink = "#ff7d85", -- TESTING
+  light_grey = "#5f6f78",
+  red = "#ec5f67",
+  baby_pink = "#ff7d85",
   pink = "#ffafb7",
   line = "#2a3a43", -- for lines like vertsplit
-  green = "#99c794", -- Confirmed
+  green = "#99c794",
   vibrant_green = "#b9e75b",
-  nord_blue = "#598cbf", -- Confirmed
-  blue = "#6699cc", -- Confirmed
-  yellow = "#fac863", -- Confirmed
-  sun = "#ffd06b", -- Confirmed
-  purple = "#c594c5", -- Confirmed
-  dark_purple = "#ac7bac", -- TESTING
-  teal = "#50a4a4", -- TESTING
-  orange = "#f99157", -- Confirmed
-  cyan = "#62b3b2", -- Confirmed
-  statusline_bg = "#1f2f38", -- Confirmed
-  lightbg = "#2c3c45", -- Confirmed
+  nord_blue = "#598cbf",
+  blue = "#6699cc",
+  yellow = "#fac863",
+  sun = "#ffd06b",
+  purple = "#c594c5",
+  dark_purple = "#ac7bac",
+  teal = "#50a4a4",
+  orange = "#f99157",
+  cyan = "#62b3b2",
+  statusline_bg = "#1f2f38",
+  lightbg = "#2c3c45",
   pmenu_bg = "#15bf84",
-  folder_bg = "#598cbf", -- Confirmed
+  folder_bg = "#598cbf",
 }
 
 -- Base16 colors taken from:
 -- https://github.com/norcalli/nvim-base16.lua/blob/master/lua/base16.lua
 M.base_16 = {
-  base00 = "#1b2b34", -- Confirmed
-  base01 = "#343d46", -- Confirmed
-  base02 = "#4f5b66", -- Confirmed
+  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 = "#ec5f67", -- Confirmed
-  base09 = "#f99157", -- Confirmed
-  base0A = "#fac863", -- Confirmed
-  base0B = "#99c794", -- Confirmed
-  base0C = "#62b3b2", -- Confirmed
-  base0D = "#6699cc", -- Confirmed
-  base0E = "#c594c5", -- Confirmed
-  base0F = "#ab7967", -- Confirmed
+  base04 = "#A7ADBa", -- Confirmed
+  base05 = "#C0C5Ce", -- Confirmed
+  base06 = "#CDD3De", -- Confirmed
+  base07 = "#D8DEE9", -- Confirmed
+  base08 = "#EC5F67", -- Confirmed
+  base09 = "#F99157", -- Confirmed
+  base0A = "#FAC863", -- Confirmed
+  base0B = "#99C794", -- Confirmed
+  base0C = "#62B3B2", -- Confirmed
+  base0D = "#6699CC", -- Confirmed
+  base0E = "#C594C5", -- Confirmed
+  base0F = "#AB7967", -- Confirmed
 }
 
 M.polish_hl = {

From 47ea2d6b702ebd0c972165a28113a34613ed4e31 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Tue, 11 Oct 2022 09:07:03 +0400
Subject: [PATCH 13/23] Changed some of base30 colors

---
 lua/base46/themes/oceanic-next.lua | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 4fc944e..deb8811 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -3,7 +3,7 @@ local M = {}
 M.base_30 = {
   white = "#5fb3b3", -- confirmed
   darker_black = "#15252e",
-  black = "#1b2b34", --  nvim bg
+  black = "#1B2B34", --  nvim bg
   black2 = "#21313a",
   one_bg = "#25353e",
   one_bg2 = "#2e3e47",
@@ -12,21 +12,21 @@ M.base_30 = {
   grey_fg = "#4d5d66",
   grey_fg2 = "#576770",
   light_grey = "#5f6f78",
-  red = "#ec5f67",
+  red = "#EC5F67",
   baby_pink = "#ff7d85",
   pink = "#ffafb7",
   line = "#2a3a43", -- for lines like vertsplit
-  green = "#99c794",
+  green = "#99C794",
   vibrant_green = "#b9e75b",
   nord_blue = "#598cbf",
-  blue = "#6699cc",
-  yellow = "#fac863",
+  blue = "#6699CC",
+  yellow = "#FAC863",
   sun = "#ffd06b",
-  purple = "#c594c5",
+  purple = "#C594C5",
   dark_purple = "#ac7bac",
   teal = "#50a4a4",
-  orange = "#f99157",
-  cyan = "#62b3b2",
+  orange = "#F99157",
+  cyan = "#62B3B2",
   statusline_bg = "#1f2f38",
   lightbg = "#2c3c45",
   pmenu_bg = "#15bf84",

From 4125e8d36be07b983c6877d9d2a5ba3ad4cc245a Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Tue, 11 Oct 2022 09:16:01 +0400
Subject: [PATCH 14/23] Changed base30 Red and pink

---
 lua/base46/themes/oceanic-next.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index deb8811..c9aed3f 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -12,8 +12,10 @@ M.base_30 = {
   grey_fg = "#4d5d66",
   grey_fg2 = "#576770",
   light_grey = "#5f6f78",
-  red = "#EC5F67",
-  baby_pink = "#ff7d85",
+  -- red = "#EC5F67",
+  red = "#ff5252",
+  -- baby_pink = "#ff7d85",
+  baby_pink = "#ff7b7b",
   pink = "#ffafb7",
   line = "#2a3a43", -- for lines like vertsplit
   green = "#99C794",

From 75f9da01aee7427e057504845025c83d985006b3 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Tue, 11 Oct 2022 09:18:47 +0400
Subject: [PATCH 15/23] Testing removal of TS variables

---
 lua/base46/themes/oceanic-next.lua | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index c9aed3f..3aafaef 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -36,7 +36,6 @@ M.base_30 = {
 }
 
 -- Base16 colors taken from:
--- https://github.com/norcalli/nvim-base16.lua/blob/master/lua/base16.lua
 M.base_16 = {
   base00 = "#1B2B34", -- Confirmed
   base01 = "#343D46", -- Confirmed
@@ -56,18 +55,18 @@ M.base_16 = {
   base0F = "#AB7967", -- Confirmed
 }
 
-M.polish_hl = {
-  Include = { fg = M.base_16.base0E, bold = true },
-  TSVariable = { fg = M.base_16.base08 },
-  TSProperty = { fg = M.base_16.base0E },
-  Repeat = { fg = M.base_16.base0E },
-  TSTagDelimiter = { fg = M.base_16.base05 },
-  TSFunction = { fg = M.base_30.orange },
-  luaTSField = { fg = M.base_16.base0E },
-  TSParameter = { fg = M.base_16.base0F },
-  TSConstructor = { fg = M.base_16.base0A },
-  TSTagAttribute = { fg = M.base_16.orange },
-}
+-- M.polish_hl = {
+--   Include = { fg = M.base_16.base0E, bold = true },
+--   TSVariable = { fg = M.base_16.base08 },
+--   TSProperty = { fg = M.base_16.base0E },
+--   Repeat = { fg = M.base_16.base0E },
+--   TSTagDelimiter = { fg = M.base_16.base05 },
+--   TSFunction = { fg = M.base_30.orange },
+--   luaTSField = { fg = M.base_16.base0E },
+--   TSParameter = { fg = M.base_16.base0F },
+--   TSConstructor = { fg = M.base_16.base0A },
+--   TSTagAttribute = { fg = M.base_16.orange },
+-- }
 
 vim.opt.bg = "dark"
 

From d2836071f8a0bb4f5d2b9dfec0f63674c109aca3 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Tue, 11 Oct 2022 09:26:38 +0400
Subject: [PATCH 16/23] Changed red color for TSProperty

---
 lua/base46/themes/oceanic-next.lua | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 3aafaef..6242c3a 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -55,18 +55,19 @@ M.base_16 = {
   base0F = "#AB7967", -- Confirmed
 }
 
--- M.polish_hl = {
---   Include = { fg = M.base_16.base0E, bold = true },
---   TSVariable = { fg = M.base_16.base08 },
---   TSProperty = { fg = M.base_16.base0E },
---   Repeat = { fg = M.base_16.base0E },
---   TSTagDelimiter = { fg = M.base_16.base05 },
---   TSFunction = { fg = M.base_30.orange },
---   luaTSField = { fg = M.base_16.base0E },
---   TSParameter = { fg = M.base_16.base0F },
---   TSConstructor = { fg = M.base_16.base0A },
---   TSTagAttribute = { fg = M.base_16.orange },
--- }
+M.polish_hl = {
+  Include = { fg = M.base_16.base0E, bold = true },
+  TSVariable = { fg = M.base_16.base08 },
+  -- TSProperty = { fg = M.base_16.base0E },
+  TSProperty = { fg = M.base_30.red },
+  Repeat = { fg = M.base_16.base0E },
+  TSTagDelimiter = { fg = M.base_16.base05 },
+  TSFunction = { fg = M.base_30.orange },
+  luaTSField = { fg = M.base_16.base0E },
+  TSParameter = { fg = M.base_16.base0F },
+  TSConstructor = { fg = M.base_16.base0A },
+  TSTagAttribute = { fg = M.base_16.orange },
+}
 
 vim.opt.bg = "dark"
 

From 1d418b664533a65a8201fd0e09a2aeb42f9673e2 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Tue, 11 Oct 2022 09:29:09 +0400
Subject: [PATCH 17/23] Revert TSProperty and changed TSVariable

---
 lua/base46/themes/oceanic-next.lua | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 6242c3a..e54d73f 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -57,9 +57,8 @@ M.base_16 = {
 
 M.polish_hl = {
   Include = { fg = M.base_16.base0E, bold = true },
-  TSVariable = { fg = M.base_16.base08 },
-  -- TSProperty = { fg = M.base_16.base0E },
-  TSProperty = { fg = M.base_30.red },
+  TSVariable = { fg = M.base_30.baby_pink },
+  TSProperty = { fg = M.base_16.base0E },
   Repeat = { fg = M.base_16.base0E },
   TSTagDelimiter = { fg = M.base_16.base05 },
   TSFunction = { fg = M.base_30.orange },

From 8e82c9081e89b8f4f072ac61daae7d3e204f5962 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Tue, 11 Oct 2022 09:30:15 +0400
Subject: [PATCH 18/23] Changed TSVariable to pink

---
 lua/base46/themes/oceanic-next.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index e54d73f..04e4c6e 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -57,7 +57,7 @@ M.base_16 = {
 
 M.polish_hl = {
   Include = { fg = M.base_16.base0E, bold = true },
-  TSVariable = { fg = M.base_30.baby_pink },
+  TSVariable = { fg = M.base_30.pink },
   TSProperty = { fg = M.base_16.base0E },
   Repeat = { fg = M.base_16.base0E },
   TSTagDelimiter = { fg = M.base_16.base05 },

From 5c1d89edc795c028863703fcf5e3a0cf03846b52 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Tue, 11 Oct 2022 09:33:22 +0400
Subject: [PATCH 19/23] Changed TSVariable to base05

---
 lua/base46/themes/oceanic-next.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 04e4c6e..9e01e2a 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -57,7 +57,7 @@ M.base_16 = {
 
 M.polish_hl = {
   Include = { fg = M.base_16.base0E, bold = true },
-  TSVariable = { fg = M.base_30.pink },
+  TSVariable = { fg = M.base_16.base05 },
   TSProperty = { fg = M.base_16.base0E },
   Repeat = { fg = M.base_16.base0E },
   TSTagDelimiter = { fg = M.base_16.base05 },

From cdc40b7f41cd518e19fc8e7911d57b6e126dc522 Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Tue, 11 Oct 2022 09:36:06 +0400
Subject: [PATCH 20/23] Changed TSVariable to a pale pink

---
 lua/base46/themes/oceanic-next.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 9e01e2a..1337b50 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -16,7 +16,8 @@ M.base_30 = {
   red = "#ff5252",
   -- baby_pink = "#ff7d85",
   baby_pink = "#ff7b7b",
-  pink = "#ffafb7",
+  -- pink = "#ffafb7",
+  pink = "#ffc8d0",
   line = "#2a3a43", -- for lines like vertsplit
   green = "#99C794",
   vibrant_green = "#b9e75b",
@@ -57,7 +58,7 @@ M.base_16 = {
 
 M.polish_hl = {
   Include = { fg = M.base_16.base0E, bold = true },
-  TSVariable = { fg = M.base_16.base05 },
+  TSVariable = { fg = M.base_30.pink },
   TSProperty = { fg = M.base_16.base0E },
   Repeat = { fg = M.base_16.base0E },
   TSTagDelimiter = { fg = M.base_16.base05 },

From 1c5319fd961ab48548f28315cc9f2fa42d66260d Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Tue, 11 Oct 2022 09:39:31 +0400
Subject: [PATCH 21/23] Changed TSVariable to sun

---
 lua/base46/themes/oceanic-next.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 1337b50..6781786 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -58,7 +58,7 @@ M.base_16 = {
 
 M.polish_hl = {
   Include = { fg = M.base_16.base0E, bold = true },
-  TSVariable = { fg = M.base_30.pink },
+  TSVariable = { fg = M.base_30.sun },
   TSProperty = { fg = M.base_16.base0E },
   Repeat = { fg = M.base_16.base0E },
   TSTagDelimiter = { fg = M.base_16.base05 },

From a941a05273105ca0e712f33dd506a1c84e6b599f Mon Sep 17 00:00:00 2001
From: derek_lee <20820343@student.curtin.edu.au>
Date: Tue, 11 Oct 2022 09:49:47 +0400
Subject: [PATCH 22/23] Cleaned up code

---
 lua/base46/themes/oceanic-next.lua | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 6781786..459c0b7 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -12,12 +12,9 @@ M.base_30 = {
   grey_fg = "#4d5d66",
   grey_fg2 = "#576770",
   light_grey = "#5f6f78",
-  -- red = "#EC5F67",
-  red = "#ff5252",
-  -- baby_pink = "#ff7d85",
-  baby_pink = "#ff7b7b",
-  -- pink = "#ffafb7",
-  pink = "#ffc8d0",
+  red = "#EC5F67",
+  baby_pink = "#ff7d85",
+  pink = "#ffafb7",
   line = "#2a3a43", -- for lines like vertsplit
   green = "#99C794",
   vibrant_green = "#b9e75b",

From b65503472d09ca89943e30d8930844dd264804e4 Mon Sep 17 00:00:00 2001
From: Sidhanth Rathod <siduck@tutanota.com>
Date: Tue, 11 Oct 2022 20:32:34 +0530
Subject: [PATCH 23/23] improve some colors

---
 lua/base46/themes/oceanic-next.lua | 31 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 459c0b7..7a7562c 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -1,7 +1,10 @@
+-- credits to original theme https://github.com/voronianski/oceanic-next-color-scheme
+-- This is a modified version of the original theme.
+
 local M = {}
 
 M.base_30 = {
-  white = "#5fb3b3", -- confirmed
+  white = "#D8DEE9", -- confirmed
   darker_black = "#15252e",
   black = "#1B2B34", --  nvim bg
   black2 = "#21313a",
@@ -43,27 +46,23 @@ M.base_16 = {
   base05 = "#C0C5Ce", -- Confirmed
   base06 = "#CDD3De", -- Confirmed
   base07 = "#D8DEE9", -- Confirmed
-  base08 = "#EC5F67", -- Confirmed
-  base09 = "#F99157", -- Confirmed
-  base0A = "#FAC863", -- Confirmed
+  base08 = "#6cbdbc", -- Confirmed
+  base09 = "#FAC863", -- Confirmed
+  base0A = "#F99157", -- Confirmed
   base0B = "#99C794", -- Confirmed
-  base0C = "#62B3B2", -- Confirmed
+  base0C = "#5aaeae", -- Confirmed
   base0D = "#6699CC", -- Confirmed
   base0E = "#C594C5", -- Confirmed
-  base0F = "#AB7967", -- Confirmed
+  base0F = "#EC5F67", -- Confirmed
 }
 
 M.polish_hl = {
-  Include = { fg = M.base_16.base0E, bold = true },
-  TSVariable = { fg = M.base_30.sun },
-  TSProperty = { fg = M.base_16.base0E },
-  Repeat = { fg = M.base_16.base0E },
-  TSTagDelimiter = { fg = M.base_16.base05 },
-  TSFunction = { fg = M.base_30.orange },
-  luaTSField = { fg = M.base_16.base0E },
-  TSParameter = { fg = M.base_16.base0F },
-  TSConstructor = { fg = M.base_16.base0A },
-  TSTagAttribute = { fg = M.base_16.orange },
+  TSParameter = {
+    fg = M.base_16.base0A,
+  },
+  Constant = {
+    fg = M.base_16.base09,
+  },
 }
 
 vim.opt.bg = "dark"