diff --git a/bin/omarchy-branch-set b/bin/omarchy-branch-set
index ef531e91..a6af4fa3 100755
--- a/bin/omarchy-branch-set
+++ b/bin/omarchy-branch-set
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if (($# == 0)); then
-  echo "Usage: omarchy-channel-set [master|dev]"
+  echo "Usage: omarchy-branch-set [master|dev]"
   exit 1
 else
   branch="$1"
diff --git a/bin/omarchy-channel-set b/bin/omarchy-channel-set
index 067aad2d..653d3bb3 100755
--- a/bin/omarchy-channel-set
+++ b/bin/omarchy-channel-set
@@ -9,7 +9,7 @@ fi
 
 case "$channel" in
 "stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" ;;
-"edge") omarchy-branch-set "edge" && omarchy-refresh-pacman "stable" ;;
+"edge") omarchy-branch-set "master" && omarchy-refresh-pacman "edge" ;;
 "dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
 *) echo "Unknown channel: $channel"; exit 1; ;;
 esac
diff --git a/bin/omarchy-cmd-screensaver b/bin/omarchy-cmd-screensaver
index 156b1180..d17ff55b 100755
--- a/bin/omarchy-cmd-screensaver
+++ b/bin/omarchy-cmd-screensaver
@@ -18,11 +18,10 @@ printf '\033]11;rgb:00/00/00\007'  # Set background color to black
 hyprctl keyword cursor:invisible true &>/dev/null
 
 while true; do
-  effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | grep -Ev '^(dev_worm)$' | sort -u | shuf -n1)
-
   tte -i ~/.config/omarchy/branding/screensaver.txt \
     --frame-rate 120 --canvas-width 0 --canvas-height 0 --reuse-canvas --anchor-canvas c --anchor-text c\
-    --no-eol --no-restore-cursor $effect &
+    --random-effect --exclude-effects dev_worm \
+    --no-eol --no-restore-cursor &
 
   while pgrep -x tte >/dev/null; do
     if read -n 1 -t 1 || ! screensaver_in_focus; then
diff --git a/bin/omarchy-lock-screen b/bin/omarchy-lock-screen
index f57d4526..b16c56a2 100755
--- a/bin/omarchy-lock-screen
+++ b/bin/omarchy-lock-screen
@@ -3,6 +3,9 @@
 # Lock the screen
 pidof hyprlock || hyprlock &
 
+# Set keyboard layout to default (first layout)
+hyprctl switchxkblayout all 0 > /dev/null 2>&1
+
 # Ensure 1password is locked
 if pgrep -x "1password" >/dev/null; then
   1password --lock &
diff --git a/bin/omarchy-refresh-pacman b/bin/omarchy-refresh-pacman
index 36d9678f..d9ab3d2a 100755
--- a/bin/omarchy-refresh-pacman
+++ b/bin/omarchy-refresh-pacman
@@ -17,4 +17,6 @@ else
 fi
 
 echo
-sudo pacman -Syu --noconfirm
+
+# Reset all package DBs and then update
+sudo pacman -Syyu --noconfirm
diff --git a/bin/omarchy-theme-remove b/bin/omarchy-theme-remove
index e3733feb..21959454 100755
--- a/bin/omarchy-theme-remove
+++ b/bin/omarchy-theme-remove
@@ -7,7 +7,7 @@ if [ -z "$1" ]; then
   mapfile -t extra_themes < <(find ~/.config/omarchy/themes -mindepth 1 -maxdepth 1 -type d ! -xtype l -printf '%f\n')
 
   if [[ ${#extra_themes[@]} -gt 0 ]]; then
-    THEME_NAME=$(gum choose --header="Remove extra theme" "${extra_themes[@]}")
+    THEME_NAME=$(printf '%s\n' "${extra_themes[@]}" | sort | gum choose --header="Remove extra theme")
   else
     echo "No extra themes installed."
     exit 1
diff --git a/bin/omarchy-update-confirm b/bin/omarchy-update-confirm
index a5e87d4b..df3d8145 100755
--- a/bin/omarchy-update-confirm
+++ b/bin/omarchy-update-confirm
@@ -1,10 +1,14 @@
 #!/bin/bash
 
 gum style --border normal --border-foreground 6 --padding "1 2" \
-  "Ready to update Omarchy?" \
+  "Ready to update?" \
   "" \
   "• You cannot stop the update once you start!" \
-  "• Make sure you're connected to power or have a full battery"
+  "• Make sure you're connected to power or have a full battery" \
+  "" \
+  "What's new: https://github.com/basecamp/omarchy/releases"
+
+echo
 
 if ! gum confirm "Continue with update?"; then
   echo "Update cancelled"
diff --git a/config/walker/config.toml b/config/walker/config.toml
index 5f9e1237..9bd2b05e 100644
--- a/config/walker/config.toml
+++ b/config/walker/config.toml
@@ -10,12 +10,15 @@ hide_action_hints = true                                                    # gl
 [keybinds]
 quick_activate = []
 
+[columns]
+symbols = 1 # providers to be queried by default
+
 [providers]
 max_results = 256 # 256 should be enough for everyone
 default = [
   "desktopapplications",
   "websearch",
-] # providers to be queried by default
+]
 
 [[providers.prefixes]]
 prefix = "/"
diff --git a/default/hypr/bindings/utilities.conf b/default/hypr/bindings/utilities.conf
index cdb852e5..a2a6e81e 100644
--- a/default/hypr/bindings/utilities.conf
+++ b/default/hypr/bindings/utilities.conf
@@ -19,6 +19,7 @@ bindd = SUPER, COMMA, Dismiss last notification, exec, makoctl dismiss
 bindd = SUPER SHIFT, COMMA, Dismiss all notifications, exec, makoctl dismiss --all
 bindd = SUPER CTRL, COMMA, Toggle silencing notifications, exec, makoctl mode -t do-not-disturb && makoctl mode | grep -q 'do-not-disturb' && notify-send "Silenced notifications" || notify-send "Enabled notifications"
 bindd = SUPER ALT, COMMA, Invoke last notification, exec, makoctl invoke
+bindd = SUPER SHIFT ALT, COMMA, Invoke last notification, exec, makoctl restore
 
 # Toggle idling
 bindd = SUPER CTRL, I, Toggle locking on idle, exec, omarchy-toggle-idle
diff --git a/migrations/1764332115.sh b/migrations/1764332115.sh
new file mode 100644
index 00000000..f9df037d
--- /dev/null
+++ b/migrations/1764332115.sh
@@ -0,0 +1,3 @@
+echo "Ensure emoji menu (Super + Ctrl + E) uses single column design"
+
+omarchy-refresh-walker
diff --git a/migrations/1764333665.sh b/migrations/1764333665.sh
new file mode 100644
index 00000000..e6d5fee5
--- /dev/null
+++ b/migrations/1764333665.sh
@@ -0,0 +1,3 @@
+echo "Ensure you have package repository indexes matching your channel"
+
+sudo pacman -Syyu --noconfirm
diff --git a/themes/ristretto/ghostty.conf b/themes/ristretto/ghostty.conf
index f4ba692b..94a80fcb 100644
--- a/themes/ristretto/ghostty.conf
+++ b/themes/ristretto/ghostty.conf
@@ -1 +1,2 @@
 theme = Monokai Pro Ristretto
+cursor-text = #000000
diff --git a/version b/version
index e4604e3a..be94e6f5 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-3.2.1
+3.2.2