diff --git a/.config/sway/config b/.config/sway/config
index b5db9d8..3702deb 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -27,19 +27,19 @@ font pango:monospace 8
 
 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
 # screen before suspend. Use loginctl lock-session to lock your screen.
-#exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+#exec xss-lock --transfer-sleep-lock -- i3lock --nofork
 
 # NetworkManager is the most popular way to manage wireless networks on Linux,
 # and nm-applet is a desktop environment-independent system tray GUI for it.
-exec --no-startup-id nm-applet
-#exec --no-startup-id nm-tray 2>&1 &
+exec nm-applet
+#exec nm-tray 2>&1 &
 
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% && $refresh_i3status
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
+bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status
+bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% && $refresh_i3status
+bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
+bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@@ -59,7 +59,7 @@ bindsym $mod+d exec source ~/.bashrc && wofi --show drun --allow-images -G -i
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
-# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
+# bindsym $mod+d exec i3-dmenu-desktop
 
 # change focus
 bindsym $mod+j focus left
@@ -184,9 +184,9 @@ mode "resize" {
 
 
 ### Custom
-#bindsym Ctrl+Mod1+l exec --no-startup-id loginctl lock-session
-bindsym Ctrl+Mod1+l exec --no-startup-id $lock_command
-#bindsym Ctrl+Mod1+l exec --no-startup-id betterlockscreen -l -t "${USER}@${HOSTNAME}" --off 10
+#bindsym Ctrl+Mod1+l exec loginctl lock-session
+bindsym Ctrl+Mod1+l exec $lock_command
+#bindsym Ctrl+Mod1+l exec betterlockscreen -l -t "${USER}@${HOSTNAME}" --off 10
 
 # Background
 output "*" bg $background fill
@@ -200,8 +200,8 @@ bindsym $mod+Ctrl+Left move workspace to output left
 bindsym $mod+Ctrl+Right move workspace to output right
 
 # xkill
-#bindsym $mod+Ctrl+q --release exec --no-startup-id xkill -display $DISPLAY
-bindsym $mod+Ctrl+q exec --no-startup-id swaymsg -t get_tree | jq '.. | select(.type?) | select(.focused==true) | .pid' | kill -9 $(cat /dev/stdin)
+#bindsym $mod+Ctrl+q --release exec xkill -display $DISPLAY
+bindsym $mod+Ctrl+q exec swaymsg -t get_tree | jq '.. | select(.type?) | select(.focused==true) | .pid' | kill -9 $(cat /dev/stdin)
 
 # Screen brightness controls
 bindsym XF86MonBrightnessUp exec light -A 10 # increase screen brightness
@@ -211,16 +211,16 @@ bindsym XF86MonBrightnessDown exec light -U 10 # decrease screen brightness
 #bindsym XF86TouchpadToggle exec /some/path/toggletouchpad.sh # toggle touchpad
 
 # Media player controls
-#bindsym XF86AudioPlay exec --no-startup-id playerctl play
-bindsym XF86AudioPause exec --no-startup-id ~/.config/i3/toggleplay.sh
-bindsym XF86AudioNext exec --no-startup-id playerctl next
-bindsym XF86AudioPrev exec --no-startup-id playerctl previous
+#bindsym XF86AudioPlay exec playerctl play
+bindsym XF86AudioPause exec ~/.config/i3/toggleplay.sh
+bindsym XF86AudioNext exec playerctl next
+bindsym XF86AudioPrev exec playerctl previous
 
 # Screenshot
-#bindsym Print exec --no-startup-id flameshot gui -p ~/Pictures/Screenshots
-#bindsym Shift+Print exec --no-startup-id flameshot full -p ~/Pictures/Screenshots
-#bindsym Ctrl+Shift+Print exec --no-startup-id flameshot full -c
-bindsym Print exec --no-startup-id grim -g "$(slurp)" - | swappy -f - 
+#bindsym Print exec flameshot gui -p ~/Pictures/Screenshots
+#bindsym Shift+Print exec flameshot full -p ~/Pictures/Screenshots
+#bindsym Ctrl+Shift+Print exec flameshot full -c
+bindsym Print exec grim -g "$(slurp)" - | swappy -f - 
 
 # Dunst
 bindsym $mod+Mod1+Space dunstctl close 
@@ -235,20 +235,20 @@ bindsym $mod+Mod1+period dunstctl context
 #}
 
 # Startup
-exec_always --no-startup-id $HOME/.config/waybar/launch.sh 2>&1
-#exec_always --no-startup-id ~/.config/i3/customalways.sh 2>&1
-exec_always --no-startup-id ~/.config/sway/import-gsettings
+exec_always $HOME/.config/waybar/launch.sh 2>&1
+#exec_always ~/.config/i3/customalways.sh 2>&1
+exec_always ~/.config/sway/import-gsettings
 exec_always killall kanshi && kanshi &
 
-#exec --no-startup-id QT_QPA_PLATFORMTHEME=qt5ct flameshot 2>&1 &
-#exec --no-startup-id picom -b 2>&1 &
-exec --no-startup-id dunst -mon $mon 2>&1 &
-exec --no-startup-id lxqt-policykit-agent 2>&1 &
-#exec --no-startup-id syncthing -no-browser -home="$HOME/.config/syncthing" 2>&1 &
-exec --no-startup-id kdeconnect-indicator 2>&1 &
-#exec --no-startup-id xfce4-power-manager 2>&1 &
-#exec --no-startup-id xss-lock -- betterlockscreen -l -t "${USER}@${HOSTNAME}" --off 10 2>&1 &
-#exec --no-startup-id ~/.config/i3/customonce.sh 2>&1
+#exec QT_QPA_PLATFORMTHEME=qt5ct flameshot 2>&1 &
+#exec picom -b 2>&1 &
+exec dunst -mon $mon 2>&1 &
+exec lxqt-policykit-agent 2>&1 &
+#exec syncthing -no-browser -home="$HOME/.config/syncthing" 2>&1 &
+exec kdeconnect-indicator 2>&1 &
+#exec xfce4-power-manager 2>&1 &
+#exec xss-lock -- betterlockscreen -l -t "${USER}@${HOSTNAME}" --off 10 2>&1 &
+#exec ~/.config/i3/customonce.sh 2>&1
 exec wl-paste -p -t text --watch clipman store --no-persist --histpath="/tmp/clipman.json" &
 
 # Borders