diff --git a/dot_local/bin/executable_startup-i3.tmpl b/dot_local/bin/executable_startup-i3.tmpl
index b44f8ed55e03cb52746c5d7007793e01d6e807e6..46f2123ae6e4fd98a38268a53ae4fb95c3ed1d2f 100644
--- a/dot_local/bin/executable_startup-i3.tmpl
+++ b/dot_local/bin/executable_startup-i3.tmpl
@@ -7,39 +7,47 @@ i3-msg exec "polybar top"
 i3-msg exec "polybar bottom"
 i3-msg exec "feh --bg-scale ~/.wallpaper.png"
 i3-msg exec "blueman-applet"
-i3-msg exec "mpd ~/.config/mpd/mpd.conf"
 i3-msg exec "redshift"
-i3-msg exec "mpdscribble"
 i3-msg exec "dunst"
 i3-msg exec "playerctl pause"
 i3-msg exec "mpDris2"
 i3-msg exec "setxkbmap -option compose:ralt"
-{{- if eq .chezmoi.hostname "angmar" }}
-i3-msg exec "java -cp {{ .chezmoi.homeDir }}/languagetool/languagetool-server.jar org.languagetool.server.HTTPServer --port 8081 --allow-origin '*'"
-{{- end }}
 i3-msg exec "gotify-desktop"
 i3-msg exec "unclutter --ignore-scrolling --start-hidden"
-sleep 1
+i3-msg exec "emacs --daemon"
 
-i3-msg exec "firefox-developer-edition"
-sleep 1
+sleep 5
+
+i3-msg workspace 6
+i3-msg exec "st zsh -c 'senpai'"
+sleep 2
 i3-msg workspace 2
 i3-msg exec "keepassxc"
-sleep 1
-i3-msg workspace 6
+
+{{- if eq .chezmoi.os "linux" }}
+i3-msg exec "picom"
+{{- end}}
+
 {{- if eq .chezmoi.hostname "angmar" }}
+i3-msg exec "mpdscribble"
+i3-msg exec "mpd ~/.config/mpd/mpd.conf"
+i3-msg exec "java -cp ~/languagetool/languagetool-server.jar org.languagetool.server.HTTPServer --port 8081 --allow-origin '*'"
+i3-msg workspace 10
+i3-msg exec "st zsh -c 'neomutt'"
+i3-msg workspace 7
+i3-msg exec "hydrus-client"
+i3-msg workspace 6
 i3-msg exec "telegram-desktop"
 i3-msg exec "signal-desktop"
 i3-msg exec "mattermost-desktop"
-i3-msg exec "cd ~/repos/arbor/sprig && git pull && go run ."
-i3-msg exec "hydrus-client"
-{{- end }}
+i3-msg exec "sprig"
 i3-msg exec "gajim"
-i3-msg exec "st zsh -c 'lxc exec pers2:weechat -- tmux a'"
-i3-msg exec "emacs --daemon"
-i3-msg workspace 10
-i3-msg exec "st zsh -c 'neomutt'"
-sleep 2
+i3-msg workspace 1
+i3-msg exec "firefox-developer-edition"
 i3-msg workspace 2
+{{- end }}
+
+sleep 50
+i3-msg exec "nextcloud"
 
 exit