diff --git a/default/bash/fns/worktrees b/default/bash/fns/worktrees
index 435784be..5fc1063a 100644
--- a/default/bash/fns/worktrees
+++ b/default/bash/fns/worktrees
@@ -17,7 +17,7 @@ ga() {
 # Remove worktree and branch from within active worktree directory.
 gd() {
   if gum confirm "Remove worktree and branch?"; then
-    local cwd base branch root
+    local cwd base branch root worktree
 
     cwd="$(pwd)"
     worktree="$(basename "$cwd")"
@@ -29,7 +29,7 @@ gd() {
     # Protect against accidentally nuking a non-worktree directory
     if [[ "$root" != "$worktree" ]]; then
       cd "../$root"
-      git worktree remove "$worktree" --force
+      git worktree remove "$cwd" --force || return 1
       git branch -D "$branch"
     fi
   fi
diff --git a/default/hypr/apps/jetbrains.conf b/default/hypr/apps/jetbrains.conf
index 5b73bce4..822e676e 100644
--- a/default/hypr/apps/jetbrains.conf
+++ b/default/hypr/apps/jetbrains.conf
@@ -14,7 +14,7 @@ windowrule {
 windowrule {
     name = jetbrains-popup
     match:class = ^(jetbrains-.*)
-    match:title = ^()$
+    match:title = ^(| )$
     match:float = 1
     tag = +jetbrains
     center = on
diff --git a/install/config/hardware/intel.sh b/install/config/hardware/intel.sh
index 6c2b8564..fde344ec 100644
--- a/install/config/hardware/intel.sh
+++ b/install/config/hardware/intel.sh
@@ -2,7 +2,7 @@
 # Check if we have an Intel GPU at all
 if INTEL_GPU=$(lspci | grep -iE 'vga|3d|display' | grep -i 'intel'); then
   # HD Graphics / Iris / Xe / Arc use intel-media-driver
-  if [[ ${INTEL_GPU,,} =~ "hd graphics"|"xe"|"iris"|"arc" ]]; then
+  if [[ ${INTEL_GPU,,} =~ (hd\ graphics|xe|iris|arc) ]]; then
     omarchy-pkg-add intel-media-driver
   elif [[ ${INTEL_GPU,,} =~ "gma" ]]; then
     # Older generations from 2008 to ~2014-2017 use libva-intel-driver
diff --git a/migrations/1772907198.sh b/migrations/1772907198.sh
index 640d8733..82f21fe0 100644
--- a/migrations/1772907198.sh
+++ b/migrations/1772907198.sh
@@ -4,7 +4,7 @@ if [[ -f ~/.config/tmux/tmux.conf ]]; then
   if ! grep -q "set -gw automatic-rename on" ~/.config/tmux/tmux.conf; then
     sed -i '/set -g window-status-separator ""/a\
 set -gw automatic-rename on\
-set -gw automatic-rename-format '\''#{b:pane_current_path}'\'' \
+set -gw automatic-rename-format '\''#{b:pane_current_path}'\''\
 ' ~/.config/tmux/tmux.conf
     omarchy-restart-tmux
   fi