diff --git a/.config/sway/config b/.config/sway/config
index 2c895ef..86fc859 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -16,7 +16,6 @@ set $base0C #65cdcd
 set $base0D #3f7fff
 set $base0E #9f4fdf
 set $base0F #a16946
-
 # %%base16_template_end%%
 
 # Global font config
@@ -33,7 +32,7 @@ client.background       $base07
 # Set mod key to Win key
 set $mod Mod4
 
-# i3status bar declarations
+# status bar declarations
 bar {
   status_command "~/bin/statusbar"
   position bottom
@@ -54,7 +53,8 @@ bar {
   }
 }
 
-# Use Mouse+$mod to drag floating windows to their wanted position
+# Use Mouse+$mod to drag windows to their wanted position
+# This used to only work on floating windows in i3. In sway it's any mode
 floating_modifier $mod
 
 # start a terminal
@@ -162,8 +162,6 @@ bindsym $mod+Shift+0 move container to workspace $ws10
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
 # exit sway (logs you out of your X session)
 bindsym $mod+Shift+e exec "swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your X session.' -B 'Yes, exit' 'sway-msg exit'"
 
@@ -202,14 +200,11 @@ workspace_auto_back_and_forth yes
 
 # Make windows created with a special floating class float
 # For the moment I'm expressing directives for both i3 and sway here; i3 may fail on these
-for_window [instance=".*__user_requests_float"] floating enable, sticky enable, border pixel 1, resize set 800 600
-for_window [app_id=".*__user_requests_float"] floating enable, sticky enable, border pixel 1, resize set 800 600
-no_focus [instance="mpv__user_requests_float"]
-no_focus [app_id="mpv__user_requests_float"]
+for_window [app_id=".*__user_requests_float"] floating enable, border pixel 1, resize set 800 600
 
-# Make floating mpv specifically go in the corner
-for_window [instance="mpv__user_requests_float"] resize set 640 360, move position 1280 20
-for_window [app_id="mpv__user_requests_float"] resize set 640 360, move position 1280 20
+# Make floating mpv specifically go in the corner, pin, and not steal focus
+for_window [app_id="mpv__user_requests_float"] sticky enable, resize set 640 360, move position 1280 20
+no_focus [app_id="mpv__user_requests_float"]
 
 # Set mouse acceleration to 0 in Sway
 input * {