diff --git a/home-manager/users/nathan/packages/scripts/default.nix b/home-manager/users/nathan/packages/scripts/default.nix
index 45571f8..4e946f6 100644
--- a/home-manager/users/nathan/packages/scripts/default.nix
+++ b/home-manager/users/nathan/packages/scripts/default.nix
@@ -29,21 +29,26 @@
                     mkdir /tmp/nathan
                 fi
 
-	            img=''$(realpath ''$1)
-	            ext="''${''$(basename ''$img)''\#''\#*.}"
+	            img=''$(realpath "''${1:-$(find ~/Pictures/Wallpaper | rofi -dmenu)}")
+                n=''$(basename "''$img")
+	            ext="''${n''\#''\#*.}"
 
                 if [[ ''$ext == "gif" || ''$ext == "mp4" ]]; then
-                    ${pkgs.ffmpeg}/bin/ffmpeg -i ''$img -vframes 1 /tmp/nathan/tmp.jpg
+                    yes | ${pkgs.ffmpeg}/bin/ffmpeg -i "''$img" -vframes 1 /tmp/nathan/tmp.jpg
+                    pidof mpvpaper && pkill mpvpaper
                     ${pkgs.swww}/bin/swww img /tmp/nathan/tmp.jpg -t wipe
                     sleep 0.3
                     hyprctl dispatch exec "${pkgs.mpvpaper}/bin/mpvpaper ALL ''$img -o loop"
-                else
-
                     hyprctl dispatch exec "${pkgs.swww}/bin/swww img ''$img -t wipe"
+                    ${pkgs.hyprpanel}/bin/hyprpanel sw ~/Pictures/Wallpaper/bluescape.jpg
+                    ${pkgs.hyprpanel}/bin/hyprpanel sw /tmp/nathan/tmp.jpg
+                else
+                    pidof mpvpaper && pkill mpvpaper
+                    hyprctl dispatch exec "${pkgs.swww}/bin/swww img ''$img -t wipe"
+                    ${pkgs.hyprpanel}/bin/hyprpanel sw "''$img"
                 fi
 
-                ${pkgs.hyprpanel}/bin/hyprpanel sw ''$img
-                changeColors ''$img ''$2
+                changeColors "''$img" "''$2"
 	        '')
 
 	        (pkgs.writeShellScriptBin "changeColors" ''