diff --git a/modules/misc/numlock.nix b/modules/misc/numlock.nix
index 88032417f..c97ddc657 100644
--- a/modules/misc/numlock.nix
+++ b/modules/misc/numlock.nix
@@ -19,7 +19,7 @@ in {
     systemd.user.services.numlockx = {
       Unit = {
         Description = "NumLockX";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
index 72d247323..80ac0088d 100644
--- a/modules/programs/waybar.nix
+++ b/modules/programs/waybar.nix
@@ -308,8 +308,8 @@ in {
           Description =
             "Highly customizable Wayland bar for Sway and Wlroots based compositors.";
           Documentation = "https://github.com/Alexays/Waybar/wiki";
-          PartOf = [ "graphical-session.target" ];
-          After = [ "graphical-session-pre.target" ];
+          PartOf = [ cfg.systemd.target ];
+          After = [ cfg.systemd.target ];
         };
 
         Service = {
diff --git a/modules/services/amberol.nix b/modules/services/amberol.nix
index a63012447..7aa169db4 100644
--- a/modules/services/amberol.nix
+++ b/modules/services/amberol.nix
@@ -54,7 +54,7 @@ in {
       Unit = {
         Description = "Amberol music player daemon";
         Requires = [ "dbus.service" ];
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/autorandr.nix b/modules/services/autorandr.nix
index 64e6008e8..89ee612b2 100644
--- a/modules/services/autorandr.nix
+++ b/modules/services/autorandr.nix
@@ -36,7 +36,7 @@ in {
     systemd.user.services.autorandr = {
       Unit = {
         Description = "autorandr";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/barrier.nix b/modules/services/barrier.nix
index 513a7e749..59c4cbf75 100644
--- a/modules/services/barrier.nix
+++ b/modules/services/barrier.nix
@@ -63,7 +63,7 @@ in {
     systemd.user.services.barrierc = {
       Unit = {
         Description = "Barrier Client daemon";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
       Install.WantedBy = [ "graphical-session.target" ];
diff --git a/modules/services/batsignal.nix b/modules/services/batsignal.nix
index 4f209f1e0..be5cf5347 100644
--- a/modules/services/batsignal.nix
+++ b/modules/services/batsignal.nix
@@ -32,7 +32,7 @@ in {
     systemd.user.services.batsignal = {
       Unit = {
         Description = "batsignal - battery monitor daemon";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/blanket.nix b/modules/services/blanket.nix
index 5eeb2ab1e..bcc08ac85 100644
--- a/modules/services/blanket.nix
+++ b/modules/services/blanket.nix
@@ -24,7 +24,7 @@ in {
       Unit = {
         Description = "Blanket daemon";
         Requires = [ "dbus.service" ];
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" "pipewire.service" ];
       };
 
diff --git a/modules/services/blueman-applet.nix b/modules/services/blueman-applet.nix
index 5211534c4..47f81b48c 100644
--- a/modules/services/blueman-applet.nix
+++ b/modules/services/blueman-applet.nix
@@ -30,7 +30,7 @@ with lib;
       Unit = {
         Description = "Blueman applet";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/cbatticon.nix b/modules/services/cbatticon.nix
index 1616b2dcd..eebb5bdbc 100644
--- a/modules/services/cbatticon.nix
+++ b/modules/services/cbatticon.nix
@@ -118,7 +118,7 @@ in {
       Unit = {
         Description = "cbatticon system tray battery icon";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/devilspie2.nix b/modules/services/devilspie2.nix
index fa77153e7..ab61e9778 100644
--- a/modules/services/devilspie2.nix
+++ b/modules/services/devilspie2.nix
@@ -36,7 +36,7 @@ in {
       Service.ExecStart = "${pkgs.devilspie2}/bin/devilspie2";
       Unit = {
         Description = "devilspie2";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
       Install.WantedBy = [ "graphical-session.target" ];
diff --git a/modules/services/dunst.nix b/modules/services/dunst.nix
index 5bd82a399..5fd2e775d 100644
--- a/modules/services/dunst.nix
+++ b/modules/services/dunst.nix
@@ -180,7 +180,7 @@ in {
       systemd.user.services.dunst = {
         Unit = {
           Description = "Dunst notification daemon";
-          After = [ "graphical-session-pre.target" ];
+          After = [ "graphical-session.target" ];
           PartOf = [ "graphical-session.target" ];
         };
 
diff --git a/modules/services/easyeffects.nix b/modules/services/easyeffects.nix
index fd5e4b404..b71ec8d83 100644
--- a/modules/services/easyeffects.nix
+++ b/modules/services/easyeffects.nix
@@ -51,7 +51,7 @@ in {
       Unit = {
         Description = "Easyeffects daemon";
         Requires = [ "dbus.service" ];
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" "pipewire.service" ];
       };
 
diff --git a/modules/services/flameshot.nix b/modules/services/flameshot.nix
index ebdfd0067..b35f518b3 100644
--- a/modules/services/flameshot.nix
+++ b/modules/services/flameshot.nix
@@ -56,7 +56,7 @@ in {
       Unit = {
         Description = "Flameshot screenshot tool";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
         X-Restart-Triggers = mkIf (cfg.settings != { }) [ "${iniFile}" ];
       };
diff --git a/modules/services/fnott.nix b/modules/services/fnott.nix
index ecbd0fd15..2ed144c4e 100644
--- a/modules/services/fnott.nix
+++ b/modules/services/fnott.nix
@@ -88,7 +88,7 @@ in {
       Unit = {
         Description = "Fnott notification daemon";
         Documentation = "man:fnott(1)";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/fusuma.nix b/modules/services/fusuma.nix
index 17d8b1431..aa81320b1 100644
--- a/modules/services/fusuma.nix
+++ b/modules/services/fusuma.nix
@@ -119,7 +119,7 @@ in {
     systemd.user.services.fusuma = {
       Unit = {
         Description = "Fusuma services";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/grobi.nix b/modules/services/grobi.nix
index 9031089c9..c8a3b1412 100644
--- a/modules/services/grobi.nix
+++ b/modules/services/grobi.nix
@@ -79,7 +79,7 @@ in {
     systemd.user.services.grobi = {
       Unit = {
         Description = "grobi display auto config daemon";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/gromit-mpx.nix b/modules/services/gromit-mpx.nix
index f46eddb39..142c49814 100644
--- a/modules/services/gromit-mpx.nix
+++ b/modules/services/gromit-mpx.nix
@@ -215,7 +215,7 @@ in {
     systemd.user.services.gromit-mpx = {
       Unit = {
         Description = "Gromit-MPX";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
         X-Restart-Triggers = [
           "${config.xdg.configFile."gromit-mpx.cfg".source}"
diff --git a/modules/services/hypridle.nix b/modules/services/hypridle.nix
index 0e28c5438..aef05f6da 100644
--- a/modules/services/hypridle.nix
+++ b/modules/services/hypridle.nix
@@ -79,7 +79,7 @@ in {
       Unit = {
         ConditionEnvironment = "WAYLAND_DISPLAY";
         Description = "hypridle";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
         X-Restart-Triggers =
           [ "${config.xdg.configFile."hypr/hypridle.conf".source}" ];
diff --git a/modules/services/hyprpaper.nix b/modules/services/hyprpaper.nix
index ede09b258..376c13378 100644
--- a/modules/services/hyprpaper.nix
+++ b/modules/services/hyprpaper.nix
@@ -73,7 +73,7 @@ in {
       Unit = {
         ConditionEnvironment = "WAYLAND_DISPLAY";
         Description = "hyprpaper";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
         X-Restart-Triggers =
           [ "${config.xdg.configFile."hypr/hyprpaper.conf".source}" ];
diff --git a/modules/services/kdeconnect.nix b/modules/services/kdeconnect.nix
index f0b1da5be..5f70d244f 100644
--- a/modules/services/kdeconnect.nix
+++ b/modules/services/kdeconnect.nix
@@ -40,7 +40,7 @@ in {
         Unit = {
           Description =
             "Adds communication between your desktop and your smartphone";
-          After = [ "graphical-session-pre.target" ];
+          After = [ "graphical-session.target" ];
           PartOf = [ "graphical-session.target" ];
         };
 
@@ -69,7 +69,7 @@ in {
         Unit = {
           Description = "kdeconnect-indicator";
           After = [
-            "graphical-session-pre.target"
+            "graphical-session.target"
             "polybar.service"
             "taffybar.service"
             "stalonetray.service"
diff --git a/modules/services/keynav.nix b/modules/services/keynav.nix
index d83252e53..7ba5ce2e0 100644
--- a/modules/services/keynav.nix
+++ b/modules/services/keynav.nix
@@ -18,7 +18,7 @@ in {
     systemd.user.services.keynav = {
       Unit = {
         Description = "keynav";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/mpd-discord-rpc.nix b/modules/services/mpd-discord-rpc.nix
index 8996051a5..dfe408921 100644
--- a/modules/services/mpd-discord-rpc.nix
+++ b/modules/services/mpd-discord-rpc.nix
@@ -50,7 +50,7 @@ in {
       Unit = {
         Description = "Discord Rich Presence for MPD";
         Documentation = "https://github.com/JakeStanger/mpd-discord-rpc";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
       Service = {
diff --git a/modules/services/network-manager-applet.nix b/modules/services/network-manager-applet.nix
index 524921b71..75bdf9d51 100644
--- a/modules/services/network-manager-applet.nix
+++ b/modules/services/network-manager-applet.nix
@@ -28,7 +28,7 @@ in {
       Unit = {
         Description = "Network Manager applet";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/nextcloud-client.nix b/modules/services/nextcloud-client.nix
index 24b3c99dd..7a3ceacb1 100644
--- a/modules/services/nextcloud-client.nix
+++ b/modules/services/nextcloud-client.nix
@@ -36,7 +36,7 @@ in {
     systemd.user.services.nextcloud-client = {
       Unit = {
         Description = "Nextcloud Client";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/notify-osd.nix b/modules/services/notify-osd.nix
index 4faf83643..b118a275e 100644
--- a/modules/services/notify-osd.nix
+++ b/modules/services/notify-osd.nix
@@ -33,7 +33,7 @@ in {
     systemd.user.services.notify-osd = {
       Unit = {
         Description = "notify-osd";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/opensnitch-ui.nix b/modules/services/opensnitch-ui.nix
index f45ee9cdb..a6df254f5 100644
--- a/modules/services/opensnitch-ui.nix
+++ b/modules/services/opensnitch-ui.nix
@@ -23,7 +23,7 @@ in {
     systemd.user.services.opensnitch-ui = {
       Unit = {
         Description = "Opensnitch ui";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/owncloud-client.nix b/modules/services/owncloud-client.nix
index 3235dac9c..aad2d487c 100644
--- a/modules/services/owncloud-client.nix
+++ b/modules/services/owncloud-client.nix
@@ -24,7 +24,7 @@ in {
     systemd.user.services.owncloud-client = {
       Unit = {
         Description = "Owncloud Client";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/parcellite.nix b/modules/services/parcellite.nix
index 39b81e869..dc6b84c41 100644
--- a/modules/services/parcellite.nix
+++ b/modules/services/parcellite.nix
@@ -42,7 +42,7 @@ in {
       Unit = {
         Description = "Lightweight GTK+ clipboard manager";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/pasystray.nix b/modules/services/pasystray.nix
index 4ea340d21..62e203584 100644
--- a/modules/services/pasystray.nix
+++ b/modules/services/pasystray.nix
@@ -30,7 +30,7 @@ in {
       Unit = {
         Description = "PulseAudio system tray";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/pbgopy.nix b/modules/services/pbgopy.nix
index 3a3499e52..48556a5ba 100644
--- a/modules/services/pbgopy.nix
+++ b/modules/services/pbgopy.nix
@@ -60,7 +60,7 @@ in {
     systemd.user.services.pbgopy = {
       Unit = {
         Description = "pbgopy server for sharing the clipboard between devices";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
       Service = {
diff --git a/modules/services/picom.nix b/modules/services/picom.nix
index 1d9b7bb55..59e373a62 100644
--- a/modules/services/picom.nix
+++ b/modules/services/picom.nix
@@ -310,7 +310,7 @@ in {
     systemd.user.services.picom = {
       Unit = {
         Description = "Picom X11 compositor";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/plex-mpv-shim.nix b/modules/services/plex-mpv-shim.nix
index 940e57184..795827c40 100644
--- a/modules/services/plex-mpv-shim.nix
+++ b/modules/services/plex-mpv-shim.nix
@@ -58,7 +58,7 @@ in {
     systemd.user.services.plex-mpv-shim = {
       Unit = {
         Description = "Plex mpv shim";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/poweralertd.nix b/modules/services/poweralertd.nix
index 9c59ad3f0..20481e905 100644
--- a/modules/services/poweralertd.nix
+++ b/modules/services/poweralertd.nix
@@ -44,7 +44,7 @@ in {
       Unit = {
         Description = "UPower-powered power alerter";
         Documentation = "man:poweralertd(1)";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/pulseeffects.nix b/modules/services/pulseeffects.nix
index 3edc53499..c4a150c17 100644
--- a/modules/services/pulseeffects.nix
+++ b/modules/services/pulseeffects.nix
@@ -52,7 +52,7 @@ in {
       Unit = {
         Description = "Pulseeffects daemon";
         Requires = [ "dbus.service" ];
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" "pulseaudio.service" ];
       };
 
diff --git a/modules/services/random-background.nix b/modules/services/random-background.nix
index 7e887f32e..499dc4e3b 100644
--- a/modules/services/random-background.nix
+++ b/modules/services/random-background.nix
@@ -76,7 +76,7 @@ in {
       systemd.user.services.random-background = {
         Unit = {
           Description = "Set random desktop background using feh";
-          After = [ "graphical-session-pre.target" ];
+          After = [ "graphical-session.target" ];
           PartOf = [ "graphical-session.target" ];
         };
 
diff --git a/modules/services/redshift-gammastep/lib/options.nix b/modules/services/redshift-gammastep/lib/options.nix
index 81347e643..476f8baa3 100644
--- a/modules/services/redshift-gammastep/lib/options.nix
+++ b/modules/services/redshift-gammastep/lib/options.nix
@@ -189,7 +189,7 @@ in {
       in {
         Description = "${programName} colour temperature adjuster";
         Documentation = serviceDocumentation;
-        After = [ "graphical-session-pre.target" ] ++ geoclueAgentService;
+        After = [ "graphical-session.target" ] ++ geoclueAgentService;
         Wants = geoclueAgentService;
         PartOf = [ "graphical-session.target" ];
       };
diff --git a/modules/services/remmina.nix b/modules/services/remmina.nix
index dac0471db..de86fe215 100644
--- a/modules/services/remmina.nix
+++ b/modules/services/remmina.nix
@@ -39,7 +39,7 @@ in {
         Unit = {
           Description = "Remmina remote desktop client";
           Documentation = "man:remmina(1)";
-          Requires = [ "graphical-session-pre.target" ];
+          Requires = [ "graphical-session.target" ];
         };
 
         Service = {
diff --git a/modules/services/rsibreak.nix b/modules/services/rsibreak.nix
index d587c2daf..e3743090f 100644
--- a/modules/services/rsibreak.nix
+++ b/modules/services/rsibreak.nix
@@ -23,7 +23,7 @@ in {
     systemd.user.services.rsibreak = {
       Unit = {
         Description = "RSI break timer";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/screen-locker.nix b/modules/services/screen-locker.nix
index 085573f8a..c704f8a12 100644
--- a/modules/services/screen-locker.nix
+++ b/modules/services/screen-locker.nix
@@ -117,7 +117,7 @@ in {
       systemd.user.services.xss-lock = {
         Unit = {
           Description = "xss-lock, session locker service";
-          After = [ "graphical-session-pre.target" ];
+          After = [ "graphical-session.target" ];
           PartOf = [ "graphical-session.target" ];
         };
 
@@ -140,7 +140,7 @@ in {
       systemd.user.services.xautolock-session = {
         Unit = {
           Description = "xautolock, session locker service";
-          After = [ "graphical-session-pre.target" ];
+          After = [ "graphical-session.target" ];
           PartOf = [ "graphical-session.target" ];
         };
 
diff --git a/modules/services/sctd.nix b/modules/services/sctd.nix
index 44c770264..4e9671747 100644
--- a/modules/services/sctd.nix
+++ b/modules/services/sctd.nix
@@ -30,7 +30,7 @@ with lib;
       Unit = {
         Description =
           "Dynamically adjust the screen color temperature twice every minute";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/swayidle.nix b/modules/services/swayidle.nix
index 7f3376a1c..2ece123df 100644
--- a/modules/services/swayidle.nix
+++ b/modules/services/swayidle.nix
@@ -107,7 +107,8 @@ in {
         Description = "Idle manager for Wayland";
         Documentation = "man:swayidle(1)";
         ConditionEnvironment = "WAYLAND_DISPLAY";
-        PartOf = [ "graphical-session.target" ];
+        After = [ cfg.systemdTarget ];
+        PartOf = [ cfg.systemdTarget ];
       };
 
       Service = {
diff --git a/modules/services/swaync.nix b/modules/services/swaync.nix
index 5f813af30..4283ae226 100644
--- a/modules/services/swaync.nix
+++ b/modules/services/swaync.nix
@@ -96,7 +96,7 @@ in {
         Description = "Swaync notification daemon";
         Documentation = "https://github.com/ErikReider/SwayNotificationCenter";
         PartOf = [ "graphical-session.target" ];
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         ConditionEnvironment = "WAYLAND_DISPLAY";
       };
 
diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index b6cebfa5f..16707675f 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -121,7 +121,7 @@ in {
           Unit = {
             Description = cfg.tray.package.pname;
             Requires = [ "tray.target" ];
-            After = [ "graphical-session-pre.target" "tray.target" ];
+            After = [ "graphical-session.target" "tray.target" ];
             PartOf = [ "graphical-session.target" ];
           };
 
@@ -146,7 +146,7 @@ in {
           Unit = {
             Description = "syncthingtray";
             Requires = [ "tray.target" ];
-            After = [ "graphical-session-pre.target" "tray.target" ];
+            After = [ "graphical-session.target" "tray.target" ];
             PartOf = [ "graphical-session.target" ];
           };
 
diff --git a/modules/services/trayscale.nix b/modules/services/trayscale.nix
index d9853d7aa..0760448c6 100644
--- a/modules/services/trayscale.nix
+++ b/modules/services/trayscale.nix
@@ -28,7 +28,7 @@ in {
         Description =
           "An unofficial GUI wrapper around the Tailscale CLI client";
         Requires = [ "tray.target" ];
-        After = [ "graphical-session-pre.target" "tray.target" ];
+        After = [ "graphical-session.target" "tray.target" ];
         PartOf = [ "graphical-session.target" ];
       };
       Install = { WantedBy = [ "graphical-session.target" ]; };
diff --git a/modules/services/twmn.nix b/modules/services/twmn.nix
index c29ff621b..e4d9f67b9 100644
--- a/modules/services/twmn.nix
+++ b/modules/services/twmn.nix
@@ -361,7 +361,7 @@ in {
     systemd.user.services.twmnd = {
       Unit = {
         Description = "twmn daemon";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
         X-Restart-Triggers =
           [ "${config.xdg.configFile."twmn/twmn.conf".source}" ];
diff --git a/modules/services/udiskie.nix b/modules/services/udiskie.nix
index 2572b3594..c6165ecf5 100644
--- a/modules/services/udiskie.nix
+++ b/modules/services/udiskie.nix
@@ -116,7 +116,7 @@ in {
       Unit = {
         Description = "udiskie mount daemon";
         Requires = lib.optional (cfg.tray != "never") "tray.target";
-        After = [ "graphical-session-pre.target" ]
+        After = [ "graphical-session.target" ]
           ++ lib.optional (cfg.tray != "never") "tray.target";
         PartOf = [ "graphical-session.target" ];
       };
diff --git a/modules/services/unclutter.nix b/modules/services/unclutter.nix
index e08c23eb3..d0327b5e1 100644
--- a/modules/services/unclutter.nix
+++ b/modules/services/unclutter.nix
@@ -45,7 +45,7 @@ in {
     systemd.user.services.unclutter = {
       Unit = {
         Description = "unclutter";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/wlsunset.nix b/modules/services/wlsunset.nix
index f3352750c..4bbd98e0b 100644
--- a/modules/services/wlsunset.nix
+++ b/modules/services/wlsunset.nix
@@ -128,6 +128,7 @@ in {
     systemd.user.services.wlsunset = {
       Unit = {
         Description = "Day/night gamma adjustments for Wayland compositors.";
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/xcape.nix b/modules/services/xcape.nix
index 130db65b5..fa80607ce 100644
--- a/modules/services/xcape.nix
+++ b/modules/services/xcape.nix
@@ -60,11 +60,11 @@ in {
       Unit = mkMerge [
         {
           Description = "xcape";
-          After = [ "graphical-session-pre.target" ];
+          After = [ "graphical-session.target" ];
           PartOf = [ "graphical-session.target" ];
         }
         (mkIf (config.home.keyboard != null && config.home.keyboard != { }) {
-          After = [ "graphical-session-pre.target" "setxkbmap.service" ];
+          After = [ "graphical-session.target" "setxkbmap.service" ];
         })
       ];
 
diff --git a/modules/services/xembed-sni-proxy.nix b/modules/services/xembed-sni-proxy.nix
index 4273e81a3..4a6fd1fad 100644
--- a/modules/services/xembed-sni-proxy.nix
+++ b/modules/services/xembed-sni-proxy.nix
@@ -34,7 +34,7 @@ in {
     systemd.user.services.xembed-sni-proxy = {
       Unit = {
         Description = "XEmbed SNI Proxy";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
       };
 
diff --git a/modules/services/xscreensaver.nix b/modules/services/xscreensaver.nix
index c5d6126be..0931f3d8a 100644
--- a/modules/services/xscreensaver.nix
+++ b/modules/services/xscreensaver.nix
@@ -50,7 +50,7 @@ in {
     systemd.user.services.xscreensaver = {
       Unit = {
         Description = "XScreenSaver";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
 
         # Make sure the service is restarted if the settings change.
diff --git a/modules/services/xsuspender.nix b/modules/services/xsuspender.nix
index 058f15471..412f374c4 100644
--- a/modules/services/xsuspender.nix
+++ b/modules/services/xsuspender.nix
@@ -183,7 +183,7 @@ in {
     systemd.user.services.xsuspender = {
       Unit = {
         Description = "XSuspender";
-        After = [ "graphical-session-pre.target" ];
+        After = [ "graphical-session.target" ];
         PartOf = [ "graphical-session.target" ];
         X-Restart-Triggers =
           [ "${config.xdg.configFile."xsuspender.conf".source}" ];
diff --git a/tests/modules/programs/waybar/systemd-with-graphical-session-target.service b/tests/modules/programs/waybar/systemd-with-graphical-session-target.service
index c99c8c13a..cd45512e8 100644
--- a/tests/modules/programs/waybar/systemd-with-graphical-session-target.service
+++ b/tests/modules/programs/waybar/systemd-with-graphical-session-target.service
@@ -8,7 +8,7 @@ KillMode=mixed
 Restart=on-failure
 
 [Unit]
-After=graphical-session-pre.target
+After=sway-session.target
 Description=Highly customizable Wayland bar for Sway and Wlroots based compositors.
 Documentation=https://github.com/Alexays/Waybar/wiki
-PartOf=graphical-session.target
+PartOf=sway-session.target
diff --git a/tests/modules/services/blanket/basic-configuration.nix b/tests/modules/services/blanket/basic-configuration.nix
index 740c4d08d..c281733cc 100644
--- a/tests/modules/services/blanket/basic-configuration.nix
+++ b/tests/modules/services/blanket/basic-configuration.nix
@@ -20,7 +20,7 @@
         RestartSec=5
 
         [Unit]
-        After=graphical-session-pre.target
+        After=graphical-session.target
         Description=Blanket daemon
         PartOf=graphical-session.target
         PartOf=pipewire.service
diff --git a/tests/modules/services/fnott/systemd-user-service-expected.service b/tests/modules/services/fnott/systemd-user-service-expected.service
index c39a7b19b..ae8d7697e 100644
--- a/tests/modules/services/fnott/systemd-user-service-expected.service
+++ b/tests/modules/services/fnott/systemd-user-service-expected.service
@@ -4,7 +4,7 @@ ExecStart=@fnott@/bin/fnott -c /home/hm-user/.config/fnott/fnott.ini
 Type=dbus
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
 Description=Fnott notification daemon
 Documentation=man:fnott(1)
 PartOf=graphical-session.target
diff --git a/tests/modules/services/fusuma/expected-service.service b/tests/modules/services/fusuma/expected-service.service
index 585d8a85e..e84077daf 100644
--- a/tests/modules/services/fusuma/expected-service.service
+++ b/tests/modules/services/fusuma/expected-service.service
@@ -6,6 +6,6 @@ Environment=PATH=@coreutils@/bin:@xdotool@/bin:@xorg.xprop@/bin
 ExecStart=@fusuma@/bin/fusuma
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
 Description=Fusuma services
 PartOf=graphical-session.target
diff --git a/tests/modules/services/parcellite/parcellite-expected.service b/tests/modules/services/parcellite/parcellite-expected.service
index f1e7e2333..7e0865aa7 100644
--- a/tests/modules/services/parcellite/parcellite-expected.service
+++ b/tests/modules/services/parcellite/parcellite-expected.service
@@ -6,7 +6,7 @@ ExecStart=@parcellite@/bin/parcellite --no-icon
 Restart=on-abort
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
 After=tray.target
 Description=Lightweight GTK+ clipboard manager
 PartOf=graphical-session.target
diff --git a/tests/modules/services/pasystray/expected.service b/tests/modules/services/pasystray/expected.service
index 7bea7f215..871f01255 100644
--- a/tests/modules/services/pasystray/expected.service
+++ b/tests/modules/services/pasystray/expected.service
@@ -6,7 +6,7 @@ Environment=PATH=@paprefs@/bin:@pavucontrol@/bin
 ExecStart=@pasystray@/bin/pasystray -g
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
 After=tray.target
 Description=PulseAudio system tray
 PartOf=graphical-session.target
diff --git a/tests/modules/services/picom/picom-basic-configuration-expected.service b/tests/modules/services/picom/picom-basic-configuration-expected.service
index f5d0efeb0..0407445cb 100644
--- a/tests/modules/services/picom/picom-basic-configuration-expected.service
+++ b/tests/modules/services/picom/picom-basic-configuration-expected.service
@@ -7,6 +7,6 @@ Restart=always
 RestartSec=3
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
 Description=Picom X11 compositor
 PartOf=graphical-session.target
diff --git a/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service b/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service
index 35eaf519f..a877b60f8 100644
--- a/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service
+++ b/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service
@@ -7,7 +7,7 @@ Restart=on-failure
 RestartSec=3
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
 Description=Gammastep colour temperature adjuster
 Documentation=https://gitlab.com/chinstrap/gammastep/
 PartOf=graphical-session.target
diff --git a/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service b/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service
index 5dce5dc19..7177fab8f 100644
--- a/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service
+++ b/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service
@@ -7,7 +7,7 @@ Restart=on-failure
 RestartSec=3
 
 [Unit]
-After=graphical-session-pre.target
+After=graphical-session.target
 Description=Redshift colour temperature adjuster
 Documentation=http://jonls.dk/redshift/
 PartOf=graphical-session.target
diff --git a/tests/modules/services/swayidle/basic-configuration.nix b/tests/modules/services/swayidle/basic-configuration.nix
index c38f4d67d..2ff5941bb 100644
--- a/tests/modules/services/swayidle/basic-configuration.nix
+++ b/tests/modules/services/swayidle/basic-configuration.nix
@@ -50,6 +50,7 @@
         Type=simple
 
         [Unit]
+        After=graphical-session.target
         ConditionEnvironment=WAYLAND_DISPLAY
         Description=Idle manager for Wayland
         Documentation=man:swayidle(1)
diff --git a/tests/modules/services/swaync/swaync.nix b/tests/modules/services/swaync/swaync.nix
index ceb3bf065..550e5fed4 100644
--- a/tests/modules/services/swaync/swaync.nix
+++ b/tests/modules/services/swaync/swaync.nix
@@ -24,7 +24,7 @@
           Type=dbus
 
           [Unit]
-          After=graphical-session-pre.target
+          After=graphical-session.target
           ConditionEnvironment=WAYLAND_DISPLAY
           Description=Swaync notification daemon
           Documentation=https://github.com/ErikReider/SwayNotificationCenter
diff --git a/tests/modules/services/wlsunset/wlsunset-service-expected.service b/tests/modules/services/wlsunset/wlsunset-service-expected.service
index fecd05b9f..d4006618f 100644
--- a/tests/modules/services/wlsunset/wlsunset-service-expected.service
+++ b/tests/modules/services/wlsunset/wlsunset-service-expected.service
@@ -5,5 +5,6 @@ WantedBy=test.target
 ExecStart=@wlsunset@/bin/wlsunset -L 128.8 -T 6000 -g 0.6 -l 12.3 -t 3500
 
 [Unit]
+After=graphical-session.target
 Description=Day/night gamma adjustments for Wayland compositors.
 PartOf=graphical-session.target