diff --git a/colors/neovim.lua b/colors/neovim.lua
index a8312c1..34263d9 100644
--- a/colors/neovim.lua
+++ b/colors/neovim.lua
@@ -1,12 +1,13 @@
 vim.g.colors_name = "neovim"
 
-local base_name = vim.opt.background:get() == "light" and "zenbones" or "zenflesh"
+local base_name = require("zenbones.util").bg_to_base_name()
 
 -- reset base palette and specs
 package.loaded[base_name .. ".palette"] = nil
 package.loaded[base_name] = nil
+package.loaded["zenbones.neovim.palette"] = nil
 package.loaded["zenbones.neovim"] = nil
 
-require(base_name .. ".terminal").setup()
+require("zenbones.neovim.terminal").setup()
 
 require "lush"(require "zenbones.neovim")
diff --git a/lua/zenbones/neovim.lua b/lua/zenbones/neovim.lua
index 654ff0f..df2160b 100644
--- a/lua/zenbones/neovim.lua
+++ b/lua/zenbones/neovim.lua
@@ -1,21 +1,11 @@
 local lush = require "lush"
 local hsluv = lush.hsluv
 
-local base_name = vim.opt.background:get() == "light" and "zenbones" or "zenflesh"
-
 -- modify base palette first (before requiring specs)
-local palette = require(base_name .. ".palette")
-if base_name == "zenbones" then
-	palette.bg = hsluv "#e7eee8" -- --bg-color
-	palette.fg = hsluv "#202e18" -- --accent-color
-	palette.leaf = palette.leaf.sa(24).li(8) -- need to make green more prominent
-else
-	palette.bg = hsluv "#0f191f" -- --bg-color
-	palette.fg = hsluv "#c7d6d0" -- --fg-color
-	palette.leaf = hsluv "#8fff6d" -- --accent-color
-end
+local palette = require "zenbones.neovim.palette"
 
 -- extend specs using Lush
+local base_name = require("zenbones.util").bg_to_base_name()
 local theme = require(base_name)
 local specs
 if base_name == "zenbones" then
diff --git a/lua/zenbones/neovim/palette.lua b/lua/zenbones/neovim/palette.lua
new file mode 100644
index 0000000..b0b3753
--- /dev/null
+++ b/lua/zenbones/neovim/palette.lua
@@ -0,0 +1,17 @@
+local lush = require "lush"
+local hsluv = lush.hsluv
+
+local base_name = require("zenbones.util").bg_to_base_name()
+local palette = require(base_name .. ".palette")
+
+if base_name == "zenbones" then
+	palette.bg = hsluv "#e7eee8" -- --bg-color
+	palette.fg = hsluv "#202e18" -- --accent-color
+	palette.leaf = palette.leaf.sa(24).li(8) -- need to make green more prominent
+else
+	palette.bg = hsluv "#0f191f" -- --bg-color
+	palette.fg = hsluv "#c7d6d0" -- --fg-color
+	palette.leaf = hsluv "#8fff6d" -- --accent-color
+end
+
+return palette
diff --git a/lua/zenbones/neovim/terminal.lua b/lua/zenbones/neovim/terminal.lua
new file mode 100644
index 0000000..6d0afe9
--- /dev/null
+++ b/lua/zenbones/neovim/terminal.lua
@@ -0,0 +1 @@
+return require(require("zenbones.util").bg_to_base_name() .. ".terminal")