diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 3725d96..23a706a 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -103,14 +103,14 @@ bind = ALT SHIFT, Y, exec, hypr spawnfocus --ws 3 sioyek
 bind = , XF86Tools, submap, scripts
 submap = scripts
 
-bind = , A, exec, ctl audio out
-bind = , C, exec, sh -lc 'cliphist list | fuzzel --dmenu --prompt="clip:  " | cliphist decode | wl-copy'
-bind = , K, exec, ctl keyboard next
-bind = , O, exec, ctl ocr
-bind = , M, exec, ctl media
-bind = , P, exec, ctl power
-bind = , S, exec, ctl screenshot
-bind = , T, exec, theme
+bind = , A, exec, hyprctl dispatch submap reset; ctl audio out
+bind = , C, exec, hyprctl dispatch submap reset; sh -lc 'cliphist list | fuzzel --dmenu --prompt="clip:  " | cliphist decode | wl-copy'
+bind = , K, exec, hyprctl dispatch submap reset; ctl keyboard next
+bind = , O, exec, hyprctl dispatch submap reset; ctl ocr
+bind = , M, exec, hyprctl dispatch submap reset; ctl media
+bind = , P, exec, hyprctl dispatch submap reset; ctl power
+bind = , S, exec, hyprctl dispatch submap reset; ctl screenshot
+bind = , T, exec, hyprctl dispatch submap reset; theme
 
 bind = , catchall, submap, reset
 submap = reset
diff --git a/hosts/xps15/configuration.nix b/hosts/xps15/configuration.nix
index f5b4292..6313de2 100644
--- a/hosts/xps15/configuration.nix
+++ b/hosts/xps15/configuration.nix
@@ -108,7 +108,7 @@ in
     enable = true;
     vt = 1;
     settings.default_session = {
-      command = "${tuigreet} --time --asterisks --cmd '${pkgs.zsh}/bin/zsh --login' --theme 'border=dark-gray;text=white;prompt=blue;time=dark-gray;action=dark-gray;button=blue;container=black;input=white'";
+      command = "${tuigreet} --time --asterisks --cmd '${lib.getExe config.users.users.barrett.shell} --login' --theme 'border=dark-gray;text=white;prompt=blue;time=dark-gray;action=dark-gray;button=blue;container=black;input=white'";
       user = "greeter";
     };
   };