diff --git a/config/ghostty/config b/config/ghostty/config
index 350dc7f..ba89a0d 100644
--- a/config/ghostty/config
+++ b/config/ghostty/config
@@ -1,6 +1,7 @@
 font-family = "Cascadia Code"
+font-size = 14
 macos-titlebar-style = hidden
-theme = Catppuccin Frappe
+theme = Catppuccin Macchiato
 window-padding-x = 8
 window-padding-y = 8
 keybind = ctrl+tab=text:\x1b[9;5u
diff --git a/flakes/emacs/config/init.el b/flakes/emacs/config/init.el
index 845c11f..8c0aa1e 100644
--- a/flakes/emacs/config/init.el
+++ b/flakes/emacs/config/init.el
@@ -481,9 +481,26 @@
   (marginalia-mode))
 
 (use-package markdown-mode
+  :preface
+  (defun to/apply-markdown-faces (&rest _)
+    (when (facep 'markdown-header-face-1)
+      (set-face-attribute
+       'markdown-header-face-1 nil
+       :inherit 'variable-pitch
+       :weight 'light
+       :height 1.7))
+    (dolist (face '(markdown-code-face
+                    markdown-inline-code-face
+                    markdown-language-keyword-face
+                    markdown-pre-face))
+      (when (facep face)
+        (set-face-attribute face nil :inherit 'fixed-pitch))))
+  :hook (markdown-mode . variable-pitch-mode)
   :custom
   (markdown-fontify-code-blocks-natively t)
-  (markdown-spaces-after-code-fence 0))
+  (markdown-spaces-after-code-fence 0)
+  :config
+  (to/apply-markdown-faces))
 
 (use-package modus-themes
   :config
@@ -529,7 +546,51 @@
                                                 (border-mode-line-inactive unspecified)))
 
   (add-hook 'modus-themes-after-load-theme-hook #'to/modus-themes-custom-faces)
-  (modus-themes-load-theme 'modus-vivendi-tinted))
+  (add-hook 'modus-themes-after-load-theme-hook #'to/apply-markdown-faces))
+
+(use-package catppuccin-theme
+  :preface
+  (defun to/apply-org-heading-faces (&rest _)
+    (when (facep 'org-level-1)
+      (set-face-attribute
+       'org-document-title nil
+       :inherit 'variable-pitch
+       :weight 'light
+       :height 2.0)
+      (set-face-attribute
+       'org-level-1 nil
+       :inherit 'variable-pitch
+       :weight 'light
+       :height 1.7)
+      (set-face-attribute
+       'org-level-2 nil
+       :inherit 'variable-pitch
+       :weight 'semibold
+       :height 1.5)
+      (dolist (face '(org-level-3
+                      org-level-4
+                      org-level-5
+                      org-level-6
+                      org-level-7
+                      org-level-8))
+        (set-face-attribute
+         face nil
+         :inherit 'variable-pitch
+         :weight 'regular
+         :height 1.0))))
+  :init
+  (setq catppuccin-flavor 'macchiato)
+  :config
+  (mapc #'disable-theme custom-enabled-themes)
+  (load-theme 'catppuccin t)
+  (with-eval-after-load 'org
+    (to/apply-org-heading-faces))
+  (with-eval-after-load 'org-modern
+    (to/apply-org-heading-faces))
+  (with-eval-after-load 'markdown-mode
+    (to/apply-markdown-faces))
+  (advice-add 'catppuccin-reload :after #'to/apply-org-heading-faces)
+  (advice-add 'catppuccin-reload :after #'to/apply-markdown-faces))
 
 (use-package minions
   :config
diff --git a/flakes/emacs/home.nix b/flakes/emacs/home.nix
index 4b96637..e0f6bc4 100644
--- a/flakes/emacs/home.nix
+++ b/flakes/emacs/home.nix
@@ -45,6 +45,7 @@ in
         apheleia
         avy
         cape
+        catppuccin-theme
         cider
         clojure-mode
         consult