diff --git a/dot_config/doom/config.el.tmpl b/dot_config/doom/config.el.tmpl
index e59536444090b0e9b35a22c83c8ef47d0dc9537e..7fece2f70bca563f7431e3db7276997b39ea1d4f 100644
--- a/dot_config/doom/config.el.tmpl
+++ b/dot_config/doom/config.el.tmpl
@@ -6,14 +6,14 @@
 (setq doom-font (font-spec :family "{{ .font }}" :size 16)
       doom-variable-pitch-font (font-spec :family "{{ .font }}" :size 16))
 
-(setq doom-unicode-font (font-spec :family "Triplicate A Code"))
+(setq doom-unicode-font (font-spec :family "{{ .font }}"))
 
-(setq doom-theme 'catppuccin)
+(add-to-list 'custom-theme-load-path (expand-file-name "~/.config/doom/themes/everforest"))
 {{- if eq .theme_variant "dark"}}
-(setq catppuccin-flavor 'macchiato)
+(load-theme 'everforest-hard-dark t)
 {{- end }}
 {{- if eq .theme_variant "light"}}
-(setq catppuccin-flavor 'latte)
+(load-theme 'everforest-soft-light t)
 {{- end }}
 
 (setq display-line-numbers-type t)
diff --git a/dot_local/share/dark-mode.d/executable_swap.sh b/dot_local/share/dark-mode.d/executable_swap.sh
index 627dc80e856c9e4862191a342d088b7607f97060..2615f91abba341e54a90332f1a67273431008305 100644
--- a/dot_local/share/dark-mode.d/executable_swap.sh
+++ b/dot_local/share/dark-mode.d/executable_swap.sh
@@ -2,7 +2,8 @@
 
 sed -i 's/light/dark/g' ~/.config/chezmoi/chezmoi.toml
 chezmoi apply
-xfconf-query -c xsettings -p /Net/ThemeName -s "Catppuccin-Macchiato-Standard-Rosewater-Dark"
+xfconf-query -c xsettings -p /Net/ThemeName -s "Everforest-Dark"
+gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
 xrdb -load ~/.Xresources
 "$XDG_CONFIG_HOME/emacs/bin/doom" sync
 pkill dunst
@@ -22,6 +23,6 @@ else
 fi
 
 unlink ~/.wallpaper.png
-ln -s ~/Pictures/walls/catppuccin-macchiato.png ~/.wallpaper.png
+ln -s ~/Pictures/walls/everforest-dark.png ~/.wallpaper.png
 feh --bg-scale ~/.wallpaper.png
 notify-send "Theme switch complete"
diff --git a/dot_local/share/light-mode.d/executable_swap.sh b/dot_local/share/light-mode.d/executable_swap.sh
index 6bd7672d891f7d1ab1fafa79fef3bc354490161e..7fac827cfb5746d4d19faeba14b20b9578202e14 100644
--- a/dot_local/share/light-mode.d/executable_swap.sh
+++ b/dot_local/share/light-mode.d/executable_swap.sh
@@ -2,7 +2,8 @@
 
 sed -i 's/dark/light/g' ~/.config/chezmoi/chezmoi.toml
 chezmoi apply
-xfconf-query -c xsettings -p /Net/ThemeName -s "Catppuccin-Latte-Standard-Rosewater-Light"
+xfconf-query -c xsettings -p /Net/ThemeName -s "Everforest-Light-Soft"
+gsettings set org.gnome.desktop.interface color-scheme 'prefer-light'
 xrdb -load ~/.Xresources
 "$XDG_CONFIG_HOME/emacs/bin/doom" sync
 
@@ -22,6 +23,6 @@ else
 fi
 
 unlink ~/.wallpaper.png
-ln -s ~/Pictures/walls/catppuccin-latte.png ~/.wallpaper.png
+ln -s ~/Pictures/walls/everforest-light.png ~/.wallpaper.png
 feh --bg-scale ~/.wallpaper.png
 notify-send "Theme switch complete"