diff --git a/home-environments/radio/files/.config/river/init b/home-environments/radio/files/.config/river/init
index 10e7cc2..7d17992 100755
--- a/home-environments/radio/files/.config/river/init
+++ b/home-environments/radio/files/.config/river/init
@@ -12,8 +12,8 @@ done
 # Decorations _________________________________________________________________
 
 # wallpaper
-setsid -f swww-daemon && \
-          swww img ~/media/pictures/wallpapers/wall.png -t none &
+riverctl spawn "swww-daemon"
+riverctl spawn "swww img ~/media/pictures/wallpapers/wall.png -t none" &
 
 # Set background and border color
 riverctl border-color-focused 0x8581e0
@@ -280,21 +280,16 @@ riverctl map passthrough Super F12 enter-mode normal
 
 # Autostart applications ______________________________________________________
 
+spawn () {
+    riverctl spawn "$1 >> ~/.local/state/log/$(basename $1).log 2>&1" &
+}
+
 dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river
-riverctl spawn "~/.guix-home/profile/libexec/xdg-desktop-portal-wlr -r >> ~/.local/state/log/xdg-desktop-portal.log 2>&1"
-riverctl spawn "~/.guix-home/profile/libexec/xdg-desktop-portal -r >> ~/.local/state/log/xdg-desktop-portal.log 2>&1"
+spawn ~/.guix-home/profile/libexec/xdg-desktop-portal-wlr
+spawn ~/.guix-home/profile/libexec/xdg-desktop-portal
 
-# status bar
-riverctl spawn "waybar >> ~/.local/state/log/waybar.log 2>&1"
+for application in gammastep waybar telegram-desktop fnott keepassxc; do
+    spawn $application
+done
 
-# password manager
-riverctl spawn "keepassxc >> ~/.local/state/log/keepassxc.log 2>&1"
-
-# notifications
-riverctl spawn "fnott >> ~/.local/state/log/fnott.log 2>&1"
-
-# messengers
-riverctl spawn "telegram-desktop >> ~/.local/state/log/telegram-desktop.log 2>&1"
-
-# wayneko
 riverctl spawn "wayneko --background-colour 0x606060 --layer overlay"