diff --git a/private_dot_config/nvim/init.lua b/private_dot_config/nvim/init.lua
index 59f3d97..621b2cb 100644
--- a/private_dot_config/nvim/init.lua
+++ b/private_dot_config/nvim/init.lua
@@ -29,7 +29,6 @@ vim.call('plug#end')
 
 
 -- move config and plugin config to alternate files
-require("config.theme")
 require("config.mappings")
 require("config.options")
 --require("config.autocmd")
@@ -43,9 +42,11 @@ require("plugins.comment")
 -- require("plugins.fterm")
 --require("plugins.gitsigns")
 require("plugins.lualine")
+require("plugins.nightfox")
 --require("plugins.nvim-lint")
 --require("plugins.render-markdown")
 
+
 vim.defer_fn(function()
 		--defer non-essential configs,
 		--purely for experimental purposes:
@@ -59,10 +60,6 @@ require("plugins.twilight")
 require("plugins.which-key")
 end, 100)
 
---load_theme()
-local override = require("nightfox").override
---override.groups({
---    modules = {
---        BufferCurrent = {fg = "#ffffff"},
---    }
---})
+-- setup theme at the very end
+require("config.theme")
+
diff --git a/private_dot_config/nvim/lua/config/mappings.lua b/private_dot_config/nvim/lua/config/mappings.lua
index 54f37ae..1f05b10 100644
--- a/private_dot_config/nvim/lua/config/mappings.lua
+++ b/private_dot_config/nvim/lua/config/mappings.lua
@@ -29,7 +29,8 @@ map("n", "<A-p>", "<Cmd>BufferPin<CR>")
 
 -- misc
 --map("n", "<leader>s", ":%s//g<Left><Left>") --replace all
-map("n", "<leader>t", ":NvimTreeToggle<CR>") --open file explorer
+map("n", "<leader>T", ":NvimTreeToggle<CR>") --open file explorer
+map("n", "<leader>t", ";NvimTreeFocus<CR>") --focus file explorer
 map("n", "<leader>l", ":Twilight<CR>") --surrounding dim
 
 -- fzf and grep
diff --git a/private_dot_config/nvim/lua/config/theme.lua b/private_dot_config/nvim/lua/config/theme.lua
index f93fba1..397a0e8 100644
--- a/private_dot_config/nvim/lua/config/theme.lua
+++ b/private_dot_config/nvim/lua/config/theme.lua
@@ -1,7 +1 @@
 vim.cmd("colorscheme dayfox")
-local override = require("nightfox").override
---override.groups({
---    modules = {
---        BufferCurrent = {fg = "#ffffff"},
---    }
---})
diff --git a/private_dot_config/nvim/lua/plugins/nightfox.lua b/private_dot_config/nvim/lua/plugins/nightfox.lua
new file mode 100644
index 0000000..ac3fdf3
--- /dev/null
+++ b/private_dot_config/nvim/lua/plugins/nightfox.lua
@@ -0,0 +1,6 @@
+local groups = {
+    all = {
+        BufferCurrent = { fg = "#ffffff" },
+    }
+}
+require("nightfox").setup({groups = groups})