diff --git a/awesome/rc.lua b/awesome/rc.lua
index 3569ad2..ef754bc 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -93,7 +93,12 @@ end
 tags = {}
 for s = 1, screen.count() do
     -- Each screen has its own tag table.
-    tags[s] = awful.tag({ "w", "d", "c", 4, 5, 6, 7, 8, 9 }, s, layouts[1])
+    local tagNames = { "term", "web", "dev", "chat", "edu", "med", "misc", 8, 9 }
+    local tagLayouts  = {   1,     2,     2,      2,     1,     1,       1, 1, 1 }
+    for i,l in ipairs(tagLayouts) do
+      tagLayouts[i] = layouts[l]
+    end
+    tags[s] = awful.tag({ "term", "web", "dev", "chat", "edu", "mus", "med", 8, 9 }, s, tagLayouts)
 end
 -- }}}