diff --git a/init.el b/init.el
index 3337b97..6dd7d72 100644
--- a/init.el
+++ b/init.el
@@ -162,6 +162,11 @@
 (use-package eshell
   :bind (("C-c t e" . eshell)))
 
+(use-package shr
+  :config
+  (require 'catppuccin-theme)
+  (set-face-attribute 'shr-text nil :foreground (catppuccin-get-color 'text)))
+
 (use-package eww
   :defer t
   :custom
@@ -450,26 +455,6 @@ Try `magit-clone-default-directory' if available, fall back to
   :config
   (load-theme 'catppuccin t))
 
-;; Theme
-(use-package modus-themes
-  :disabled t
-  :custom
-  (modus-themes-disable-other-themes t)
-  (modus-themes-to-toggle '(modus-operandi-tinted modus-vivendi-tinted))
-  (modus-themes-bold-constructs t)
-  (modus-themes-italic-constructs t)
-  (modus-themes-org-blocks nil)
-  (modus-themes-completions '((matches . (extrabold underline))
-                              (selection . (semibold italic))))
-  (modus-themes-headings '((1 . (1.4))
-                           (2 . (1.3))
-                           (3 . (1.2))
-                           (agenda-date . (1.3))
-                           (agenda-structure . (light 1.8))
-                           (t . (1.1))))
-  :config
-  (modus-themes-load-theme 'modus-vivendi-tinted))
-
 (use-package nerd-icons
   :config (nerd-icons-set-font "Symbols Nerd Font Mono-12"))
 
@@ -653,8 +638,12 @@ Try `magit-clone-default-directory' if available, fall back to
                               (python . t)))
   :config
   ;; 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)
+  (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)