diff --git a/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/browser.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/browser.conf
index 0b860e0..ac65b59 100644
--- a/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/browser.conf
+++ b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/browser.conf
@@ -1,11 +1,7 @@
 # browser.conf
 
 # floorp
-$browser = uwsm app -- one.ablaze.floorp.desktop
 $mainMod = SUPER
 
-## autostart
-exec-once = [workspace 1 silent] $browser
-
 ## keybind
-bind = $mainMod, F, exec, $browser
+bind = $mainMod, F, exec, uwsm app -- one.ablaze.floorp.desktop
diff --git a/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/discord_workspace.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/discord_workspace.conf
index e7f9c30..6cd281f 100644
--- a/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/discord_workspace.conf
+++ b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/discord_workspace.conf
@@ -1,7 +1,5 @@
 # discord_workspace.conf
 
-$discord = uwsm app -- com.discordapp.Discord.desktop
-
 $discord_class = class:^(vesktop)$|^(discord)$|^(com.discord.app.Discord)$|^(WebCord)$|^(equibop)$
 
 # workspace
@@ -20,7 +18,4 @@ bind = $mainMod, D, togglespecialworkspace, discord
 bind = $mainMod SHIFT, D, movetoworkspace, special:discord
 
 # discord overlay
-#exec-once = discover-overlay
-
-# launch discord
-exec-once = $discord
\ No newline at end of file
+#exec-once = discover-overlay
\ No newline at end of file
diff --git a/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/game_workspace.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/game_workspace.conf
index 392f09c..5df2548 100644
--- a/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/game_workspace.conf
+++ b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/game_workspace.conf
@@ -3,8 +3,6 @@
 # workspace number
 $game-workspace-number = 5
 
-exec-once = uwsm app -- steam.desktop
-
 # window rules
 windowrule = workspace 9 silent, class:^(steam)$
 
diff --git a/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/terminal.conf b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/terminal.conf
index 98e28ce..539d57a 100644
--- a/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/terminal.conf
+++ b/files/system/usr/share/hypr-hydro-os/hyprland.conf.d/terminal.conf
@@ -1,12 +1,8 @@
 # terminal.conf
-$terminal = uwsm app -- kitty.desktop
 
 # workspace
 workspace = special:terminal
 
-# launch a terminal
-exec-once = [workspace special:terminal silent] $terminal
-
 # key binds
 $mainMod = SUPER
 bind = $mainMod, T, togglespecialworkspace, terminal
diff --git a/files/systemd/user/discord.service b/files/systemd/user/discord.service
new file mode 100644
index 0000000..aba6024
--- /dev/null
+++ b/files/systemd/user/discord.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=The pc gaming platform
+# order startup after WM
+After=graphical-session.target
+
+[Service]
+Type=exec
+# Repurpose XDG Autostart filtering
+ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
+ExecStart=/usr/bin/flatpak run com.discordapp.Discord
+Slice=app-graphical.slice
+
+[Install]
+WantedBy=graphical-session.target
+# Alternatively can be wanted by specific WMs' targets
+# Should also be duplicated in 'After=' to avoid ordering loop
+#WantedBy=wayland-session@hyprland.desktop.target
\ No newline at end of file
diff --git a/files/systemd/user/floorp.service b/files/systemd/user/floorp.service
new file mode 100644
index 0000000..1fc9b5b
--- /dev/null
+++ b/files/systemd/user/floorp.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=The pc gaming platform
+# order startup after WM
+After=graphical-session.target
+
+[Service]
+Type=exec
+# Repurpose XDG Autostart filtering
+ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
+ExecStart=/usr/bin/flatpak run one.ablaze.floorp
+Slice=app-graphical.slice
+
+[Install]
+WantedBy=graphical-session.target
+# Alternatively can be wanted by specific WMs' targets
+# Should also be duplicated in 'After=' to avoid ordering loop
+#WantedBy=wayland-session@hyprland.desktop.target
\ No newline at end of file
diff --git a/files/systemd/user/steam.service b/files/systemd/user/steam.service
new file mode 100644
index 0000000..84ea60e
--- /dev/null
+++ b/files/systemd/user/steam.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=The pc gaming platform
+# order startup after WM
+After=graphical-session.target
+
+[Service]
+Type=exec
+# Repurpose XDG Autostart filtering
+ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
+ExecStart=/usr/bin/steam %U
+Slice=app-graphical.slice
+
+[Install]
+WantedBy=graphical-session.target
+# Alternatively can be wanted by specific WMs' targets
+# Should also be duplicated in 'After=' to avoid ordering loop
+#WantedBy=wayland-session@hyprland.desktop.target
\ No newline at end of file
diff --git a/files/systemd/user/terminal.service b/files/systemd/user/terminal.service
new file mode 100644
index 0000000..da56249
--- /dev/null
+++ b/files/systemd/user/terminal.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=The pc gaming platform
+# order startup after WM
+After=graphical-session.target
+
+[Service]
+Type=exec
+# Repurpose XDG Autostart filtering
+ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
+ExecStart=/usr/bin/kitty
+Slice=app-graphical.slice
+
+[Install]
+WantedBy=graphical-session.target
+# Alternatively can be wanted by specific WMs' targets
+# Should also be duplicated in 'After=' to avoid ordering loop
+#WantedBy=wayland-session@hyprland.desktop.target
\ No newline at end of file
diff --git a/recipes/components/autostart-module.yml b/recipes/components/autostart-module.yml
new file mode 100644
index 0000000..e66b83c
--- /dev/null
+++ b/recipes/components/autostart-module.yml
@@ -0,0 +1,10 @@
+modules:
+  - type: systemd
+    user:
+      enabled:
+        - hyprpanel.service
+        - hyprpolkitagent.service
+        - discord.service
+        - floorp.service
+        - steam.service
+        - terminal.service
\ No newline at end of file
diff --git a/recipes/components/hyprland-module.yml b/recipes/components/hyprland-module.yml
index 4d6ac6e..6ab195d 100644
--- a/recipes/components/hyprland-module.yml
+++ b/recipes/components/hyprland-module.yml
@@ -8,10 +8,4 @@ modules:
         - hyprland-git
         - hyprpanel
         - hyprpolkitagent
-        - hyprshot
-
-  - type: systemd
-    user:
-      enabled:
-        - hyprpanel.service
-        - hyprpolkitagent.service
\ No newline at end of file
+        - hyprshot
\ No newline at end of file