diff --git a/autostart.conf b/autostart.conf
index 5cd46f3..f3e205e 100644
--- a/autostart.conf
+++ b/autostart.conf
@@ -4,6 +4,9 @@ exec /home/kellya/bin/sway_screenshare.sh
 # greenclip for clipboard management
 exec greenclip daemon
 exec_always cat /proc/acpi/button/lid/LID/state | awk '{print $2}' | grep -q 'closed' && swaymsg output eDP-1 disable
+exec copyq --start-server
+exec export YDOTOOL_SOCKET=/tmp/.ydotool_socket
+exec ydotoold
 
 #password keyring unlock
 #exec --no-startup-id /home/kellya/projects/public/gnome-keyring-yubikey-unlock/unlock_keyrings.sh /home/kellya/gnome-secret
@@ -32,20 +35,20 @@ exec /usr/libexec/gsd-xsettings
 
 # Startup logseq
 workspace $ws6
-exec /home/kellya/bin/logseq
-exec /usr/bin/thunderbird
+exec /home/kellya/bin/toolwait /home/kellya/bin/logseq
+exec /home/kellya/bin/toolwait /usr/bin/thunderbird
 
 workspace $ws5
 # Start spotify from the stupid flatpak
-exec --no-startup-id "/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=spotify --file-forwarding com.spotify.Client"
+exec "/home/kellya/bin/toolwait /usr/bin/flatpak run --branch=stable --arch=x86_64 --command=spotify --file-forwarding com.spotify.Client"
 
 workspace $ws3
-exec --no-startup-id "kitty"
-exec --no-startup-id "/usr/bin/1password"
+exec /home/kellya/bin/toolwait "kitty"
+exec /home/kellya/bin/toolwait  "/usr/bin/1password"
 
 # Always need firefox, so let's just start it
 workspace $ws1
-exec firefox
+exec /home/kellya/bin/toolwait firefox
 
 # start the auto run .desktop files
 exec dex-autostart --autostart --environment i3