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-companion.service b/dotfiles/systemd/i3-companion.service
index 90db52d..0f1579d 100644
--- a/dotfiles/systemd/i3-companion.service
+++ b/dotfiles/systemd/i3-companion.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=i3 companion
 PartOf=graphical-session.target
-Requires=i3.socket
 
 [Service]
 ExecStart=%h/.config/i3/bin/i3-companion
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.socket b/dotfiles/systemd/i3.socket
deleted file mode 100644
index cda92fc..0000000
--- a/dotfiles/systemd/i3.socket
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=i3 window manager
-PartOf=graphical-session.target
-
-[Socket]
-ListenStream=%t/i3.sock
-ExecStartPost=/bin/systemctl --user set-environment I3SOCK=%t/i3.sock
diff --git a/dotfiles/systemd/polybar.service b/dotfiles/systemd/polybar.service
index 79adbf1..867e282 100644
--- a/dotfiles/systemd/polybar.service
+++ b/dotfiles/systemd/polybar.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Status bar for i3
 PartOf=graphical-session.target
-Requires=i3.socket
 
 [Service]
 ExecStart=%h/.config/i3/bin/polybar
diff --git a/dotfiles/systemd/xsession.target b/dotfiles/systemd/xsession.target
index 604918d..c2e5177 100644
--- a/dotfiles/systemd/xsession.target
+++ b/dotfiles/systemd/xsession.target
@@ -3,17 +3,15 @@ Description=X session
 BindsTo=graphical-session.target
 Wants=autorandr.service
 Wants=dunst.socket
-Wants=i3-companion.service
+Wants=i3.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