diff --git a/init.el b/init.el
index 4160b73..a9a2a08 100644
--- a/init.el
+++ b/init.el
@@ -449,15 +449,13 @@ Uses `my/projects-directory' to find correct directory"
                    other-window))
   (advice-add command :after #'pulse-line))
 
-(use-package catppuccin-theme
+(use-package base16-theme
   :demand
   :custom
-  (catppuccin-flavour 'mocha)
-  (catppuccin-italic-blockquotes t)
-  (catppuccin-italic-comments t)
-  (catppuccin-italic-variables nil)
+  (base16-theme-distinct-fringe-background t)
+  (base16-theme-highlight-mode-line 'contrast)
   :config
-  (load-theme 'catppuccin t))
+  (load-theme 'base16-catppuccin-mocha t))
 
 (use-package nerd-icons
   :config (nerd-icons-set-font "Symbols Nerd Font Mono-12"))
@@ -908,9 +906,8 @@ Uses `my/projects-directory' to find correct directory"
           ("C-c c e" . eglot)
           ("C-c c a" . eglot-code-actions)
           ("C-c c r" . eglot-rename))
-  :hook (((nix-mode python-base-mode fortran-mode f90-mode) . eglot-ensure)
-         (eglot-managed-mode . (lambda () (add-hook 'flymake-diagnostic-functions
-                                               'eglot-flymake-backend nil t))))
+  :hook ((eglot-managed-mode . (lambda () (add-hook 'flymake-diagnostic-functions
+                                                    'eglot-flymake-backend nil t))))
   :custom
   (eglot-extend-to-xref t)
   (eglot-autoshutdown t)
@@ -1043,7 +1040,7 @@ Uses `my/projects-directory' to find correct directory"
 (use-package python
   :hook ((python-base-mode . (lambda () (my/enable-fill-column 88)))
          (python-base-mode . (lambda () (add-hook 'flymake-diagnostic-functions
-                                             'flymake-collection-mypy nil t))))
+                                                  'flymake-collection-mypy nil t))))
   :custom
   ;; Set max line length for compatibility with black formatter
   (python-flymake-command
diff --git a/install.el b/install.el
index ae13fe4..3aed375 100644
--- a/install.el
+++ b/install.el
@@ -7,7 +7,7 @@
 (setopt package-selected-packages
         '(
           ;; Theme
-          catppuccin-theme
+          base16-theme
           ;; UI
           all-the-icons nerd-icons nerd-icons-completion nerd-icons-corfu nerd-icons-dired nerd-icons-ibuffer doom-modeline diminish ligature page-break-lines helpful which-key link-hint diff-hl
           ;; Completion
@@ -37,7 +37,7 @@
           ;; Email
           mu4e
           ;; RSS feeds
-          elfeed elfeed-org
+          elfeed elfeed-org elfeed-tube
           ))
 (package-install-selected-packages)
 (package-autoremove)