diff --git a/lua/catppuccin/lib/compiler.lua b/lua/catppuccin/lib/compiler.lua
index 73c9e65..74992d3 100644
--- a/lua/catppuccin/lib/compiler.lua
+++ b/lua/catppuccin/lib/compiler.lua
@@ -27,7 +27,6 @@ end
 vim.g.colors_name = "catppuccin"]],
 	}
 	local config = require("catppuccin.config").options
-	local custom_highlights = config.custom_highlights
 	for property, value in pairs(theme.properties) do
 		if type(value) == "string" then
 			table.insert(lines, fmt('vim.o.%s = "%s"', property, value))
@@ -37,8 +36,8 @@ vim.g.colors_name = "catppuccin"]],
 			table.insert(lines, fmt("vim.o.%s = %s", property, inspect(value)))
 		end
 	end
-	local tbl = vim.tbl_deep_extend("keep", theme.integrations, theme.base)
-	tbl = vim.tbl_deep_extend("keep", custom_highlights, tbl)
+	local tbl = vim.tbl_deep_extend("keep", theme.integrations, theme.editor)
+	tbl = vim.tbl_deep_extend("keep", config.custom_highlights, tbl)
 
 	for group, color in pairs(tbl) do
 		if color.link then