diff --git a/home-manager/users/nathan/dotfiles/hypr/main.conf b/home-manager/users/nathan/dotfiles/hypr/main.conf
index c441ff7..4a0c1f5 100644
--- a/home-manager/users/nathan/dotfiles/hypr/main.conf
+++ b/home-manager/users/nathan/dotfiles/hypr/main.conf
@@ -23,7 +23,7 @@ input {
 	kb_layout = us,jp
 	kb_variant =
 	kb_model =
-	kb_options = grp:caps_toggle
+	kb_options =
 	kb_rules =
 
         follow_mouse = 1
@@ -144,8 +144,8 @@ bind = $mainMod, Menu, exec, hyprpanel -q; hyprpanel
 #bind = $mainMod, P, pseudo, # dwindle
 #bind = $mainMod, Z, togglesplit, # dwindle
 
-bind = $mainMod, N, rollnext, # master
-bind = $mainMod, P, rollprev, # master
+bind = $mainMod, N, layoutmsg, rollnext # master
+bind = $mainMod, P, layoutmsg, rollprev # master
 
 bind = $mainMod, M, exec, spotify
 
diff --git a/home-manager/users/nathan/packages/scripts/default.nix b/home-manager/users/nathan/packages/scripts/default.nix
index 0ec628c..dff9a06 100644
--- a/home-manager/users/nathan/packages/scripts/default.nix
+++ b/home-manager/users/nathan/packages/scripts/default.nix
@@ -30,7 +30,7 @@
                 fi
 
 	            img=''$(realpath ''${''$1:-${config.home.homeDirectory}/Pictures/Wallpaper/''$(${pkgs.eza}/bin/eza ${config.home.homeDirectory}/Pictures/Wallpaper -X | rofi -dmenu)})
-	            ext="''${''$(basename ''$img)\##*.}"
+	            ext="''${''$(basename ''$img)''\#''\#*.}"
 
                 if [[ ''$ext == "gif" || ''$ext == "mp4" ]]; then
                     ${pkgs.ffmpeg}/bin/ffmpeg -i ''$img -vframes 1 /tmp/nathan/tmp.jpg
@@ -98,12 +98,11 @@
                 fi
 
                 hyprctl --batch "\
-                dispatch exec ${pkgs.swww}/bin/swww-daemon\
-                dispatch exec setWallpaper /tmp/nathan/bg\
-                
-	            dispatch exec ${pkgs.pyprland}/bin/pypr\
-                dispatch exec ${pkgs.netbird-ui}/bin/netbird-ui\
-	            dispatch exec ${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent\
+                dispatch exec ${pkgs.swww}/bin/swww-daemon ;\
+                dispatch exec setWallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg ;\
+	            dispatch exec ${pkgs.pyprland}/bin/pypr ;\
+                dispatch exec ${pkgs.netbird-ui}/bin/netbird-ui ;\
+	            dispatch exec ${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent ;\
                 setcursor Bibata-Modern-Classic 16"
                 sleep 3
 		        hyprctl reload