diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index 76c542b..1bd563b 100755
--- a/herbstluftwm/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
@@ -124,14 +124,12 @@ hc set update_dragged_clients 1
 # rules
 hc unrule -F
 hc rule focus=on # normally do focus new clients
-hc rule class=URxvt focus=on tag=1 index=1 switchtag=on
+hc rule class=URxvt tag=1 index=1 switchtag=on
 hc rule class=Emacs tag=1 index=0
-hc rule class=Conkeror tag=2 index=0
+hc rule class~"Conkeror|Firefox" tag=2 index=0
 hc rule class=Pinentry pseudotile=on
 hc rule class=Alsaplayer pseudotile=on
 hc rule title="Torchlight II Mod Launcher" pseudotile=on
-hc rule class=Firefox focus=off
-hc rule instance=firefox-developer focus=on
 hc rule windowtype~'_NET_WM_WINDOW_TYPE_(DIALOG|UTILITY|SPLASH)' pseudotile=on
 hc rule windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK)' manage=off
 hc rule title="SpaceChem" pseudotile=on