diff --git a/init.el b/init.el
index 01ad07a..834be60 100644
--- a/init.el
+++ b/init.el
@@ -445,8 +445,6 @@ Try `magit-clone-default-directory' if available, fall back to
 
 (use-package catppuccin-theme
   :demand
-  :hook
-  (server-after-make-frame . catppuccin-reload)
   :custom
   (catppuccin-flavour 'mocha)
   (catppuccin-italic-blockquotes t)
@@ -638,21 +636,28 @@ Try `magit-clone-default-directory' if available, fall back to
                               (lua . t)
                               (python . t)))
   :config
-  ;; Ensure tables and src blocks use fixed-pitch font.
-  (set-face-attribute 'org-table nil
-                      :inherit 'fixed-pitch
-                      :foreground (catppuccin-get-color 'overlay2))
-  (set-face-attribute 'org-block nil
-                      :inherit 'fixed-pitch
-                      :foreground (catppuccin-get-color 'overlay2))
-  ;; Let quote and verse blocks use variable-pitch font, if configured
-  (set-face-attribute 'org-quote nil :inherit 'variable-pitch)
-  (set-face-attribute 'org-verse nil :inherit 'variable-pitch)
   ;; Enable auto-fill in org-mode buffers
   (add-hook 'org-mode-hook #'turn-on-auto-fill)
   ;; Extra `setq' calls to be moved somewhere else
   (setq org-attach-id-dir (expand-file-name "data/" org-directory)))
 
+(use-package org-faces
+  :after (org catppuccin-theme)
+  :config
+  ;; Ensure tables and src blocks use fixed-pitch font.
+  (set-face-attribute 'org-block nil
+                      :inherit 'fixed-pitch
+                      :foreground (catppuccin-get-color 'text))
+  (set-face-attribute 'org-code nil
+                      :inherit 'fixed-pitch
+                      :foreground (catppuccin-get-color 'subtext0))
+  (set-face-attribute 'org-table nil
+                      :inherit 'fixed-pitch
+                      :foreground (catppuccin-get-color 'subtext1))
+  ;; Let quote and verse blocks use variable-pitch font, if configured
+  (set-face-attribute 'org-quote nil :inherit 'variable-pitch)
+  (set-face-attribute 'org-verse nil :inherit 'variable-pitch))
+
 (use-package org-keys
   :custom
   (org-return-follows-link t)