diff --git a/.config/sway/config b/.config/sway/config
index af7a294..84b2f58 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -13,8 +13,8 @@ set
 	$nutermmenu kitty --class 'launcher' bash -c 'compgen -c | sort -u | fzf | xargs -r kitty'
 	# $bg "~/Pictures/apod/2019-January-2-The-Orion-Nebula-in-Infrared-from-WISE.jpg fit #000000"
 	# $bg "~/Pictures/apod/2020-April-29-The-Ion-Tail-of-New-Comet-SWAN.jpg fit #000000"
-	$bg "~/Pictures/apod/2020-August-11-Churning-Clouds-on-Jupiter.jpg fill"
-	$bg2 "~/Pictures/apod/2019-October-20-Pluto-at-Night.jpg fill #000000"
+	$bg "~/Pictures/apod/2020-August-11-Churning-Clouds-on-Jupiter.jpg"
+	$bg2 "~/Pictures/apod/2019-October-20-Pluto-at-Night.jpg"
 	$gtk_theme "Mint-Y-Dark-Blue"
 	$icon_theme "Flat-Remix-Blue-Dark"
 	$pri eDP-1
@@ -22,7 +22,8 @@ set
 }
 
 default_border pixel 2
-default_floating_border pixel 2
+default_floating_border normal
+hide_edge_borders smart
 
 #smart_gaps on
 gaps outer 8
@@ -36,8 +37,8 @@ exec_always --no-startup-id
 	pkill waybar
 	pkill swayidle
 	pkill "docker-tray"
-	swaymsg output $pri bg $bg
-	swaymsg output $sec bg $bg2
+	swaymsg output $pri bg $bg fill #000000
+	swaymsg output $sec bg $bg2 fill #000000
 	#swaymsg output $ter bg $bg
 	waybar
 	dbus-update-activation-environment DISPLAY XAUTHORITY
@@ -56,8 +57,6 @@ bindsym ctrl+alt+l exec --no-startup-id $lock
 bindsym $mod+grave exec --no-startup-id $lock
 bindswitch lid:on exec --no-startup-id $lock
 output $sec pos 1920 0 res 1920x1200
-exec --no-startup-id swaymsg output $pri bg $bg
-exec --no-startup-id swaymsg output $sec bg $bg2
 exec --no-startup-id swaymsg focus output $pri
 
 #--- Window Decorations
@@ -84,7 +83,6 @@ set
 
 bindsym
 {
-	$mod+Shift+e exec swaynag -t error -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
 	$mod+Return exec $term
 	$mod+t exec $term
 	$mod+ctrl+Shift+t exec qterminal
@@ -406,6 +404,24 @@ mode "resize"
 bindsym $mod+r mode "resize"
 bindsym $mod+Shift+r reload
 
+# kudos to github.com/rbnis for the following menu-like section inspiration
+# https://github.com/rbnis/dotfiles/blob/dfd6f956f6d00a1012a3a167d947773095dac7fd/.config/sway/config#L228-L235
+set $mode_sys System: (l) lock, (e) logout, (s) suspend, (r) reboot, (S) shutdown
+mode "$mode_sys" {
+	bindsym {
+		l exec $lock, mode "default"
+		e exit
+		s exec --no-startup-id systemctl suspend -i, mode "default"
+		r exec --no-startup-id systemctl reboot, mode "default"
+		Shift+s exec --no-startup-id systemctl poweroff -i, mode "default"
+		# return to default mode
+		Return mode "default"
+		Escape mode "default"
+		$mod+Shift+e mode "default"
+	}
+}
+bindsym $mod+Shift+e mode "$mode_sys"
+
 #
 # media keys
 #