diff --git a/etc/skel/.config/autostart/initial-user-setup.desktop b/etc/skel/.config/autostart/initial-user-setup.desktop
new file mode 100755
index 0000000..77a0d91
--- /dev/null
+++ b/etc/skel/.config/autostart/initial-user-setup.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Categories=System;Monitor;
+Comment=Does the initial user setup
+Exec=systemctl --user enable --now psd pulseaudio-bluetooth-autoconnect;libinput-gestures-setup autostart;libinput-gestures-setup start;rm ~/.config/autostart/initial-user-setup.desktop.desktop
+Icon=setup
+Name=Initial user setup
+StartupNotify=false
+Terminal=false
+Type=Application
diff --git a/etc/skel/.config/autostart/libinput-gestures.desktop b/etc/skel/.config/autostart/libinput-gestures.desktop
deleted file mode 100755
index 903c14c..0000000
--- a/etc/skel/.config/autostart/libinput-gestures.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Terminal=false
-Name=Libinput Gestures
-Exec=/usr/bin/libinput-gestures
-Icon=libinput-gestures
-Comment=Background application to intercept and action libinput gestures from touchpad.
-Categories=GNOME;GTK;System;