diff --git a/init.el b/init.el
index dde31a3..0678f5e 100644
--- a/init.el
+++ b/init.el
@@ -442,7 +442,10 @@ Try `magit-clone-default-directory' if available, fall back to
   (catppuccin-italic-comments t)
   (catppuccin-italic-variables nil)
   :config
-  (load-theme 'catppuccin t))
+  (load-theme 'catppuccin t)
+  ;; Some custom changes to colour choices.
+  (set-face-attribute 'org-table nil :foreground (catppuccin-get-color 'overlay2))
+  (set-face-attribute 'org-block nil :foreground (catppuccin-get-color 'overlay2)))
 
 ;; Theme
 (use-package modus-themes
@@ -648,16 +651,9 @@ Try `magit-clone-default-directory' if available, fall back to
                               (lua . t)
                               (python . t)))
   :config
-  (require 'catppuccin-theme)
-  ;; Ensure tables and src blocks use fixed-pitch font. Also increase
-  ;; table foreground contrast to be more legible, and change
-  ;; org-block foreground from that weird green to normal text colour
-  (set-face-attribute 'org-table nil
-                      :foreground (catppuccin-get-color 'overlay2)
-                      :inherit 'fixed-pitch)
-  (set-face-attribute 'org-block nil
-                      :foreground (catppuccin-get-color 'text)
-                      :inherit 'fixed-pitch)
+  ;; Ensure tables and src blocks use fixed-pitch font.
+  (set-face-attribute 'org-table nil :inherit 'fixed-pitch)
+  (set-face-attribute 'org-block nil :inherit 'fixed-pitch)
   ;; 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)