From 1c0165a510c737f268d83773cf594dbed6d9ccb3 Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej@sosek.net>
Date: Thu, 16 Apr 2026 13:50:07 +0300
Subject: [PATCH] Change theme

---
 lisp/icejam-magit.el                          | 11 +++--
 lisp/icejam-themes.el                         | 31 +-----------
 .../themes/icejam-base16-catppuccin-frappe.el | 47 +++++++++++++++++++
 3 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 lisp/themes/icejam-base16-catppuccin-frappe.el

diff --git a/lisp/icejam-magit.el b/lisp/icejam-magit.el
index d8b479a..160ac5e 100644
--- a/lisp/icejam-magit.el
+++ b/lisp/icejam-magit.el
@@ -4,16 +4,19 @@
 
 (eval-when-compile
   (defvar icejam-keys-mode-map)
+  (defvar magit-blame-mode-map)
+  (defvar git-commit-setup-hook)
   (declare-function git-commit-setup-capf 'git-commit))
 
 (use-package magit
   :ensure t
   :commands (magit-blame-quit)
   :defer t
-  :bind (:map icejam-keys-mode-map
-              ("<f5> c" . magit-checkout)
-              ("<f5> b" . magit-blame-addition)
-              ("<f5> g" . magit-status))
+  :bind
+  (:map icejam-keys-mode-map
+        ("<f5> c" . magit-checkout)
+        ("<f5> b" . magit-blame-addition)
+        ("<f5> g" . magit-status))
   (:map magit-blame-mode-map
         ("<f5> b" . 'magit-blame-quit))
   :config
diff --git a/lisp/icejam-themes.el b/lisp/icejam-themes.el
index 2574a13..385e5a9 100644
--- a/lisp/icejam-themes.el
+++ b/lisp/icejam-themes.el
@@ -10,34 +10,7 @@
   (setopt enable-theme-functions 'spaceline-compile))
 
 (use-package base16-theme :ensure t)
-
-;; (use-package apropospriate-theme :ensure t
-;;   :config (load-theme 'apropospriate-light t t))
-;; (use-package leuven-theme :ensure t
-;;   :config
-;;   (load-theme 'leuven t t))
 (use-package modus-themes :ensure t)
-;; (use-package darktooth-theme :ensure t
-;;   :config
-;;   (load-theme 'darktooth t t))
-
-;; (use-package color-theme-sanityinc-tomorrow :ensure t
-;;   :config
-;;   ;; Dark themes
-;;   (load-theme 'sanityinc-tomorrow-eighties t t)
-;;   (load-theme 'sanityinc-tomorrow-night t t)
-;;   ;; Light theme
-;;   (load-theme 'sanityinc-tomorrow-day t t))
-
-;; (use-package zenburn-theme :ensure t
-;;   :config
-;;   (load-theme 'zenburn t t))
-
-;; (use-package catppuccin-theme :ensure t
-;;   :custom
-;;   ((catpuccin-flavor 'frappe))
-;;   :config
-;;   (load-theme 'catppuccin t t))
 
 ;; Disable cursor blinking
 (blink-cursor-mode 0)
@@ -54,10 +27,10 @@
   (load-theme 'modus-operandi-tinted t t)
   (require 'icejam-base16-zenburn)
   (require 'icejam-base16-harmonic-light)
-  (require 'icejam-base16-catppuccin-latte)
+  (require 'icejam-base16-catppuccin-frappe)
 
   (if (memq window-system '(x mac ns))
-      (enable-theme 'icejam-base16-zenburn)
+      (enable-theme 'icejam-base16-catppuccin-frappe)
     (enable-theme 'icejam-base16-zenburn)))
 
 (provide 'icejam-themes)
diff --git a/lisp/themes/icejam-base16-catppuccin-frappe.el b/lisp/themes/icejam-base16-catppuccin-frappe.el
new file mode 100644
index 0000000..72dc45c
--- /dev/null
+++ b/lisp/themes/icejam-base16-catppuccin-frappe.el
@@ -0,0 +1,47 @@
+;; icejam-base16-catppuccin-frappe.el -- A base16 colorscheme  -*- lexical-binding: t; -*-
+
+;;; Commentary:
+;; Base16: (https://github.com/tinted-theming/home)
+
+;;; Authors:
+;; Scheme: https://github.com/catppuccin/catppuccin
+;; Template: Kaleb Elwert <belak@coded.io>
+
+;;; Code:
+
+(declare-function base16-theme-define "base16-theme" (theme-name theme-colors))
+
+(defvar icejam-base16-catppuccin-frappe-theme-colors
+  '(:base00 "#303446"
+    :base01 "#292c3c"
+    :base02 "#414559"
+    :base03 "#5f667f"
+    :base04 "#626880"
+    :base05 "#c6d0f5"
+    :base06 "#f2d5cf"
+    :base07 "#babbf1"
+    :base08 "#e78284"
+    :base09 "#ef9f76"
+    :base0A "#e5c890"
+    :base0B "#a6d189"
+    :base0C "#81c8be"
+    :base0D "#8caaee"
+    :base0E "#ca9ee6"
+    :base0F "#eebebe")
+  "All colors for Base16 Catppuccin Frappe are defined here.")
+
+;; Define the theme
+(deftheme icejam-base16-catppuccin-frappe)
+
+(with-eval-after-load 'base16-theme
+  (base16-theme-define 'icejam-base16-catppuccin-frappe
+                       icejam-base16-catppuccin-frappe-theme-colors))
+
+;; Add all the faces to the theme
+(base16-theme-define 'icejam-base16-catppuccin-frappe
+                     icejam-base16-catppuccin-frappe-theme-colors)
+
+;; Mark the theme as provided
+(provide-theme 'icejam-base16-catppuccin-frappe)
+(provide 'icejam-base16-catppuccin-frappe)
+;;; icejam-base16-catppuccin-frappe.el ends here