From 01721c15f0b21f4d4df96ac0e76d0c6f66c85132 Mon Sep 17 00:00:00 2001
From: siduck <siduck@tutanota.com>
Date: Fri, 18 Nov 2022 08:44:58 +0530
Subject: [PATCH] add vim.opt.bg in defaults base46_cache

---
 README.md                              |  2 +-
 lua/base46/init.lua                    | 10 ++++++----
 lua/base46/themes/aquarium.lua         |  2 +-
 lua/base46/themes/ayu-dark.lua         |  2 +-
 lua/base46/themes/ayu-light.lua        |  2 +-
 lua/base46/themes/bearded-arc.lua      |  2 +-
 lua/base46/themes/blossom.lua          |  2 +-
 lua/base46/themes/catppuccin.lua       |  2 +-
 lua/base46/themes/catppuccin_latte.lua |  2 +-
 lua/base46/themes/chadracula.lua       |  2 +-
 lua/base46/themes/chadtain.lua         |  2 +-
 lua/base46/themes/chocolate.lua        |  2 +-
 lua/base46/themes/dark_horizon.lua     |  2 +-
 lua/base46/themes/decay.lua            |  2 +-
 lua/base46/themes/doomchad.lua         |  2 +-
 lua/base46/themes/everforest.lua       |  3 ++-
 lua/base46/themes/everforest_light.lua |  2 +-
 lua/base46/themes/falcon.lua           |  2 +-
 lua/base46/themes/gatekeeper.lua       |  2 +-
 lua/base46/themes/github_dark.lua      |  2 +-
 lua/base46/themes/github_light.lua     |  2 +-
 lua/base46/themes/gruvbox.lua          |  2 +-
 lua/base46/themes/gruvbox_light.lua    |  2 +-
 lua/base46/themes/gruvbox_material.lua |  2 +-
 lua/base46/themes/gruvchad.lua         |  2 +-
 lua/base46/themes/jellybeans.lua       |  2 +-
 lua/base46/themes/kanagawa.lua         |  2 +-
 lua/base46/themes/monekai.lua          |  2 +-
 lua/base46/themes/monochrome.lua       |  2 +-
 lua/base46/themes/mountain.lua         |  2 +-
 lua/base46/themes/nightfox.lua         |  2 +-
 lua/base46/themes/nightlamp.lua        |  2 +-
 lua/base46/themes/nightowl.lua         |  2 +-
 lua/base46/themes/nord.lua             |  2 +-
 lua/base46/themes/oceanic-light.lua    |  2 +-
 lua/base46/themes/oceanic-next.lua     |  2 +-
 lua/base46/themes/one_light.lua        |  2 +-
 lua/base46/themes/onedark.lua          |  2 +-
 lua/base46/themes/onenord.lua          |  2 +-
 lua/base46/themes/onenord_light.lua    |  2 +-
 lua/base46/themes/oxocarbon.lua        |  2 +-
 lua/base46/themes/palenight.lua        |  2 +-
 lua/base46/themes/pastelDark.lua       |  2 +-
 lua/base46/themes/penumbra_dark.lua    |  2 +-
 lua/base46/themes/penumbra_light.lua   |  2 +-
 lua/base46/themes/radium.lua           |  2 +-
 lua/base46/themes/rosepine.lua         |  2 +-
 lua/base46/themes/rxyhn.lua            |  2 +-
 lua/base46/themes/solarized_dark.lua   |  2 +-
 lua/base46/themes/sweetpastel.lua      |  2 +-
 lua/base46/themes/tokyodark.lua        |  2 +-
 lua/base46/themes/tokyonight.lua       |  2 +-
 lua/base46/themes/tomorrow_night.lua   |  2 +-
 lua/base46/themes/vscode_dark.lua      |  2 +-
 lua/base46/themes/wombat.lua           |  2 +-
 lua/base46/themes/yoru.lua             |  2 +-
 56 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/README.md b/README.md
index c6e04c5..e8b731c 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ M.base_16 = {
   -- some colors 
 }
 
-vim.opt.bg = "dark" -- this can be either dark or light
+M.type = "dark" -- this can be either dark or light
 
 M = require("base46").override_theme(M, "atheme")
 
diff --git a/lua/base46/init.lua b/lua/base46/init.lua
index 41f5de2..a268255 100644
--- a/lua/base46/init.lua
+++ b/lua/base46/init.lua
@@ -95,10 +95,13 @@ end
 
 -- save table
 M.table_to_file = function(filename, tb)
-  local file = io.open(filename, "w")
+  local theme_type = M.get_theme_tb "type" -- dark / light
+  local cache_path = vim.fn.stdpath "data" .. "/site/pack/base46_cache/start/compiled_themes/lua/base46_cache/"
+  local file = io.open(cache_path .. filename, "w")
 
   if file then
-    local result = ""
+    -- set vim.opt.bg code in defaults.lua only
+    local result = filename == "defaults.lua" and "M.type='" .. theme_type .. "'" or ""
 
     for hlgroupName, hlgroup_vals in pairs(tb) do
       local hlname = "'" .. hlgroupName .. "',"
@@ -119,7 +122,6 @@ end
 
 M.compile = function()
   local hl_files = vim.fn.stdpath "data" .. "/site/pack/packer/start/base46/lua/base46/integrations"
-  local cache_path = vim.fn.stdpath "data" .. "/site/pack/base46_cache/start/compiled_themes/lua/base46_cache/"
 
   for _, file in ipairs(vim.fn.readdir(hl_files)) do
     local integration = M.load_highlight(vim.fn.fnamemodify(file, ":r"))
@@ -129,7 +131,7 @@ M.compile = function()
       integration = M.merge_tb(integration, (M.turn_str_to_color(config.ui.hl_add)))
     end
 
-    M.table_to_file(cache_path .. file, integration)
+    M.table_to_file(file, integration)
   end
 end
 
diff --git a/lua/base46/themes/aquarium.lua b/lua/base46/themes/aquarium.lua
index e6ba196..35bfd0a 100644
--- a/lua/base46/themes/aquarium.lua
+++ b/lua/base46/themes/aquarium.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#eAc1c1",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "aquarium")
 
diff --git a/lua/base46/themes/ayu-dark.lua b/lua/base46/themes/ayu-dark.lua
index e3d169c..bf758d8 100644
--- a/lua/base46/themes/ayu-dark.lua
+++ b/lua/base46/themes/ayu-dark.lua
@@ -63,6 +63,6 @@ M.polish_hl = {
 
 M = require("base46").override_theme(M, "ayu-dark")
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 return M
diff --git a/lua/base46/themes/ayu-light.lua b/lua/base46/themes/ayu-light.lua
index e6068c5..4d94fc9 100644
--- a/lua/base46/themes/ayu-light.lua
+++ b/lua/base46/themes/ayu-light.lua
@@ -66,6 +66,6 @@ M.polish_hl = {
 
 M = require("base46").override_theme(M, "ayu-light")
 
-vim.opt.bg = "light"
+M.type = "light"
 
 return M
diff --git a/lua/base46/themes/bearded-arc.lua b/lua/base46/themes/bearded-arc.lua
index 8c53cf3..c4df5a6 100644
--- a/lua/base46/themes/bearded-arc.lua
+++ b/lua/base46/themes/bearded-arc.lua
@@ -55,7 +55,7 @@ M.base_16 = {
   base0F = "#FF738A",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M.polish_hl = {
   Conditional = {
diff --git a/lua/base46/themes/blossom.lua b/lua/base46/themes/blossom.lua
index d4de2a5..0c7271d 100644
--- a/lua/base46/themes/blossom.lua
+++ b/lua/base46/themes/blossom.lua
@@ -65,7 +65,7 @@ M.polish_hl = {
   St_pos_text = { fg = M.base_30.white },
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M = require("base46").override_theme(M, "blossom")
 
diff --git a/lua/base46/themes/catppuccin.lua b/lua/base46/themes/catppuccin.lua
index 6309f2a..161fd1d 100644
--- a/lua/base46/themes/catppuccin.lua
+++ b/lua/base46/themes/catppuccin.lua
@@ -59,7 +59,7 @@ M.polish_hl = {
   ["@variable.builtin"] = { fg = M.base_30.red },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "catppuccin")
 
diff --git a/lua/base46/themes/catppuccin_latte.lua b/lua/base46/themes/catppuccin_latte.lua
index 5196deb..c02a561 100644
--- a/lua/base46/themes/catppuccin_latte.lua
+++ b/lua/base46/themes/catppuccin_latte.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#62657f",
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M.polish_hl = {
   TelescopePromptPrefix = { fg = M.base_30.white },
diff --git a/lua/base46/themes/chadracula.lua b/lua/base46/themes/chadracula.lua
index f929dd3..a8d9e6b 100644
--- a/lua/base46/themes/chadracula.lua
+++ b/lua/base46/themes/chadracula.lua
@@ -57,7 +57,7 @@ M.polish_hl = {
   ["@number"] = { fg = M.base_30.purple },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "chadracula")
 
diff --git a/lua/base46/themes/chadtain.lua b/lua/base46/themes/chadtain.lua
index 0c28d52..036d9d0 100644
--- a/lua/base46/themes/chadtain.lua
+++ b/lua/base46/themes/chadtain.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#ac8a8c",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "chadtain")
 
diff --git a/lua/base46/themes/chocolate.lua b/lua/base46/themes/chocolate.lua
index 1d4cacc..0106be0 100644
--- a/lua/base46/themes/chocolate.lua
+++ b/lua/base46/themes/chocolate.lua
@@ -68,7 +68,7 @@ M.polish_hl = {
   ["@function.builtin"] = { fg = M.base_30.yellow },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "chocolate")
 
diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua
index 4814d2a..ed00fe2 100644
--- a/lua/base46/themes/dark_horizon.lua
+++ b/lua/base46/themes/dark_horizon.lua
@@ -65,7 +65,7 @@ M.polish_hl = {
   ["@tag.attribute"] = { fg = M.base_16.orange },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "dark_horizon")
 
diff --git a/lua/base46/themes/decay.lua b/lua/base46/themes/decay.lua
index af8d206..c263b2b 100644
--- a/lua/base46/themes/decay.lua
+++ b/lua/base46/themes/decay.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#e05f65",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "decay")
 
diff --git a/lua/base46/themes/doomchad.lua b/lua/base46/themes/doomchad.lua
index a52649a..10d2227 100644
--- a/lua/base46/themes/doomchad.lua
+++ b/lua/base46/themes/doomchad.lua
@@ -56,7 +56,7 @@ M.polish_hl = {
   ["@field"] = { fg = M.base_30.blue },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "doomchad")
 
diff --git a/lua/base46/themes/everforest.lua b/lua/base46/themes/everforest.lua
index 25e562c..ecdf77e 100644
--- a/lua/base46/themes/everforest.lua
+++ b/lua/base46/themes/everforest.lua
@@ -52,7 +52,8 @@ M.base_16 = {
   base0F = "#d699b6",
 }
 
-vim.opt.bg = "dark"
+
+M.type = "dark"
 
 M.polish_hl = {
   ["@tag"] = { fg = M.base_30.orange },
diff --git a/lua/base46/themes/everforest_light.lua b/lua/base46/themes/everforest_light.lua
index bf731f9..18001b2 100644
--- a/lua/base46/themes/everforest_light.lua
+++ b/lua/base46/themes/everforest_light.lua
@@ -67,7 +67,7 @@ M.polish_hl = {
   ["@constructor"] = { fg = M.base_30.blue },
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M = require("base46").override_theme(M, "everforest_light")
 
diff --git a/lua/base46/themes/falcon.lua b/lua/base46/themes/falcon.lua
index f1fc43d..711cc40 100644
--- a/lua/base46/themes/falcon.lua
+++ b/lua/base46/themes/falcon.lua
@@ -66,7 +66,7 @@ M.polish_hl = {
   ["@keyword"] = { fg = M.base_16.base0D },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "falcon")
 
diff --git a/lua/base46/themes/gatekeeper.lua b/lua/base46/themes/gatekeeper.lua
index e262966..8b01534 100644
--- a/lua/base46/themes/gatekeeper.lua
+++ b/lua/base46/themes/gatekeeper.lua
@@ -57,7 +57,7 @@ M.polish_hl = {
   ["@parameter"] = { fg = M.base_30.white },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "gatekeeper")
 
diff --git a/lua/base46/themes/github_dark.lua b/lua/base46/themes/github_dark.lua
index 7293a25..e353ffa 100644
--- a/lua/base46/themes/github_dark.lua
+++ b/lua/base46/themes/github_dark.lua
@@ -55,7 +55,7 @@ M.base_16 = {
   base0F = "#85e89d", -- Deprecated, open/close embedded tags
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M.polish_hl = {
   PmenuSel = {
diff --git a/lua/base46/themes/github_light.lua b/lua/base46/themes/github_light.lua
index aa1bda5..12f4088 100644
--- a/lua/base46/themes/github_light.lua
+++ b/lua/base46/themes/github_light.lua
@@ -55,7 +55,7 @@ M.base_16 = {
   base0F = "#18654B", -- Deprecated, open/close embedded tags
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M.polish_hl = {
   ["@punctuation.bracket"] = {
diff --git a/lua/base46/themes/gruvbox.lua b/lua/base46/themes/gruvbox.lua
index 0c80cc4..806cc13 100644
--- a/lua/base46/themes/gruvbox.lua
+++ b/lua/base46/themes/gruvbox.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#d65d0e",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "gruvbox")
 
diff --git a/lua/base46/themes/gruvbox_light.lua b/lua/base46/themes/gruvbox_light.lua
index 4a5121c..428a62c 100644
--- a/lua/base46/themes/gruvbox_light.lua
+++ b/lua/base46/themes/gruvbox_light.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#d65d0e",
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M.polish_hl = {
   TbLineThemeToggleBtn = { fg = M.base_30.black, bg = M.base_30.white },
diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index 9340972..0851df6 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -59,7 +59,7 @@ M.polish_hl = {
   ["@property"] = { fg = M.base_16.base0C },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "gruvbox_material")
 
diff --git a/lua/base46/themes/gruvchad.lua b/lua/base46/themes/gruvchad.lua
index bd590e5..b4b0743 100644
--- a/lua/base46/themes/gruvchad.lua
+++ b/lua/base46/themes/gruvchad.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base06 = "#c3b499",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "gruvchad")
 
diff --git a/lua/base46/themes/jellybeans.lua b/lua/base46/themes/jellybeans.lua
index 2298602..4a78cb1 100644
--- a/lua/base46/themes/jellybeans.lua
+++ b/lua/base46/themes/jellybeans.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#cf6a4c",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "jellybeans")
 
diff --git a/lua/base46/themes/kanagawa.lua b/lua/base46/themes/kanagawa.lua
index df8a4bd..49c8efa 100644
--- a/lua/base46/themes/kanagawa.lua
+++ b/lua/base46/themes/kanagawa.lua
@@ -61,7 +61,7 @@ M.polish_hl = {
   },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "kanagawa")
 
diff --git a/lua/base46/themes/monekai.lua b/lua/base46/themes/monekai.lua
index 6d444f7..e33f638 100644
--- a/lua/base46/themes/monekai.lua
+++ b/lua/base46/themes/monekai.lua
@@ -57,7 +57,7 @@ M.polish_hl = {
   ["@field.key"] = { fg = M.base_30.red },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "monekai")
 
diff --git a/lua/base46/themes/monochrome.lua b/lua/base46/themes/monochrome.lua
index 99b07b2..9a17b9e 100644
--- a/lua/base46/themes/monochrome.lua
+++ b/lua/base46/themes/monochrome.lua
@@ -59,7 +59,7 @@ M.polish_hl = {
   ["@punctuation.bracket"] = { fg = M.base_30.red },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "monochrome")
 
diff --git a/lua/base46/themes/mountain.lua b/lua/base46/themes/mountain.lua
index 8ce5729..df6e125 100644
--- a/lua/base46/themes/mountain.lua
+++ b/lua/base46/themes/mountain.lua
@@ -56,7 +56,7 @@ M.polish_hl = {
   ["@variable"] = { fg = M.base_16.base05 },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "mountain")
 
diff --git a/lua/base46/themes/nightfox.lua b/lua/base46/themes/nightfox.lua
index 592d827..f01b59d 100644
--- a/lua/base46/themes/nightfox.lua
+++ b/lua/base46/themes/nightfox.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#d85e7c",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "nightfox")
 
diff --git a/lua/base46/themes/nightlamp.lua b/lua/base46/themes/nightlamp.lua
index da9c6d8..d4a9b30 100644
--- a/lua/base46/themes/nightlamp.lua
+++ b/lua/base46/themes/nightlamp.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#90a0a0",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "nightlamp")
 
diff --git a/lua/base46/themes/nightowl.lua b/lua/base46/themes/nightowl.lua
index 2af749f..5c4485b 100644
--- a/lua/base46/themes/nightowl.lua
+++ b/lua/base46/themes/nightowl.lua
@@ -59,7 +59,7 @@ M.polish_hl = {
   PmenuSel = { bg = M.base_30.blue },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "nightowl")
 
diff --git a/lua/base46/themes/nord.lua b/lua/base46/themes/nord.lua
index 7332381..e727cdc 100644
--- a/lua/base46/themes/nord.lua
+++ b/lua/base46/themes/nord.lua
@@ -56,7 +56,7 @@ M.polish_hl = {
   ["@punctuation.bracket"] = { fg = M.base_30.white },
   ["@punctuation.delimiter"] = { fg = M.base_30.white },
 }
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "nord")
 
diff --git a/lua/base46/themes/oceanic-light.lua b/lua/base46/themes/oceanic-light.lua
index fd3eace..1809c18 100644
--- a/lua/base46/themes/oceanic-light.lua
+++ b/lua/base46/themes/oceanic-light.lua
@@ -55,7 +55,7 @@ M.base_16 = {
   base0F = "#9a806d",
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M = require("base46").override_theme(M, "oceanic-next-light")
 
diff --git a/lua/base46/themes/oceanic-next.lua b/lua/base46/themes/oceanic-next.lua
index 864926d..d47b119 100644
--- a/lua/base46/themes/oceanic-next.lua
+++ b/lua/base46/themes/oceanic-next.lua
@@ -65,7 +65,7 @@ M.polish_hl = {
   },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "oceanic-next")
 
diff --git a/lua/base46/themes/one_light.lua b/lua/base46/themes/one_light.lua
index 99bf3fd..f8ca497 100644
--- a/lua/base46/themes/one_light.lua
+++ b/lua/base46/themes/one_light.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#986801",
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M.polish_hl = {
   TelescopePromptPrefix = { fg = M.base_30.white },
diff --git a/lua/base46/themes/onedark.lua b/lua/base46/themes/onedark.lua
index 98ccc27..ca553e9 100644
--- a/lua/base46/themes/onedark.lua
+++ b/lua/base46/themes/onedark.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#be5046",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "onedark")
 
diff --git a/lua/base46/themes/onenord.lua b/lua/base46/themes/onenord.lua
index a2704d8..31e9f89 100644
--- a/lua/base46/themes/onenord.lua
+++ b/lua/base46/themes/onenord.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#d57780",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "onenord")
 
diff --git a/lua/base46/themes/onenord_light.lua b/lua/base46/themes/onenord_light.lua
index ef98fa7..5f4a3bf 100644
--- a/lua/base46/themes/onenord_light.lua
+++ b/lua/base46/themes/onenord_light.lua
@@ -65,6 +65,6 @@ M.polish_hl = {
 
 M = require("base46").override_theme(M, "onenord_light")
 
-vim.opt.bg = "light"
+M.type = "light"
 
 return M
diff --git a/lua/base46/themes/oxocarbon.lua b/lua/base46/themes/oxocarbon.lua
index 9033479..c4f445e 100644
--- a/lua/base46/themes/oxocarbon.lua
+++ b/lua/base46/themes/oxocarbon.lua
@@ -66,7 +66,7 @@ M.polish_hl = {
   },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "oxocarbon")
 
diff --git a/lua/base46/themes/palenight.lua b/lua/base46/themes/palenight.lua
index 273e003..fcc7850 100644
--- a/lua/base46/themes/palenight.lua
+++ b/lua/base46/themes/palenight.lua
@@ -57,7 +57,7 @@ M.polish_hl = {
   ["@field.key"] = { fg = M.base_30.orange },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "palenight")
 
diff --git a/lua/base46/themes/pastelDark.lua b/lua/base46/themes/pastelDark.lua
index d0f25ee..7a46689 100644
--- a/lua/base46/themes/pastelDark.lua
+++ b/lua/base46/themes/pastelDark.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base06 = "#d3d9e4",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "javacafe")
 
diff --git a/lua/base46/themes/penumbra_dark.lua b/lua/base46/themes/penumbra_dark.lua
index 895c439..f1e8b3b 100644
--- a/lua/base46/themes/penumbra_dark.lua
+++ b/lua/base46/themes/penumbra_dark.lua
@@ -89,7 +89,7 @@ M.polish_hl = {
   },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "penumbra_dark")
 
diff --git a/lua/base46/themes/penumbra_light.lua b/lua/base46/themes/penumbra_light.lua
index e83a8c0..784db8d 100644
--- a/lua/base46/themes/penumbra_light.lua
+++ b/lua/base46/themes/penumbra_light.lua
@@ -82,7 +82,7 @@ M.polish_hl = {
   },
 }
 
-vim.opt.bg = "light"
+M.type = "light"
 
 M = require("base46").override_theme(M, "penumbra_light")
 
diff --git a/lua/base46/themes/radium.lua b/lua/base46/themes/radium.lua
index 294e580..34e6726 100644
--- a/lua/base46/themes/radium.lua
+++ b/lua/base46/themes/radium.lua
@@ -57,7 +57,7 @@ M.polish_hl = {
   ["@parenthesis"] = { link = "@punctuation.bracket" },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "radium")
 
diff --git a/lua/base46/themes/rosepine.lua b/lua/base46/themes/rosepine.lua
index 82f9a02..2061cd6 100644
--- a/lua/base46/themes/rosepine.lua
+++ b/lua/base46/themes/rosepine.lua
@@ -54,6 +54,6 @@ M.base_16 = {
 
 M = require("base46").override_theme(M, "rosepine")
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 return M
diff --git a/lua/base46/themes/rxyhn.lua b/lua/base46/themes/rxyhn.lua
index f5d3cbd..6f2c817 100644
--- a/lua/base46/themes/rxyhn.lua
+++ b/lua/base46/themes/rxyhn.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#F16269",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "rxyhn")
 
diff --git a/lua/base46/themes/solarized_dark.lua b/lua/base46/themes/solarized_dark.lua
index 022a1b7..3aa80c9 100644
--- a/lua/base46/themes/solarized_dark.lua
+++ b/lua/base46/themes/solarized_dark.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#d33682",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "solarized_dark")
 
diff --git a/lua/base46/themes/sweetpastel.lua b/lua/base46/themes/sweetpastel.lua
index dcf0cab..27f8ab8 100644
--- a/lua/base46/themes/sweetpastel.lua
+++ b/lua/base46/themes/sweetpastel.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#e5a3a1",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "sweetpastel")
 
diff --git a/lua/base46/themes/tokyodark.lua b/lua/base46/themes/tokyodark.lua
index 7f844e6..b26be7d 100644
--- a/lua/base46/themes/tokyodark.lua
+++ b/lua/base46/themes/tokyodark.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#f3627a",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "tokyodark")
 
diff --git a/lua/base46/themes/tokyonight.lua b/lua/base46/themes/tokyonight.lua
index 0ad4265..f89eb47 100644
--- a/lua/base46/themes/tokyonight.lua
+++ b/lua/base46/themes/tokyonight.lua
@@ -58,7 +58,7 @@ M.polish_hl = {
   ["@parameter"] = { fg = M.base_30.white },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "tokyonight")
 
diff --git a/lua/base46/themes/tomorrow_night.lua b/lua/base46/themes/tomorrow_night.lua
index 5054ed9..805dbed 100644
--- a/lua/base46/themes/tomorrow_night.lua
+++ b/lua/base46/themes/tomorrow_night.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base06 = "#e0e0e0",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M.polish_hl = {
   PmenuSel = { fg = M.base_30.black, bg = M.base_30.red },
diff --git a/lua/base46/themes/vscode_dark.lua b/lua/base46/themes/vscode_dark.lua
index 0079782..ddcc871 100644
--- a/lua/base46/themes/vscode_dark.lua
+++ b/lua/base46/themes/vscode_dark.lua
@@ -64,7 +64,7 @@ M.polish_hl = {
   ["@keywordfunction"] = { fg = M.base_30.teal },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "vscode_dark")
 
diff --git a/lua/base46/themes/wombat.lua b/lua/base46/themes/wombat.lua
index 462a6e3..71f5025 100644
--- a/lua/base46/themes/wombat.lua
+++ b/lua/base46/themes/wombat.lua
@@ -59,7 +59,7 @@ M.polish_hl = {
   ["@conditional"] = { link = "@include" },
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "wombat")
 
diff --git a/lua/base46/themes/yoru.lua b/lua/base46/themes/yoru.lua
index 464fb6f..d8962aa 100644
--- a/lua/base46/themes/yoru.lua
+++ b/lua/base46/themes/yoru.lua
@@ -52,7 +52,7 @@ M.base_16 = {
   base0F = "#e8646a",
 }
 
-vim.opt.bg = "dark"
+M.type = "dark"
 
 M = require("base46").override_theme(M, "yoru")