diff --git a/rc.lua b/rc.lua
index e8f4195..084057f 100644
--- a/rc.lua
+++ b/rc.lua
@@ -76,7 +76,7 @@ layouts =
 ----< Naughty presets >-----------------------------------------------
 --
 naughty.config.defaults.timeout = 5
-naughty.config.defaults.screen = 1
+naughty.config.defaults.screen = 2
 naughty.config.defaults.position = "top_right"
 naughty.config.defaults.margin = 8
 naughty.config.defaults.gap = 1
@@ -93,9 +93,9 @@ naughty.config.defaults.hover_timeout = nil
 ----< Tags >----------------------------------------------------------
 --
 tags = {
-   names  = { "1www",     "2rxvt",   "3virt",   "4office",   "5mail",
-              "6game",    "7gimp",   "8dic",    "9im" },
-   layout = { layouts[1],  layouts[2], layouts[1], layouts[3], layouts[1],
+   names  = { "1web",     "2term",   "3virt",   "4office",   "5dev",
+              "6play",    "7grafx",  "8dic",    "9im" },
+   layout = { layouts[1],  layouts[2], layouts[1], layouts[3], layouts[2],
               layouts[1],  layouts[1], layouts[2], layouts[4]}
 }
  for s = 1, screen.count() do
@@ -491,9 +491,9 @@ awful.rules.rules = {
     { rule = { class = "Opera" },
       callback = function(c) awful.client.movetotag(tags[mouse.screen][1], c) end },
     { rule = { class = "Thunderbird" },
-      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][1], c) end },
     { rule = { class = "Geary" },
-      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][1], c) end },
     { rule = { class = "Liferea" },
       callback = function(c) awful.client.movetotag(tags[mouse.screen][1], c) end },
     { rule = { class = "VirtualBox" },
@@ -504,6 +504,12 @@ awful.rules.rules = {
       callback = function(c) awful.client.movetotag(tags[mouse.screen][3], c) end },
     { rule = { class = "Aqemu" },
       callback = function(c) awful.client.movetotag(tags[mouse.screen][3], c) end },
+    { rule = { name = "Instances - Vimperator" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][3], c) end },
+    { rule = { name = "VMs - .* - Vimperator" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][3], c) end },
+    { rule = { name = "noVNC - .* - Vimperator" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][3], c) end },
     { rule = { class = "Soffice" },
       callback = function(c) awful.client.movetotag(tags[mouse.screen][4], c) end },
     { rule = { class = "LibreOffice" },
@@ -529,7 +535,7 @@ awful.rules.rules = {
     { rule = { class = "Evince" },
       callback = function(c) awful.client.movetotag(tags[mouse.screen][4], c) end },
     { rule = { class = "Qt Jambi application" },
-      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][1], c) end },
     { rule = { class = "Pidgin" },
       callback = function(c) awful.client.movetotag(tags[mouse.screen][9], c) end },
     { rule = { class = "Stardict" },
@@ -538,7 +544,7 @@ awful.rules.rules = {
       properties = { floating = true } },
     { rule = { class = "Texreport-gtk" },
       properties = { floating = true } },
-    { rule = { class = "etracer" },
+    { rule = { class = "etr" },
       callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
     { rule = { class = "Eboard" },
       callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
@@ -546,6 +552,138 @@ awful.rules.rules = {
       callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
     { rule = { class = "lincity-ng" },
       callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "mpv" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "Vlc" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "Audacious" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "Audacity" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "Gimp" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][7], c) end },
+    { rule = { class = "Blender" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][7], c) end },
+    { rule = { class = "Anjuta" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "Android SDK Manager" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "DDMS" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "Gucharmap" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "Pcmanfm" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][4], c) end },
+    { rule = { class = "File-roller" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][4], c) end },
+    { rule = { class = "Clamtk" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][4], c) end },
+    { rule = { class = "Assistant" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "Bluefish" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "Designer" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "Glade" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "Geany" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "Gvim" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "Qtcreator" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "Kcachegrind" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "Wxmaxima" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "0ad" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "dosbox" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][3], c) end },
+    { rule = { class = "Steam" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "supertux" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { name = "Minetest" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { name = "glxgears" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "urbanterror" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "warzone2100" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "xonotic-sdl" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "DarkPlaces" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "Camorama" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "Dia" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][7], c) end },
+    { rule = { class = "feh" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][7], c) end },
+    { rule = { class = "FreeCAD" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][7], c) end },
+    { rule = { class = "Gcolor2" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][7], c) end },
+    { rule = { class = "GQview" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][7], c) end },
+    { rule = { class = "Inkscape" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][7], c) end },
+    { rule = { class = "Shotwell" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][7], c) end },
+    { rule = { name = "Xdvi" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][4], c) end },
+    { rule = { class = "Deluge" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][1], c) end },
+    { rule = { class = "Eiskaltdcpp" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][1], c) end },
+    { rule = { class = "Ekiga" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][9], c) end },
+    { rule = { class = "Googleearth-bin" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][1], c) end },
+    { rule = { class = "Links" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][1], c) end },
+    { rule = { class = "Linphone" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][1], c) end },
+    { rule = { class = "psi" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][9], c) end },
+    { rule = { class = "Transmission" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][9], c) end },
+    { rule = { class = "Vncviewer" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][3], c) end },
+    { rule = { class = "Avidemux" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "Xfburn" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "Gtk-recordMyDesktop" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "Qv4l2" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "V4l2ucp" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "TiMidity" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
+    { rule = { class = "Gnumeric" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][4], c) end },
+    { rule = { class = "Yagf" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][4], c) end },
+    { rule = { class = "Xchm" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][4], c) end },
+    { rule = { class = "Flash-player-properties" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][1], c) end },
+    { rule = { class = "Libfm-pref-apps" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][4], c) end },
+    { rule = { class = "Qtconfig" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
+    { rule = { class = "Baobab" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][4], c) end },
+    { rule = { class = "Gcdemu" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][3], c) end },
+    { rule = { class = "Wireshark" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][1], c) end },
+    { rule = { name = "Frozen-.*Bubble" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][6], c) end },
 }
 
 ----< Signals >------------------------------------------------------