diff --git a/.config/nvim b/.config/nvim
new file mode 160000
index 0000000..521e6f8
--- /dev/null
+++ b/.config/nvim
@@ -0,0 +1 @@
+Subproject commit 521e6f872fa1a81c5f5e175bc77aa8a147d14924
diff --git a/Themes/Cozy/.config/nvim/lua/custom/chadrc.lua b/Themes/Cozy/.config/nvim/lua/custom/chadrc.lua
new file mode 100755
index 0000000..5502a11
--- /dev/null
+++ b/Themes/Cozy/.config/nvim/lua/custom/chadrc.lua
@@ -0,0 +1,20 @@
+---@type ChadrcConfig
+local M = {}
+
+-- Path to overriding theme and highlights files
+local highlights = require "custom.highlights"
+
+M.ui = {
+  theme = "Cozy",
+  theme_toggle = { "Cozy"},
+
+  hl_override = highlights.override,
+  hl_add = highlights.add,
+}
+
+M.plugins = "custom.plugins"
+
+-- check core.mappings for table structure
+M.mappings = require "custom.mappings"
+
+return M
diff --git a/Themes/Everforest/.config/nvim/lua/custom/chadrc.lua b/Themes/Everforest/.config/nvim/lua/custom/chadrc.lua
new file mode 100755
index 0000000..d01bc1a
--- /dev/null
+++ b/Themes/Everforest/.config/nvim/lua/custom/chadrc.lua
@@ -0,0 +1,20 @@
+---@type ChadrcConfig
+local M = {}
+
+-- Path to overriding theme and highlights files
+local highlights = require "custom.highlights"
+
+M.ui = {
+  theme = "Evergreen",
+  theme_toggle = { "Evergreen"},
+
+  hl_override = highlights.override,
+  hl_add = highlights.add,
+}
+
+M.plugins = "custom.plugins"
+
+-- check core.mappings for table structure
+M.mappings = require "custom.mappings"
+
+return M
diff --git a/Themes/Natura/.config/nvim/lua/custom/chadrc.lua b/Themes/Natura/.config/nvim/lua/custom/chadrc.lua
new file mode 100755
index 0000000..2d91870
--- /dev/null
+++ b/Themes/Natura/.config/nvim/lua/custom/chadrc.lua
@@ -0,0 +1,20 @@
+---@type ChadrcConfig
+local M = {}
+
+-- Path to overriding theme and highlights files
+local highlights = require "custom.highlights"
+
+M.ui = {
+  theme = "Natura",
+  theme_toggle = { "Natura"},
+
+  hl_override = highlights.override,
+  hl_add = highlights.add,
+}
+
+M.plugins = "custom.plugins"
+
+-- check core.mappings for table structure
+M.mappings = require "custom.mappings"
+
+return M
diff --git a/Themes/Natura/.config/wip|nvim/lua/custom/themes/Natura.lua b/Themes/Natura/.config/wip|nvim/lua/custom/themes/Natura.lua
deleted file mode 100644
index 5acaa78..0000000
--- a/Themes/Natura/.config/wip|nvim/lua/custom/themes/Natura.lua
+++ /dev/null
@@ -1,64 +0,0 @@
-local M = {}
-
-M.base_30 = {
-  white = "#b2bebc",
-  darker_black = "#0f1212",
-  black = "#0f1212", --  nvim bg
-  black2 = "#455B4C",
-  one_bg = "#0f1212",
-  one_bg2 = "#526852",
-  one_bg3 = "#546E6C",
-  grey = "#788E7D",
-  grey_fg = "#b2bebc",
-  grey_fg2 = "#7c8583",
-  light_grey = "#7c8583",
-  red = "#546E6C",
-  baby_pink = "#607767",
-  pink = "#718871",
-  line = "#526852", -- for lines like vertsplit
-  green = "#607767",
-  vibrant_green = "#718871",
-  nord_blue = "#526852",
-  blue = "#546E6C",
-  yellow = "#718871",
-  sun = "#718871",
-  purple = "#0f1212",
-  dark_purple = "#455B4C",
-  teal = "#526852",
-  orange = "#546E6C",
-  cyan = "#788E7D",
-  statusline_bg = "#0f1212",
-  lightbg = "#455B4C",
-  pmenu_bg = "#607767",
-  folder_bg = "#546E6C",
-}
-
-M.base_16 = {
-  base00 = "#0f1212",
-  base01 = "#455B4C",
-  base02 = "#526852",
-  base03 = "#546E6C",
-  base04 = "#607767",
-  base05 = "#b2bebc",
-  base06 = "#7c8583",
-  base07 = "#788E7D",
-  base08 = "#546E6C",
-  base09 = "#607767",
-  base0A = "#718871",
-  base0B = "#788E7D",
-  base0C = "#526852",
-  base0D = "#546E6C",
-  base0E = "#607767",
-  base0F = "#718871",
-}
-
-M.type = "dark"
-
-M.polish_hl = {
-  ["@tag"] = { fg = M.base_30.orange },
-  ["@tag.delimiter"] = { fg = M.base_30.green },
-}
-
-
-return M
-
diff --git a/Themes/Sakura/.config/nvim/lua/custom/chadrc.lua b/Themes/Sakura/.config/nvim/lua/custom/chadrc.lua
new file mode 100755
index 0000000..dcb0adf
--- /dev/null
+++ b/Themes/Sakura/.config/nvim/lua/custom/chadrc.lua
@@ -0,0 +1,20 @@
+---@type ChadrcConfig
+local M = {}
+
+-- Path to overriding theme and highlights files
+local highlights = require "custom.highlights"
+
+M.ui = {
+  theme = "Sakura",
+  theme_toggle = { "Sakura"},
+
+  hl_override = highlights.override,
+  hl_add = highlights.add,
+}
+
+M.plugins = "custom.plugins"
+
+-- check core.mappings for table structure
+M.mappings = require "custom.mappings"
+
+return M
diff --git a/Themes/Sakura/.config/wip|nvim/lua/custom/themes/sakura.lua b/Themes/Sakura/.config/wip|nvim/lua/custom/themes/sakura.lua
deleted file mode 100644
index 4db2c6e..0000000
--- a/Themes/Sakura/.config/wip|nvim/lua/custom/themes/sakura.lua
+++ /dev/null
@@ -1,64 +0,0 @@
-
-local M = {}
-
-M.base_30 = {
-  white = "#efe5e4",
-  darker_black = "#282738",
-  black = "#282738", --  nvim bg
-  black2 = "#353446",
-  one_bg = "#282738",
-  one_bg2 = "#3a4248",
-  one_bg3 = "#AF9295",
-  grey = "#a7a09f",
-  grey_fg = "#efe5e4",
-  grey_fg2 = "#AA7489",
-  light_grey = "#E7DABE",
-  red = "#D5A8AC",
-  baby_pink = "#E5B9C6",
-  pink = "#FECDCE",
-  line = "#3a4248", -- for lines like vertsplit
-  green = "#AF9295",
-  vibrant_green = "#AF9295",
-  nord_blue = "#E4C7B4",
-  blue = "#E5B9C6",
-  yellow = "#FECDCE",
-  sun = "#FECDCE",
-  purple = "#AA7489",
-  dark_purple = "#AA7489",
-  teal = "#AF9295",
-  orange = "#E4C7B4",
-  cyan = "#D5A8AC",
-  statusline_bg = "#282738",
-  lightbg = "#353446",
-  pmenu_bg = "#A7C080",
-  folder_bg = "#E5B9C6",
-}
-
-M.base_16 = {
-  base00 = "#282738",
-  base01 = "#353446",
-  base02 = "#3a4248",
-  base03 = "#AF9295",
-  base04 = "#4a5258",
-  base05 = "#efe5e4",
-  base06 = "#DDD0B4",
-  base07 = "#E7DABE",
-  base08 = "#AA7489",
-  base09 = "#D5A8AC",
-  base0A = "#A7C080",
-  base0B = "#FECDCE",
-  base0C = "#D699B6",
-  base0D = "#E4C7B4",
-  base0E = "#AA7489",
-  base0F = "#AA7489",
-}
-
-M.type = "dark"
-
-M.polish_hl = {
-  ["@tag"] = { fg = M.base_30.orange },
-  ["@tag.delimiter"] = { fg = M.base_30.green },
-}
-
-return M
-