diff --git a/firestarter b/firestarter
index c7f5179..36c7855 100755
--- a/firestarter
+++ b/firestarter
@@ -143,18 +143,32 @@ command -v polkit-efl-authentication-agent-1
 polkit-efl-authentication-agent-1
 [ -x "/usr/lib/ts-polkitagent" ]
 /usr/lib/ts-polkitagent
-[ -x "/usr/lib/$(uname -m)-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1" ]
-"/usr/lib/$(uname -m)-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1"
-[ -x "/usr/lib/mate-polkit/polkit-mate-authentication-agent-1" ]
-/usr/lib/mate-polkit/polkit-mate-authentication-agent-1
-[ -x "/usr/lib/$(uname -m)-linux-gnu/libexec/polkit-kde-authentication-agent-1" ]
-"/usr/lib/$(uname -m)-linux-gnu/libexec/polkit-kde-authentication-agent-1"
-[ -x "/usr/lib/polkit-kde-authentication-agent-1" ]
-/usr/lib/polkit-kde-authentication-agent-1
 [ -x "/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1" ]
 /usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
 [ -x "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1" ]
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+# Debian locations
+# On generation time, your architecture is filled in here
+[ -x "/usr/lib/$(uname -m)-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1" ]
+"/usr/lib/$(uname -m)-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1"
+[ -x "/usr/lib/$(uname -m)-linux-gnu/libexec/polkit-kde-authentication-agent-1" ]
+"/usr/lib/$(uname -m)-linux-gnu/libexec/polkit-kde-authentication-agent-1"
+# Arch locations
+[ -x "/usr/lib/mate-polkit/polkit-mate-authentication-agent-1" ]
+/usr/lib/mate-polkit/polkit-mate-authentication-agent-1
+[ -x "/usr/lib/polkit-kde-authentication-agent-1" ]
+/usr/lib/polkit-kde-authentication-agent-1
+# Fedora locations
+[ -x "/usr/libexec/xfce-polkit" ]
+/usr/libexec/xfce-polkit
+[ -x "/usr/libexec/lxqt-policykit-agent" ]
+/usr/libexec/lxqt-policykit-agent
+[ -x "/usr/libexec/polkit-mate-authentication-agent-1" ]
+/usr/libexec/polkit-mate-authentication-agent-1
+[ -x "/usr/libexec/kf5/polkit-kde-authentication-agent-1" ]
+/usr/libexec/kf5/polkit-kde-authentication-agent-1
+[ -x "/usr/libexec/polkit-gnome-authentication-agent-1" ]
+/usr/libexec/polkit-gnome-authentication-agent-1
 EOF
 	# Hotkey daemon
 	cat << EOF > "$_configdir/hotkey-daemon"