diff --git a/lua/base16.lua b/lua/base16.lua
index 8c8d757..2dcc64d 100644
--- a/lua/base16.lua
+++ b/lua/base16.lua
@@ -1,8 +1,14 @@
 local M = {}
 
 M.get_colors = function(type)
-   local name = require("core.utils").load_config().ui.theme
-   vim.g.nvchad_theme = name
+   local name
+
+   if vim.g.nvchad_theme then
+      name = vim.g.nvchad_theme
+   else
+      name = require("core.utils").load_config().ui.theme
+      vim.g.nvchad_theme = name
+   end
 
    -- theme paths
    local default_path = "hl_themes." .. name
diff --git a/lua/chadlights.lua b/lua/chadlights.lua
index 04bf099..e9459df 100644
--- a/lua/chadlights.lua
+++ b/lua/chadlights.lua
@@ -1,3 +1,5 @@
+-- returns a huge table of all highlight groups & their colors
+
 local merge_tb = require("base16").merge_tb
 
 local highlights = {}