diff --git a/init.el b/init.el
index 96d354e..7705371 100644
--- a/init.el
+++ b/init.el
@@ -93,7 +93,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(font-lock-constant-face ((((type graphic)) (:foreground "#dfaf8f")) (((min-colors 256)) (:foreground "brightred")) (t (:foreground "brightred"))))
- '(font-lock-type-face ((t (:foreground "#ffcb6b" :family "JetBrains Mono"))))
+ ;; '(font-lock-type-face ((t (:foreground "#ffcb6b" :family "JetBrains Mono"))))
  '(markdown-code-face ((t (:inherit fixed-pitch :family "IBM Plex Mono"))))
  '(mmm-default-submode-face ((t nil))))
 
diff --git a/pkg/fonts.el b/pkg/fonts.el
index f11cf8a..4637fd7 100644
--- a/pkg/fonts.el
+++ b/pkg/fonts.el
@@ -24,12 +24,12 @@
 (defun set-font (name size)
   "Set font to NAME and its SIZE to X pixels."
   (interactive "sNew font: \nnEnter size for %s: ")
-  (defvar +custom-font name)
-  (defvar +custom-font-size size)
+  (setq +custom-font name)
+  (setq +custom-font-size size)
 
   (set-face-attribute 'default nil :font (format "%s %d" name size))
 
-  ;; Set comletion and modeline font to be 1 pixel point smaller than
+  ;; Set completion and modeline font to be 1 pixel point smaller than
   ;; the general font
   ;; (set-face-attribute 'markdown-code-face nil :font (format "%s %d" name (- size 1)))
   (set-face-attribute 'tooltip nil :font (format "%s %d" name (- size 1)))
@@ -42,12 +42,11 @@
   ;; Call LSP-UI hook
   (+custom-set-lsp-ui-font-hook))
 
-;; (defconst +custom-font "Iosevka Term")
-;; (defconst +custom-font "JetBrains Mono")
-(defvar +custom-font "IBM Plex Mono")
+;; (defvar +custom-font "Iosevka Term")
+(defvar +custom-font "JetBrains Mono")
+;; (defvar +custom-font "IBM Plex Mono")
 (defvar +custom-font-size 14)
 
-
 (defun set-font-to-screen ()
   "Automatically set font size to suit the monitor."
   ;; If display is set to emulate FullHD resultion or less, make the font
diff --git a/pkg/themes.el b/pkg/themes.el
index 92efec4..c10d06b 100644
--- a/pkg/themes.el
+++ b/pkg/themes.el
@@ -11,35 +11,34 @@
   (sml/setup))
 
 (use-package base16-theme :straight t :defer t)
-(use-package flatui-theme :straight t :defer t)
-(use-package planet-theme :straight t :defer t)
 (use-package apropospriate-theme :straight t :defer t)
-(use-package material-theme :straight t :defer t)
 
 ;; Disable cursor blinking
 (blink-cursor-mode 0)
 
+;; Set themes for terminal mode
+(setq base16-theme-256-color-source "colors")
+
 ;; Light themes
-(load-theme 'material-light t)
-(load-theme 'base16-zenburn t)
 (load-theme 'base16-atelier-forest-light t t)
 (load-theme 'base16-harmonic-light t t)
 (load-theme 'apropospriate-light t t)
 (load-theme 'base16-humanoid-light t t)
 
 ;; Dark themes
-(load-theme 'material t)
+(load-theme 'base16-zenburn t)
+(load-theme 'base16-tomorrow-night-eighties t t)
+(load-theme 'base16-dracula t t)
 (load-theme 'base16-solarflare t t)
 (load-theme 'base16-snazzy t t)
 (load-theme 'base16-gruvbox-dark-hard t t)
 
-(if (display-graphic-p)
-    (progn
-      (sml/apply-theme 'respectful)
-      (enable-theme 'base16-harmonic-light))
-  (progn
-    (defvar base16-theme-256-color-source "base16-shell")
-    (enable-theme 'apropospriate-light)))
+;; My own theme modifications:
+(require 'base16-zenburn-modified-theme
+         "$HOME/.emacs.d/themes/base16-zenburn-modified.el")
+
+(sml/apply-theme 'respectful)
+(enable-theme 'base16-zenburn-modified)
 
 (provide '+custom-pkg-themes)
 ;;; themes.el ends here
diff --git a/themes/themes-base16-zenburn-modified.el b/themes/base16-zenburn-modified.el
similarity index 86%
rename from themes/themes-base16-zenburn-modified.el
rename to themes/base16-zenburn-modified.el
index a9774f9..0b0f939 100644
--- a/themes/themes-base16-zenburn-modified.el
+++ b/themes/base16-zenburn-modified.el
@@ -11,17 +11,20 @@
 ;;; Code:
 
 ;; Modifications
+;; 02 made darker by 5%   #606060 => #5b5b5b
 ;; 03 made lighter by 10% #6f6f6f => #898989
+;; 04 made darker by 5%   #808080 => #7a7a7a
 ;; 0B made lighter by 10% #5f7f5f => #799979
 
-(require 'base16-theme)
+
+(use-package base16-theme :straight t :defer t)
 
 (defvar base16-zenburn-modified-colors
   '(:base00 "#383838"
     :base01 "#404040"
-    :base02 "#606060"
+    :base02 "#5b5b5b"
     :base03 "#898989"
-    :base04 "#808080"
+    :base04 "#7a7a7a"
     :base05 "#dcdccc"
     :base06 "#c0c0c0"
     :base07 "#ffffff"
@@ -45,5 +48,4 @@
 (provide-theme 'base16-zenburn-modified)
 
 (provide 'base16-zenburn-modified-theme)
-
 ;;; base16-zenburn-modified-theme.el ends here