diff --git a/.config/systemd/user/autocutsel-primary.service b/.config/systemd/user/autocutsel-primary.service
deleted file mode 100644
index 99d5dde..0000000
--- a/.config/systemd/user/autocutsel-primary.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=autocutsel -selection primary
-PartOf=graphical-session.target
-
-[Service]
-ExecStart=/usr/bin/autocutsel -selection PRIMARY
-
-[Install]
-WantedBy=graphical-session.target
-
diff --git a/.config/systemd/user/autocutsel.service b/.config/systemd/user/autocutsel.service
deleted file mode 100644
index da2b70b..0000000
--- a/.config/systemd/user/autocutsel.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=autocutsel
-PartOf=graphical-session.target
-
-[Service]
-ExecStart=/usr/bin/autocutsel
-
-[Install]
-WantedBy=graphical-session.target
-
diff --git a/.config/systemd/user/autocutsel@.service b/.config/systemd/user/autocutsel@.service
new file mode 100644
index 0000000..5b87d7a
--- /dev/null
+++ b/.config/systemd/user/autocutsel@.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=autocutsel selection %i
+PartOf=graphical-session.target
+Requires=xorg.target
+After=xorg.target
+
+[Service]
+ExecStart=/usr/bin/autocutsel -selection %i
+
+[Install]
+WantedBy=graphical-session.target
+
diff --git a/.config/systemd/user/graphical-session.target.wants/autocutsel@CLIPBOARD.service b/.config/systemd/user/graphical-session.target.wants/autocutsel@CLIPBOARD.service
new file mode 120000
index 0000000..2d2794e
--- /dev/null
+++ b/.config/systemd/user/graphical-session.target.wants/autocutsel@CLIPBOARD.service
@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/autocutsel@.service
\ No newline at end of file
diff --git a/.config/systemd/user/graphical-session.target.wants/autocutsel@PRIMARY.service b/.config/systemd/user/graphical-session.target.wants/autocutsel@PRIMARY.service
new file mode 120000
index 0000000..2d2794e
--- /dev/null
+++ b/.config/systemd/user/graphical-session.target.wants/autocutsel@PRIMARY.service
@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/autocutsel@.service
\ No newline at end of file
diff --git a/.config/systemd/user/graphical-session.target.wants/autocutsel@SECONDARY.service b/.config/systemd/user/graphical-session.target.wants/autocutsel@SECONDARY.service
new file mode 120000
index 0000000..2d2794e
--- /dev/null
+++ b/.config/systemd/user/graphical-session.target.wants/autocutsel@SECONDARY.service
@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/autocutsel@.service
\ No newline at end of file