From 551a904f0a976b6e0f7fc14a0a40769c3d4d9b6e Mon Sep 17 00:00:00 2001
From: Pocco81 <pocco451@gmail.com>
Date: Sat, 16 Jul 2022 22:19:52 -0500
Subject: [PATCH] fix: merge

---
 lua/catppuccin/groups/integrations/leap.lua | 20 ++++++++------------
 lua/catppuccin/init.lua                     | 10 ----------
 lua/catppuccin/palettes/frappe.lua          | 18 +++++++++---------
 3 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/lua/catppuccin/groups/integrations/leap.lua b/lua/catppuccin/groups/integrations/leap.lua
index 4410a65..335ee64 100644
--- a/lua/catppuccin/groups/integrations/leap.lua
+++ b/lua/catppuccin/groups/integrations/leap.lua
@@ -12,18 +12,14 @@ end
 
 function M.get()
 	if not get_prepared() then
-		local catppuccin = require("catppuccin")
-		if catppuccin.after_loading ~= nil then
-			catppuccin.after_loading = function()
-				catppuccin.after_loading()
-				require("leap").init_highlight(true)
-			end
-		else
-			catppuccin.after_loading = function()
-				require("leap").init_highlight(true)
-			end
-		end
-		set_prepared(true)
+		set_prepared(vim.api.nvim_create_autocmd("User", {
+			pattern = "CatppuccinLoaded",
+			callback = function()
+				if pcall(require, "leap") then
+					require("leap").init_highlight(true)
+				end
+			end,
+		}))
 	end
 
 	return {
diff --git a/lua/catppuccin/init.lua b/lua/catppuccin/init.lua
index 23e14d7..7dc80e4 100644
--- a/lua/catppuccin/init.lua
+++ b/lua/catppuccin/init.lua
@@ -21,12 +21,6 @@ end, {
 })
 
 function M.load()
-	local catppuccin = require("catppuccin")
-
-	if catppuccin.before_loading ~= nil then
-		catppuccin.before_loading()
-	end
-
 	local compiled = nil
 	local config = require("catppuccin.config").options
 
@@ -48,10 +42,6 @@ function M.load()
 		require("catppuccin.lib.highlighter").load(require("catppuccin.lib.mapper").apply())
 	end
 
-	if catppuccin.after_loading ~= nil then
-		catppuccin.after_loading()
-	end
-
 	vim.api.nvim_exec_autocmds("User", { pattern = "CatppuccinLoaded" })
 end
 
diff --git a/lua/catppuccin/palettes/frappe.lua b/lua/catppuccin/palettes/frappe.lua
index fa8c218..a3d7a8b 100644
--- a/lua/catppuccin/palettes/frappe.lua
+++ b/lua/catppuccin/palettes/frappe.lua
@@ -19,15 +19,15 @@ local color_palette = {
 	blue = "#8CAAEE",
 	lavender = "#BABBF1",
 
-	text = "#D1D9F8",
-	subtext1 = "#B5BFE2",
-	subtext0 = "#A5ADCE",
-	overlay2 = "#949CBB",
-	overlay1 = "#838BA7",
-	overlay0 = "#737994",
-	surface2 = "#626880",
-	surface1 = "#51576D",
-	surface0 = "#414559",
+	text = "#CED7F7",
+	subtext1 = "#BCC5E3",
+	subtext0 = "#ABB3D0",
+	overlay2 = "#99A1BC",
+	overlay1 = "#888FA8",
+	overlay0 = "#767C95",
+	surface2 = "#656A81",
+	surface1 = "#53586D",
+	surface0 = "#42465A",
 
 	base = "#303446",
 	mantle = "#292C3C",