diff --git a/home/modules/shell.nix b/home/modules/shell.nix
index c8ba009..ce9971a 100644
--- a/home/modules/shell.nix
+++ b/home/modules/shell.nix
@@ -47,6 +47,7 @@ in
 
   home.sessionVariables = lib.mkMerge [
     {
+      FZF_DEFAULT_OPTS_FILE = "${config.xdg.configHome}/fzf/themes/theme";
       LESSHISTFILE = "-";
       WGETRC = "${config.xdg.configHome}/wgetrc";
       LUAROCKS_CONFIG = "${config.xdg.configHome}/luarocks/config.lua";
@@ -246,9 +247,6 @@ in
       "--bind=ctrl-b:half-page-up"
       "--no-scrollbar"
       "--no-info"
-      "--color=fg:${c.fg},bg:${c.bg},hl:${c.accent}"
-      "--color=fg+:${c.fg},bg+:${c.bgAlt},hl+:${c.accent}"
-      "--color=info:${c.green},prompt:${c.accent},pointer:${c.fg},marker:${c.green},spinner:${c.fg}"
     ];
     changeDirWidgetCommand = "fd --type d --hidden";
     fileWidgetCommand = "rg --files --hidden";
diff --git a/home/modules/theme.nix b/home/modules/theme.nix
index dfef37b..ab74a18 100644
--- a/home/modules/theme.nix
+++ b/home/modules/theme.nix
@@ -109,6 +109,8 @@ in
         $DRY_RUN_CMD ln -sf "$cfg/hypr/themes/$theme.conf" "$cfg/hypr/themes/theme.conf"
         $DRY_RUN_CMD ln -sf "$cfg/waybar/themes/$theme.css" "$cfg/waybar/themes/theme.css"
         $DRY_RUN_CMD ln -sf "$cfg/fuzzel/themes/$theme.ini" "$cfg/fuzzel/themes/theme.ini"
+        $DRY_RUN_CMD mkdir -p "$cfg/dunst/dunstrc.d"
+        $DRY_RUN_CMD ln -sf "$cfg/dunst/themes/$theme.conf" "$cfg/dunst/dunstrc.d/theme.conf"
       ''}
       $DRY_RUN_CMD ln -sf "$cfg/sioyek/themes/$theme.config" "$cfg/sioyek/themes/theme.config"
       $DRY_RUN_CMD ln -sf "$cfg/fzf/themes/$theme" "$cfg/fzf/themes/theme"
diff --git a/home/modules/ui.nix b/home/modules/ui.nix
index e6b925b..03de030 100644
--- a/home/modules/ui.nix
+++ b/home/modules/ui.nix
@@ -35,6 +35,29 @@ let
     border=${hexToFuzzel palette.border}
     counter=${hexToFuzzel palette.fgAlt}
   '';
+
+  mkDunstTheme = palette: ''
+    [global]
+    frame_color = "${palette.border}"
+    separator_color = "frame"
+    background = "${palette.bg}"
+    foreground = "${palette.fg}"
+
+    [urgency_low]
+    background = "${palette.bg}"
+    foreground = "${palette.fg}"
+    frame_color = "${palette.border}"
+
+    [urgency_normal]
+    background = "${palette.bg}"
+    foreground = "${palette.fg}"
+    frame_color = "${palette.border}"
+
+    [urgency_critical]
+    background = "${palette.bg}"
+    foreground = "${palette.red}"
+    frame_color = "${palette.red}"
+  '';
 in
 {
   home.sessionVariables = lib.mkMerge [
@@ -267,33 +290,14 @@ in
         padding = 10;
         horizontal_padding = 10;
         frame_width = 3;
-        frame_color = c.border;
-        separator_color = "frame";
         separator_height = 1;
         gap_size = 8;
         corner_radius = 0;
-        background = c.bg;
-        foreground = c.fg;
         alignment = "left";
         ellipsize = "end";
         icon_position = "left";
         max_icon_size = 32;
       };
-      urgency_low = {
-        background = c.bg;
-        foreground = c.fg;
-        frame_color = c.border;
-      };
-      urgency_normal = {
-        background = c.bg;
-        foreground = c.fg;
-        frame_color = c.border;
-      };
-      urgency_critical = {
-        background = c.bg;
-        foreground = c.red;
-        frame_color = c.red;
-      };
       ctl = {
         appname = "ctl";
         icon_position = "off";
@@ -304,6 +308,8 @@ in
       };
     };
   };
+  xdg.configFile."dunst/themes/midnight.conf".text = mkDunstTheme config.palettes.midnight;
+  xdg.configFile."dunst/themes/daylight.conf".text = mkDunstTheme config.palettes.daylight;
   xdg.configFile."waybar/themes/midnight.css".text = mkWaybarTheme config.palettes.midnight;
   xdg.configFile."waybar/themes/daylight.css".text = mkWaybarTheme config.palettes.daylight;