diff --git a/.config/sway/config.d/keybinds b/.config/sway/config.d/keybinds
index cd00efb..4942cdb 100644
--- a/.config/sway/config.d/keybinds
+++ b/.config/sway/config.d/keybinds
@@ -14,8 +14,8 @@ bindsym $mod+d exec $menu
 # Change normal to inverse to use left mouse button for resizing and right
 # mouse button for dragging.
 # DISABLED 2026-09-28: experiment for windows popping out (accidental mod+click)
-#floating_modifier $mod normal
-floating_modifier none
+floating_modifier $mod normal
+#floating_modifier none
 
 # Reload the configuration file
 bindsym $mod+Shift+c reload
@@ -128,14 +128,11 @@ bindsym $mod+bracketright exec playerctl next
 bindsym $mod+backslash exec playerctl play-pause
 
 
-bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% \
-	&& pkill -RTMIN+10 i3blocks;
+bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
 
-bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% \
-	&& pkill -RTMIN+10 i3blocks;
+bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
 
-bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle \
-	&& pkill -RTMIN+10 i3blocks;
+bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
 
 bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
 
diff --git a/.config/sway/config.d/swayfx b/.config/sway/config.d/swayfx
index 8bd7b45..529f61a 100644
--- a/.config/sway/config.d/swayfx
+++ b/.config/sway/config.d/swayfx
@@ -41,6 +41,22 @@ set $base0F #666666
 
 # base00-02=bg #3E3B33, base03=olive #8C9A6B, base04=peach #F3B49F, base05=rust #D9714C, base06-07=cream #FFE8DB
 
+# ╔══════════════════════════════════════════════════════════════════╗
+# ║ FOCUS RING (subtle gray ramp)                                    ║
+# ║                                                                  ║
+# ║ With `border pixel` the line you actually see around a window is ║
+# ║ child_border (5th color). `border` (1st) only paints title bars, ║
+# ║ which pixel borders don't have -- so both are set to the same    ║
+# ║ gray here. Previously child_border for focused windows was       ║
+# ║ $base00 (#000000) = invisible on a black background, which is    ║
+# ║ why the focused window was hard to spot.                         ║
+# ║                                                                  ║
+# ║ Tune: lighter = easier to spot, darker = less obvious.           ║
+# ╚══════════════════════════════════════════════════════════════════╝
+set $border_focus    #252525
+set $border_inactive #171717
+set $border_unfocused #0D0D0D
+
 #set $base00 #000000
 #set $base01 #121212
 #set $base02 #222222
@@ -59,9 +75,9 @@ set $base0F #666666
 #set $base0F #444444
 
 # Property Name         Border  BG      Text    Indicator Child Border
-client.focused          #FFFFFF $base00 #FFFFFF #FFFFFF $base00
-client.focused_inactive $base02 $base00 $base05 $base03 $base02
-client.unfocused        $base01 $base00 $base05 $base03 $base01
+client.focused          $border_focus     $base00 $base07 $border_focus     $border_focus
+client.focused_inactive $border_inactive  $base00 $base05 $border_inactive  $border_inactive
+client.unfocused        $border_unfocused $base00 $base05 $border_unfocused $border_unfocused
 client.urgent           #FFA14C #FFA14C $base00 #FFA14C #FFA14C
 client.placeholder      $base00 $base00 $base05 $base00 $base00
 client.background       $base00
diff --git a/.config/sway/config.d/windows b/.config/sway/config.d/windows
index 0e70bb7..b043313 100644
--- a/.config/sway/config.d/windows
+++ b/.config/sway/config.d/windows
@@ -1,5 +1,5 @@
 # Generated windows.
-for_window [title="(?:Open|Save) (?:File|Folder|As)"] floating enable;
+for_window [title="(?:Open|Save) (?:File|Folder|As)"] floating enable
 for_window [title="(?:Open|Save) (?:File|Folder|As)"] resize set 800 600
 for_window [window_role="pop-up"] floating enable
 for_window [window_role="bubble"] floating enable
diff --git a/.config/sway/waybar/config.jsonc b/.config/sway/waybar/config.jsonc
index 4ba8575..162cd97 100644
--- a/.config/sway/waybar/config.jsonc
+++ b/.config/sway/waybar/config.jsonc
@@ -3,7 +3,6 @@
     "spacing": 2, // Gaps between modules (4px)
     "modules-left": [
         "sway/workspaces",
-        "sway/submap",
         "sway/scratchpad",
         "sway/window"
     ],