diff --git a/.config/sway/config b/.config/sway/config
index 7ad5398..7c87c97 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -3,9 +3,11 @@
 # Copy this to ~/.config/sway/config and edit it to your liking.
 #
 # Read `man 5 sway` for a complete reference.
+
+# Environment
 exec --no-startup-id dbus-update-activation-environment --all
 exec /usr/libexec/polkit-gnome-authentication-agent-1
-exec gentoo-pipewire-launcher
+exec_always ~/.config/scripts/sway/import-gsettings
 
 ### Variables
 #
@@ -46,10 +48,10 @@ set $term alacritty
 #set $menucmd bemenu -l 10 --scrollbar always --fn '$font'  --tb '$base02' --tf '$green' --fb '$base03' --ff '$base0' --nb '$base03' --nf '$base0' --sb '$base02' --sf 'cyan' --hb '$base02' --hf '$cyan' --scb '$base02' --scf '$cyan'
 # Default launch using swaymsg
 #set $menu $menucmd | xargs swaymsg exec --
-set $menucmd j4-dmenu-desktop --dmenu="~/.config/wm_scripts/menucmd"
+set $menucmd j4-dmenu-desktop --dmenu=menucmd
 
 # Screenshot
-set $screenshot "~/.config/wm_scripts/screenshot.sh"
+set $screenshot "~/.config/scripts/wm/screenshot.sh"
 
 ### Monitor config
 # 
@@ -319,7 +321,8 @@ default_border pixel 3
 #
 # Startup programs:
 #
-exec_always ~/.config/sway/import-gsettings
+exec wayland-run-on-new-display set-correct-monitor 390+1080
+exec gentoo-pipewire-launcher
 exec dunst
 
 exec alacritty
@@ -331,7 +334,6 @@ exec flatpak run com.discordapp.Discord
 # Xwayland applications tend to use 'class=<class>', whereas wayland applications use 'appid=<appid>'
 assign [app_id="firefox"] workspace 2:r
 #for_window [title="^Discord — Mozilla Firefox"] move container to workspace 3:s
-for_window [title="Firefox — Sharing Indicator"] floating enable, move position 50ppt 0px;
 for_window [class="discord"] move container to workspace 3:s
 assign [class="Steam"] workspace 4:t
 # Inhibit swayidle when discord is focused. Usefull when watching stream.
@@ -339,7 +341,9 @@ for_window [class="discord"] inhibit_idle focus
 # Space Games, as joystick usage without mouse and keyboard count as idle.
 for_window [class="steam_app_359320"] inhibit_idle focus
 for_window [class="starcitizen.exe"] inhibit_idle focus
-# Genshin impact floating enable
+# Floating windows
+for_window [title="Firefox — Sharing Indicator"] floating enable, move position 50ppt 0px;
 for_window [class="genshinimact.exe"] floating enable;
+for_window [class=".*.exe"] floating enable;
 
 include /etc/sway/config.d/*