diff --git a/config b/config
index 964c5c5..f28904d 100644
--- a/config
+++ b/config
@@ -153,4 +153,4 @@ for_window [instance=$quake] move window to scratchpad
 bindsym $mod+grave exec ~/.config/i3/bin/quake --name $quake --term $term
 
 # start stuff
-exec_always --no-startup-id systemctl --user start --no-block wallpaper.service
+exec_always --no-startup-id systemctl --user start --no-block i3-session.target
diff --git a/dotfiles/systemd/i3-session.target b/dotfiles/systemd/i3-session.target
new file mode 100644
index 0000000..998f0d5
--- /dev/null
+++ b/dotfiles/systemd/i3-session.target
@@ -0,0 +1,7 @@
+[Unit]
+Description=i3 session
+BindsTo=graphical-session.target
+Wants=wallpaper.service
+Wants=wallpaper.timer
+Wants=polybar.service
+Wants=i3-companion.service
diff --git a/dotfiles/systemd/i3.service b/dotfiles/systemd/i3.service
index da7870c..02b5833 100644
--- a/dotfiles/systemd/i3.service
+++ b/dotfiles/systemd/i3.service
@@ -6,9 +6,6 @@ After=picom.service
 After=xsettingsd.service
 After=tmux.service
 After=ssh-agent.service
-Before=wallpaper.service
-Before=polybar.service
-Before=i3-companion.service
 
 [Service]
 ExecStart=/usr/bin/i3
diff --git a/dotfiles/systemd/xsession.target b/dotfiles/systemd/xsession.target
index 6d27004..c2e5177 100644
--- a/dotfiles/systemd/xsession.target
+++ b/dotfiles/systemd/xsession.target
@@ -4,17 +4,14 @@ BindsTo=graphical-session.target
 Wants=autorandr.service
 Wants=dunst.socket
 Wants=i3.service
-Wants=i3-companion.service
 Wants=inputplug.service
 Wants=misc-x.service
 Wants=picom.service
 Wants=policykit-agent.service
-Wants=polybar.service
 Wants=pulseaudio.service
 Wants=redshift.service
 Wants=ssh-agent.service
 Wants=tmux.service
-Wants=wallpaper.timer
 Wants=xiccd.service
 Wants=xsettingsd.service
 Wants=xss-lock.service