diff --git a/firestarter b/firestarter
index 43d6032..b1fc51b 100755
--- a/firestarter
+++ b/firestarter
@@ -76,6 +76,24 @@ command -v mate-panel
 mate-panel
 command -v xfce4-panel
 xfce4-panel
+EOF
+	# Blue light filter
+	cat << EOF > "$g_configdir/blue-light-filter"
+command -v redshift-gtk
+redshift-gtk
+command -v redshift
+redshift
+EOF
+	# Compositor
+	cat << EOF > "$g_configdir/compositor"
+[ -z "\$DISPLAY" ]
+:
+command -v unagi
+unagi
+command -v compton
+compton
+command -v xcompmgr
+xcompmgr
 EOF
 	# Polkit authentication agents
 	cat << EOF > "$g_configdir/polkit-agent"
@@ -87,6 +105,22 @@ command -v mate-polkit
 mate-polkit
 command -v polkit-efl-authentication-agent-1
 polkit-efl-authentication-agent-1
+EOF
+	# Hotkey daemon
+	cat << EOF > "$g_configdir/hotkey-daemon"
+[ -z "\$DISPLAY" ]
+:
+command -v sxhkd
+sxhkd
+EOF
+	# Notification daemon
+	cat << EOF > "$g_configdir/notification-daemon"
+[ -z "\$DISPLAY" ]
+:
+command -v dunst
+dunst
+command -v lxqt-notificationd
+notificationd
 EOF
 	# Power daemons
 	cat << EOF > "$g_configdir/power-daemon"
@@ -102,6 +136,12 @@ command -v mate-power-manager
 mate-power-manager
 command -v gnome-power-manager
 gnome-power-manager
+EOF
+	# Runners
+	# Note that rofi is not a daemon and is not included here
+	cat << EOF > "$g_configdir/runner"
+command -v krunner
+krunner
 EOF
 	# Settings daemons
 	cat << EOF > "$g_configdir/settings-daemon"
@@ -115,59 +155,16 @@ command -v mate-settings-daemon
 mate-settings-daemon
 command -v gnome-settings-daemon
 gnome-settings-daemon
-EOF
-	# XDG autostarter
-	cat << EOF > "$g_configdir/xdg-autostart"
-command -v dex
-dex -a
-command -v fbautostart
-fbautostart
-command -v xdg-autostart
-xdg-autostart "\${XDG_CURRENT_DESKTOP:-firestarter}"
-EOF
-	# X blue light filter
-	cat << EOF > "$g_configdir/x-blue-light-filter"
-command -v redshift-gtk
-redshift-gtk
-command -v redshift
-redshift
-EOF
-	# X compositor
-	cat << EOF > "$g_configdir/x-compositor"
-[ -z "\$DISPLAY" ]
-:
-command -v unagi
-unagi
-command -v compton
-compton
-command -v xcompmgr
-xcompmgr
-EOF
-	# X hotkey daemon
-	cat << EOF > "$g_configdir/x-hotkey-daemon"
-[ -z "\$DISPLAY" ]
-:
-command -v sxhkd
-sxhkd
-EOF
-	# X notification daemon
-	cat << EOF > "$g_configdir/x-notification-daemon"
-[ -z "\$DISPLAY" ]
-:
-command -v dunst
-dunst
-command -v lxqt-notificationd
-notificationd
 EOF
 	# X system statistics glances
-	cat << EOF > "$g_configdir/x-stat-glances"
+	cat << EOF > "$g_configdir/stat-glances"
 [ -z "\$DISPLAY" ]
 :
 command -v conky && [ -f "\${XDG_CONFIG_HOME:-$HOME/.config}/conky/conky.conf" ]
 conky
 EOF
-	# X window managers
-	cat << EOF > "$g_configdir/x-wm"
+	# Window managers
+	cat << EOF > "$g_configdir/wm"
 [ -z "\$DISPLAY" ]
 :
 command -v 2bwm
@@ -230,6 +227,15 @@ command -v kwin
 kwin
 command -v tinywm
 tinywm
+EOF
+	# XDG autostarter
+	cat << EOF > "$g_configdir/xdg-autostart"
+command -v dex
+dex -a
+command -v fbautostart
+fbautostart
+command -v xdg-autostart
+xdg-autostart "\${XDG_CURRENT_DESKTOP:-firestarter}"
 EOF
 }
 step_printhelp() {