diff --git a/rc/rules.lua b/rc/rules.lua
index 60a760d..aa9f851 100644
--- a/rc/rules.lua
+++ b/rc/rules.lua
@@ -20,8 +20,7 @@ awful.rules.rules = {
 	   end
 	end
      end },
-   { rule_any = { class = { "Iceweasel", "Firefox", "Chromium", "Conkeror",
-			    "Xulrunner-15.0" } },
+   { rule_any = { class = { "Iceweasel", "Firefox", "Chromium", "Conkeror" } },
      callback = function(c)
 	-- All windows should be slaves, except the browser windows.
 	if c.role ~= "browser" then awful.client.setslave(c) end
diff --git a/rc/tags.lua b/rc/tags.lua
index 5ce8c76..8340c28 100644
--- a/rc/tags.lua
+++ b/rc/tags.lua
@@ -37,20 +37,14 @@ shifty.config.tags = {
       mwfact = 0.2,
       exclusive = true,
       icon = tagicon("im"),
-      nopopup = true
+      nopopup = true,           -- don't give focus on creation
    }
 }
 
 -- Also, see rules.lua
 shifty.config.apps = {
    {
-      match = {
-         "Iceweasel",
-         "Firefox",
-         "Chromium",
-         "Conkeror",
-         "Xulrunner-15.0"
-      },
+      match = { role = { "browser" } },
       tag = "3↭www",
    },
    {
@@ -58,7 +52,7 @@ shifty.config.apps = {
       tag = "2↭emacs",
    },
    {
-      match = { "Pidgin" },
+      match = { role = { "conversation", "buddy_list" } },
       tag = "4↭im",
    },
    {