diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 6003a6d3..ed84b916 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -1,68 +1,43 @@
--- Awesome configuration
-
--- TODO: Update system bar on audio volume update.
-
--- Get OS. Take care to read one line only, skipping end of line.
-local f = io.popen("uname")
-local ostype = f:read("*l")
-f:close()
-
-local userf = io.popen("id -u")
-local uid = userf:read("*l")
-userf:close()
-
+-- Standard awesome library
 local gears = require("gears")
 local awful = require("awful")
-awful.rules = require("awful.rules")
 require("awful.autofocus")
-
 -- Widget and layout library
 local wibox = require("wibox")
-
 -- Theme handling library
 local beautiful = require("beautiful")
-
 -- Notification library
 local naughty = require("naughty")
+local menubar = require("menubar")
+local hotkeys_popup = require("awful.hotkeys_popup").widget
 
-if ostype == "Linux" then
-	vicious = require("vicious")
-end
-
--- Custom variables.
-local termcmd = os.getenv("TERMCMD")
-local term = termcmd .. " -e "
-local home = os.getenv("HOME")
-
---------------------------------------------------------------------------------
--- Error handling
-
+-- {{{ Error handling
 -- Check if awesome encountered an error during startup and fell back to
 -- another config (This code will only ever execute for the fallback config)
 if awesome.startup_errors then
 	naughty.notify({ preset = naughty.config.presets.critical,
-			title = "Oops, there were errors during startup!",
-			text = awesome.startup_errors })
+		title = "Oops, there were errors during startup!",
+		text = awesome.startup_errors })
 end
 
 -- Handle runtime errors after startup
 do
 	local in_error = false
-	awesome.connect_signal("debug::error",
-		function (err)
-			-- Make sure we don't go into an endless error loop
-			if in_error then return end
-			in_error = true
+	awesome.connect_signal("debug::error", function (err)
+		-- Make sure we don't go into an endless error loop
+		if in_error then return end
+		in_error = true
 
-			naughty.notify({ preset = naughty.config.presets.critical,
-					title = "Oops, an error happened!",
-					text = err })
-			in_error = false
+		naughty.notify({ preset = naughty.config.presets.critical,
+			title = "Oops, an error happened!",
+			text = tostring(err) })
+		in_error = false
 	end)
 end
 
 -- Notify system startup errors.
 do
+	local home = os.getenv("HOME")
 	for _, file in pairs({home .. "/errors-dmesg.log", home .. "/errors-systemd.log"}) do
 		local f = io.open (file,'r')
 		if f ~= nil then
@@ -73,67 +48,64 @@ do
 		end
 	end
 end
+-- }}}
 
---------------------------------------------------------------------------------
--- Themes define colours, icons, and wallpapers
-
--- beautiful.init("/usr/share/awesome/themes/default/theme.lua")
+-- {{{ Variable definitions
+-- Themes define colours, icons, font and wallpapers.
+-- beautiful.init(awful.util.get_themes_dir() .. "default/theme.lua")
 beautiful.init(awful.util.getdir("config") .. "/themes/occam/theme.lua")
 
--- Wallpaper
-if beautiful.wallpaper then
-	for s = 1, screen.count() do
-		gears.wallpaper.fit(beautiful.wallpaper, s)
-	end
+-- This is used later as the default terminal and editor to run.
+terminal = os.getenv("TERMCMD") or "xterm"
+
+-- Get OS. Make sure to read one line only, skipping end of line.
+local f = io.popen("uname")
+local ostype = f:read("*l")
+f:close()
+
+-- Audio commands
+-- Linux
+local audio_increase = "amixer set Master 5%+"
+local audio_decrease = "amixer set Master 5%-"
+local audio_toggle = "amixer set Master toggle"
+if ostype == "FreeBSD" then
+	audio_increase = "mixer vol +5"
+	audio_decrease = "mixer vol -5"
+	audio_toggle = "mixer vol ^"
 end
 
---------------------------------------------------------------------------------
--- General
+
+if ostype == "Linux" then
+	vicious = require("vicious")
+end
 
 -- Default modkey.
--- Usually, Mod4 is the key with a logo between Control and Alt.
 modkey = "Mod4"
 
--- Tags
--- Define a tag table which hold all screen tags.
-tags = {}
-for s = 1, screen.count() do
-	-- Each screen has its own tag table.
-	tags[s] = awful.tag({ " 1 ", " 2 "," 3 "," 4 ", " 5 ⚒ ", " 6 ♫ ", "7 ✉ " }, s, awful.layout.suit.tile)
-end
+-- {{{ Wibar
+-- Create a textclock widget
+mytextclock = wibox.widget.textclock()
 
---------------------------------------------------------------------------------
--- Wibox
-
--- Separator
 separator = " | "
-separator_date = wibox.widget.textbox()
-separator_date:set_text(" |")
-
--- Clock
-mytextclock = awful.widget.textclock()
 
 cpuwidget = wibox.widget.textbox()
 netwidget = wibox.widget.textbox()
-volmwidget = wibox.widget.textbox()
-volpwidget = wibox.widget.textbox()
+audiowidget = wibox.widget.textbox()
 batwidget = wibox.widget.textbox()
 
 if ostype == "Linux" then
-
 	-- CPU
 	vicious.register(cpuwidget, vicious.widgets.cpu, separator .. '<span color="#CC8F52">CPU $1%</span>')
 
 	-- Net
 	-- CHECK: not sure if args["{".. device .." carrier}"] may have values below 0. What do values of the args table mean?
-	-- Note: we must make sure note to take the loopback interface into account.
+	-- Note: we must make sure not to take the loopback interface into account.
 	local proc = io.popen("ls -1 /sys/class/net | grep -v '^lo$'")
 	local ifarray = {}
 	for line in proc:lines() do
 		table.insert (ifarray, line);
 	end
 	proc:close()
-
 	vicious.register(netwidget, vicious.widgets.net, function (widget, args)
 			for _,device in pairs(ifarray) do
 				value = tonumber(args["{".. device .." carrier}"])
@@ -144,8 +116,8 @@ if ostype == "Linux" then
 			return ""
 	end, 3)
 
-	-- Volume
-	vicious.register(volmwidget, vicious.widgets.volume, separator .. "$2 $1%", 1, "Master")
+	-- Audio
+	vicious.register(audiowidget, vicious.widgets.volume, separator .. "$2 $1%", 1, "Master")
 
 	-- Battery
 	local batf = io.popen("ls '/sys/class/power_supply' 2>/dev/null")
@@ -175,308 +147,301 @@ if ostype == "Linux" then
 end
 
 -- Create a wibox for each screen and add it
-mywibox = {}
-mypromptbox = {}
-mylayoutbox = {}
-mytaglist = {}
-mytasklist = {}
+local taglist_buttons = awful.util.table.join(
+	awful.button({ }, 1, function(t) t:view_only() end),
+	awful.button({ modkey }, 1, function(t)
+		if client.focus then
+			client.focus:move_to_tag(t)
+		end
+	end),
+	awful.button({ }, 3, awful.tag.viewtoggle),
+	awful.button({ modkey }, 3, function(t)
+		if client.focus then
+			client.focus:toggle_tag(t)
+		end
+	end),
+	awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end),
+	awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end)
+)
 
-for s = 1, screen.count() do
-	-- Create a promptbox for each screen
-	mypromptbox[s] = awful.widget.prompt()
-
-	-- Create a taglist widget
-	mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons)
-
-	-- Create a tasklist widget
-	mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons)
-
-	-- Create the wibox
-	mywibox[s] = awful.wibox({ position = "top", screen = s })
-
-	-- Widgets that are aligned to the left
-	local left_layout = wibox.layout.fixed.horizontal()
-	left_layout:add(mytaglist[s])
-	left_layout:add(mypromptbox[s])
-
-	-- Widgets that are aligned to the right
-	local right_layout = wibox.layout.fixed.horizontal()
-	right_layout:add(batwidget)
-	right_layout:add(volmwidget)
-	right_layout:add(volpwidget)
-	right_layout:add(netwidget)
-	right_layout:add(cpuwidget)
-	right_layout:add(separator_date)
-	right_layout:add(mytextclock)
-	if s == 1 then right_layout:add(wibox.widget.systray()) end
-
-
-	-- Now bring it all together (with the tasklist in the middle)
-	local layout = wibox.layout.align.horizontal()
-	layout:set_left(left_layout)
-	layout:set_middle(mytasklist[s])
-	layout:set_right(right_layout)
-
-	mywibox[s]:set_widget(layout)
+local function set_wallpaper(s)
+	-- Wallpaper
+	if beautiful.wallpaper then
+		local wallpaper = beautiful.wallpaper
+		-- If wallpaper is a function, call it with the screen
+		if type(wallpaper) == "function" then
+			wallpaper = wallpaper(s)
+		end
+		gears.wallpaper.fit(wallpaper, s)
+	end
 end
 
---------------------------------------------------------------------------------
--- Mouse
+-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
+screen.connect_signal("property::geometry", set_wallpaper)
 
--- Mouse control
-local f = io.popen([[ xrandr | awk '/connected/ {getline; while($0 !~ "\\*") getline; print $1; exit}' ]])
-local res = f:read("*l")
-f:close()
+awful.screen.connect_for_each_screen(function(s)
+	-- Wallpaper
+	set_wallpaper(s)
 
--- Set the desired pixel coordinates.
-local corner_coords = {x=res:match('(%d+)x'), y=res:match('x(%d+)')}
+	-- Each screen has its own tag table.
+	awful.tag({ " 1 ", " 2 "," 3 "," 4 ", " 5 ⚒ ", " 6 ♫ ", "7 ✉ " }, s, awful.layout.suit.tile)
 
--- Simple function to move the mouse to the coordinates set above.
+	-- Create a promptbox for each screen
+	s.mypromptbox = awful.widget.prompt()
+	-- Create an imagebox widget which will contains an icon indicating which layout we're using.
+	-- We need one layoutbox per screen.
+	s.mylayoutbox = awful.widget.layoutbox(s)
+	s.mylayoutbox:buttons(awful.util.table.join(
+		awful.button({ }, 1, function () awful.layout.inc( 1) end),
+		awful.button({ }, 3, function () awful.layout.inc(-1) end),
+		awful.button({ }, 4, function () awful.layout.inc( 1) end),
+		awful.button({ }, 5, function () awful.layout.inc(-1) end)))
+	-- Create a taglist widget
+	s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons)
+
+	-- Create a tasklist widget
+	s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons)
+
+	-- Create the wibox
+	s.mywibox = awful.wibar({ position = "top", screen = s })
+
+	-- Add widgets to the wibox
+	s.mywibox:setup {
+		layout = wibox.layout.align.horizontal,
+		{ -- Left widgets
+			layout = wibox.layout.fixed.horizontal,
+			mylauncher,
+			s.mytaglist,
+			s.mypromptbox,
+		},
+		s.mytasklist, -- Middle widget
+		{ -- Right widgets
+			layout = wibox.layout.fixed.horizontal,
+			batwidget,
+			audiowidget,
+			netwidget,
+			cpuwidget,
+			wibox.widget.textbox(" |"),
+			mytextclock,
+			wibox.widget.systray(),
+			s.mylayoutbox,
+		},
+	}
+end)
+-- }}}
+
+-- {{{ Mouse bindings
+-- Simple function to move the mouse to the bottom right corner of the screen.
 local function move_mouse_away()
-	mouse.coords({ x=corner_coords.x, y=corner_coords.y })
+	mouse.coords({ x=mouse.screen.geometry.width, y=mouse.screen.geometry.height })
 end
 
 -- Move the mouse when rc.lua is read (startup)
 move_mouse_away()
 
-local function move_mouse(x, y)
-	pos = mouse.coords()
-	local fact = 10
-	mouse.coords({ x=pos.x + fact*x, y=pos.y + fact*y })
-end
+-- Fallback when no mouse is at hand.
+-- local function move_mouse(x, y)
+-- 	pos = mouse.coords()
+-- 	local fact = 10
+-- 	mouse.coords({ x=pos.x + fact*x, y=pos.y + fact*y })
+-- end
+-- }}}
 
---------------------------------------------------------------------------------
--- Key bindings
+-- {{{ Key bindings
 -- We reserve modkey+Mod1 for $EDITOR.
 
 globalkeys = awful.util.table.join(
-	-- Terminal
-	awful.key({ modkey,  }, "Return", function () awful.util.spawn(termcmd) end),
-	awful.key({ }, "XF86Terminal",    function () awful.util.spawn(termcmd) end),
+	awful.key({ modkey, }, "s",			 hotkeys_popup.show_help,
+		{description="show help", group="awesome"}),
+	awful.key({ modkey, }, "Escape", awful.tag.history.restore,
+		{description = "go back", group = "tag"}),
 
-	-- Calc
-	awful.key({ }, "XF86Calculator", function () awful.util.spawn(term .. "calc") end),
+	awful.key({ modkey, }, "j",
+		function ()
+			awful.client.focus.byidx( 1)
+		end,
+		{description = "focus next by index", group = "client"}
+	),
+	awful.key({ modkey, }, "k",
+		function ()
+			awful.client.focus.byidx(-1)
+		end,
+		{description = "focus previous by index", group = "client"}
+	),
 
-	-- Editor
-	awful.key({ modkey,  }, "e",     function () awful.util.spawn(os.getenv("EDITOR")) end),
-
-	-- Screen lock. xlockmore is useful for LDAP login because slock does not work with it.
-	-- Don't use 'spawn_with_shell' if you want to keep Awesome's config portable.
-	awful.key({ modkey,  }, "s",      function () awful.util.spawn("sh -c 'xlock 2>/dev/null || slock'") end),
-	awful.key({ }, "XF86ScreenSaver", function () awful.util.spawn("sh -c 'xlock 2>/dev/null || slock'") end),
-	awful.key({ }, "XF86Sleep",       function () awful.util.spawn("sh -c 'xlock 2>/dev/null || slock'") end),
-	awful.key({ }, "XF86Standby",     function () awful.util.spawn("sh -c 'xlock 2>/dev/null || slock'") end),
-
-	-- PDF Reader
-	awful.key({ modkey,  }, "p", function () awful.util.spawn("zathura") end),
-
-	-- Mail user agent
-	-- Mutt needs to be started in the folder where you want to save attachments.
-	awful.key({ modkey,  }, "m", function () awful.util.spawn(term .. "sh -c 'cd ~/temp && mutt'") end),
-	awful.key({ }, "XF86Mail",   function () awful.util.spawn(term .. "sh -c 'cd ~/temp && mutt'") end),
-
-	-- Web browser
-	awful.key({ modkey, }, "w", function () awful.util.spawn(os.getenv("BROWSER")) end),
-	awful.key({ }, "XF86WWW",   function () awful.util.spawn(os.getenv("BROWSER")) end),
-
-	-- Music player
-	awful.key({ modkey,           }, "a", function () awful.util.spawn(term .. "cmus") end),
-	awful.key({ modkey, "Mod1"    }, "a", function () awful.util.spawn("cmus-remote -u") end),
-	awful.key({ modkey, "Shift"   }, "a", function () awful.util.spawn("cmus-remote -n") end),
-	awful.key({ modkey, "Control" }, "a", function () awful.util.spawn("cmus-remote -r") end),
-
-	awful.key({ }, "XF86AudioMedia", function () awful.util.spawn(term .. "cmus") end),
-	awful.key({ }, "XF86AudioPlay",  function () awful.util.spawn("cmus-remote -u") end),
-	awful.key({ }, "XF86AudioNext",  function () awful.util.spawn("cmus-remote -n") end),
-	awful.key({ }, "XF86AudioPrev",  function () awful.util.spawn("cmus-remote -r") end),
-
-	-- Screenshot
-	-- Using $HOME in command line does not work for scrot.
-	awful.key({}, "Print",         function () awful.util.spawn("scrot '" .. home .. "/temp/screen-%F-%T.png'") end),
-
-	-- TODO manager
-	awful.key({ modkey }, "t", function () awful.util.spawn(os.getenv("EDITOR") .. " ~/personal/todo/todo.org") end),
-
-	-- Mouse control
-	-- Touchpad
-	awful.key({ }, "XF86TouchpadToggle", function () os.execute("synclient TouchpadOff=`synclient -l | grep -c 'TouchpadOff.*=.*0'`") end),
-	awful.key({ }, "XF86Tools",          function () os.execute("synclient TouchpadOff=`synclient -l | grep -c 'TouchpadOff.*=.*0'`") end),
-	awful.key({ modkey, "Control" }, "m",  function () os.execute("synclient TouchpadOff=`synclient -l | grep -c 'TouchpadOff.*=.*0'`") end),
-	-- `move_mouse_away` is useful if the mouse is getting in your way.
-	awful.key({ modkey, "Shift" }, "m", move_mouse_away),
-
-	--------------------------------------------------------------------------------
-	-- Awesome specific
-	--------------------------------------------------------------------------------
-
-	-- Standard program
-	awful.key({ modkey, "Shift" }, "r", awesome.restart),
-	-- Too risky, so we disable it. You can still quit by calling the Lua command manually (modkey+x by default).
-	-- awful.key({ modkey, "Shift"   }, "q", awesome.quit),
-
-	-- Tags
-	awful.key({ modkey }, "Prior",  awful.tag.viewprev),
-	awful.key({ modkey }, "Next",   awful.tag.viewnext),
-	awful.key({ modkey }, "Escape", awful.tag.history.restore),
-
-	-- Layout select and switch
-	awful.key({ modkey }, "l", function () awful.client.swap.byidx(  1) end),
-	awful.key({ modkey }, "h", function () awful.client.swap.byidx( -1) end),
-	-- awful.key({ modkey,           }, "u", awful.client.urgent.jumpto),
-	awful.key({ modkey }, "Tab", function ()
+	-- Layout manipulation
+	awful.key({ modkey, "Shift"		}, "j", function () awful.client.swap.byidx(	1)		end,
+		{description = "swap with next client by index", group = "client"}),
+	awful.key({ modkey, "Shift"		}, "k", function () awful.client.swap.byidx( -1)		end,
+		{description = "swap with previous client by index", group = "client"}),
+	awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end,
+		{description = "focus the next screen", group = "screen"}),
+	awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end,
+		{description = "focus the previous screen", group = "screen"}),
+	awful.key({ modkey, }, "Tab",
+		function ()
 			awful.client.focus.history.previous()
 			if client.focus then
 				client.focus:raise()
 			end
-	end),
+		end,
+		{description = "go back", group = "client"}),
 
-	awful.key({ modkey }, "k",
+	-- Standard program
+	awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end,
+		{description = "open a terminal", group = "launcher"}),
+	awful.key({ modkey, "Control" }, "r", awesome.restart,
+		{description = "reload awesome", group = "awesome"}),
+	awful.key({ modkey, }, "w",  function () awful.spawn("qutebrowser") end,
+		{description="web browser", group="launcher"}),
+	awful.key({ modkey, }, "e",  function () awful.spawn(os.getenv("EDITOR")) end,
+		{description="editor", group="launcher"}),
+	-- Mutt needs to be started in the folder where you want to save attachments.
+	awful.key({ modkey, }, "y",  function () awful.spawn(terminal .. " -e sh -c 'cd ~/temp && mutt'") end,
+		{description="mail user agent", group="launcher"}),
+	awful.key({ modkey, }, "a",  function () awful.spawn(terminal .. " -e cmus") end,
+		{description="music player", group="launcher"}),
+	awful.key({ modkey, "Mod1" }, "a",  function () awful.spawn("cmus-remote -u") end,
+		{description="music toggle", group="launcher"}),
+	awful.key({ modkey, "Control" }, "a",  function () awful.spawn("cmus-remote -n") end,
+		{description="music next", group="launcher"}),
+	awful.key({ modkey, "Shift" }, "a",  function () awful.spawn("cmus-remote -r") end,
+		{description="music previous", group="launcher"}),
+	awful.key({ }, "Print",  function () awful.spawn("scrot '" .. os.getenv("HOME") .. "/temp/screen-%F-%T.png'") end,
+		{description="screenshot", group="launcher"}),
+	awful.key({ modkey }, "t",  function () awful.spawn(os.getenv("EDITOR") .. " ~/personal/todo/todo.org") end,
+		{description="todo", group="launcher"}),
+
+	-- Screen lock. xlockmore is useful for LDAP login because slock does not work with it.
+	-- Don't use 'spawn_with_shell' if you want to keep Awesome's config portable.
+	awful.key({ modkey, }, "z",  function () awful.spawn("sh -c 'xlock 2>/dev/null || slock'") end,
+		{description="lock screen", group="awesome"}),
+	awful.key({ }, "XF86ScreenSaver", function () awful.util.spawn("sh -c 'xlock 2>/dev/null || slock'") end,
+		{description="lock screen", group="awesome"}),
+	awful.key({ }, "XF86Sleep",       function () awful.util.spawn("sh -c 'xlock 2>/dev/null || slock'") end,
+		{description="lock screen", group="awesome"}),
+	awful.key({ }, "XF86Standby",     function () awful.util.spawn("sh -c 'xlock 2>/dev/null || slock'") end,
+		{description="lock screen", group="awesome"}),
+
+	-- Touchpad control
+	awful.key({ }, "XF86TouchpadToggle", function () os.execute("synclient TouchpadOff=`synclient -l | grep -c 'TouchpadOff.*=.*0'`") end,
+		{description="toggle touchpad", group="mouse"}),
+	awful.key({ }, "XF86Tools",          function () os.execute("synclient TouchpadOff=`synclient -l | grep -c 'TouchpadOff.*=.*0'`") end,
+		{description="toggle touchpad", group="mouse"}),
+	awful.key({ modkey, "Control" }, "m",  function () os.execute("synclient TouchpadOff=`synclient -l | grep -c 'TouchpadOff.*=.*0'`") end,
+		{description="toggle touchpad", group="mouse"}),
+	awful.key({ modkey, "Shift" }, "m", move_mouse_away,
+		{description="move mouse away", group="mouse"}),
+
+	-- Audio volume
+	awful.key({ modkey }, "KP_Subtract",   function () awful.util.spawn(audio_decrease) end,
+		{description = "raise volume", group = "audio"}),
+	awful.key({ modkey }, "KP_Add",        function () awful.util.spawn(audio_increase) end,
+		{description = "lower volume", group = "audio"}),
+	awful.key({ modkey }, "KP_Enter",      function () awful.util.spawn(audio_toggle) end,
+		{description = "toggle audio", group = "audio"}),
+
+	awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn(audio_decrease) end,
+		{description = "lower volume", group = "audio"}),
+	awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn(audio_increase) end,
+		{description = "raise volume", group = "audio"}),
+	awful.key({ }, "XF86AudioMute",        function () awful.util.spawn(audio_toggle) end,
+		{description = "toggle audio", group = "audio"}),
+
+	awful.key({ modkey, "Control" }, "n",
 		function ()
-			awful.client.focus.byidx(-1)
-			if client.focus then client.focus:raise() end
-	end),
-	awful.key({ modkey }, "j",
+			local c = awful.client.restore()
+			-- Focus restored client
+			if c then
+				client.focus = c
+				c:raise()
+			end
+		end,
+		{description = "restore minimized", group = "client"}),
+
+	awful.key({ modkey }, "x",
 		function ()
-			awful.client.focus.byidx(1)
-			if client.focus then client.focus:raise() end
-	end),
-
-	-- Layout resize
-	awful.key({ modkey }, "Left",  function () awful.tag.incmwfact(-0.05) end),
-	awful.key({ modkey }, "Right", function () awful.tag.incmwfact(0.05) end),
-	awful.key({ modkey }, "Up",    function () awful.client.incwfact(0.05) end),
-	awful.key({ modkey }, "Down",  function () awful.client.incwfact(-0.05) end),
-
-	-- Layout organization
-	awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end),
-	awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end),
-	awful.key({ modkey, "Shift" }, "k", function () awful.tag.incncol( 1) end),
-	awful.key({ modkey, "Shift" }, "j", function () awful.tag.incncol(-1) end),
-
-	-- Multi screen
-	awful.key({ modkey, "Shift" }, "Next", function () awful.screen.focus_relative( 1) end),
-	awful.key({ modkey, "Shift" }, "Prior", function () awful.screen.focus_relative(-1) end),
-
-	-- Keyboard controlled mouse
-	-- awful.key({ modkey, "Control" }, "Left",  function () move_mouse(-1, 0) end),
-	-- awful.key({ modkey, "Control" }, "Right", function () move_mouse(1, 0) end),
-	-- awful.key({ modkey, "Control" }, "Up",    function () move_mouse(0, -1) end),
-	-- awful.key({ modkey, "Control" }, "Down",  function () move_mouse(0, 1) end),
-	-- awful.key({ modkey, "Control" }, "KP_Enter",  function () awful.util.spawn("xdotool click 1") end),
-
-	-- Prompt
-	awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
-
-	-- Lua code
-	awful.key({ modkey }, "x", function ()
-			awful.prompt.run({ prompt = "Run Lua code: " },
-				mypromptbox[mouse.screen].widget,
-				awful.util.eval, nil,
-				awful.util.getdir("cache") .. "/history_eval")
-	end)
+			awful.prompt.run {
+				prompt			 = "Run Lua code: ",
+				textbox			 = awful.screen.focused().mypromptbox.widget,
+				exe_callback = awful.util.eval,
+				history_path = awful.util.get_cache_dir() .. "/history_eval"
+			}
+		end,
+		{description = "lua execute prompt", group = "awesome"}),
+	-- Menubar
+	awful.key({ modkey }, "p", function() menubar.show() end,
+		{description = "show the menubar", group = "launcher"})
 )
 
--- Sound Volume
-if ostype == "Linux" then
-	globalkeys = awful.util.table.join (globalkeys,
-		awful.key({ modkey }, "KP_Subtract",   function () awful.util.spawn("amixer set Master 5%- >/dev/null") end),
-		awful.key({ modkey }, "KP_Add",        function () awful.util.spawn("amixer set Master 5%+ >/dev/null") end),
-		awful.key({ modkey }, "KP_Enter",      function () awful.util.spawn("amixer set Master toggle >/dev/null") end),
-
-		awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set Master 5%+ >/dev/null") end),
-		awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer set Master 5%- >/dev/null") end),
-		awful.key({ }, "XF86AudioMute",        function () awful.util.spawn("amixer set Master toggle >/dev/null") end)
-	)
-elseif ostype == "FreeBSD" then
-	globalkeys = awful.util.table.join (globalkeys,
-		awful.key({ modkey }, "KP_Subtract",   function () awful.util.spawn("mixer vol -5 >/dev/null") end),
-		awful.key({ modkey }, "KP_Add",        function () awful.util.spawn("mixer vol +5 >/dev/null") end),
-		awful.key({ modkey }, "KP_Enter",      function () awful.util.spawn("mixer vol ^ >/dev/null") end),
-
-		awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("mixer vol -5 >/dev/null") end),
-		awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("mixer vol +5 >/dev/null") end),
-		awful.key({ }, "XF86AudioMute",        function () awful.util.spawn("mixer vol ^ >/dev/null") end)
-	)
-end
-
-
--- Client keys
 clientkeys = awful.util.table.join(
-	awful.key({ modkey }, "f",      function ()
-		if awful.layout.getname() == 'tile' then
-			awful.layout.set(awful.layout.suit.max)
-		else
-			awful.layout.set(awful.layout.suit.tile)
-		end
-	end),
-
-	awful.key({ modkey, "Shift" }, "f",      function (c) c.fullscreen = not c.fullscreen  end),
-	awful.key({ modkey, "Shift" }, "c",      function (c) c:kill() end),
-	awful.key({ modkey,         }, "space",  awful.client.floating.toggle),
-	-- awful.key({ modkey, "Shift" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
-	awful.key({ modkey,         }, "o",      awful.client.movetoscreen)
+	awful.key({ modkey,						}, "f",
+		function (c)
+			c.fullscreen = not c.fullscreen
+			c:raise()
+		end,
+		{description = "toggle fullscreen", group = "client"}),
+	awful.key({ modkey, "Shift"		}, "c", function (c) c:kill() end,
+		{description = "close", group = "client"}),
+	awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle,
+		{description = "toggle floating", group = "client"}),
+	awful.key({ modkey, }, "o", function (c) c:move_to_screen() end,
+		{description = "move to screen", group = "client"}),
+	awful.key({ modkey, }, "n",
+		function (c)
+			-- The client currently has the input focus, so it cannot be
+			-- minimized, since minimized clients can't have the focus.
+			c.minimized = true
+		end ,
+		{description = "minimize", group = "client"}),
+	awful.key({ modkey, }, "m",
+		function (c)
+			c.maximized = not c.maximized
+			c:raise()
+		end ,
+		{description = "maximize", group = "client"})
 )
 
--- Compute the maximum number of digit we need, limited to 9
-keynumber = 0
-for s = 1, screen.count() do
-	keynumber = math.min(9, math.max(#tags[s], keynumber))
-end
-
 -- Bind all key numbers to tags.
 -- Be careful: we use keycodes to make it works on any keyboard layout.
 -- This should map on the top row of your keyboard, usually 1 to 9.
-for i = 1, keynumber do
-	globalkeys = awful.util.table.join(
-		globalkeys,
-
-		awful.key({ modkey }, "#" .. i + 9, function ()
-				local screen = mouse.screen
-				if tags[screen][i] then
-					awful.tag.viewonly(tags[screen][i])
+for i = 1, #awful.screen.focused().tags do
+	globalkeys = awful.util.table.join(globalkeys,
+	-- View tag only.
+	awful.key({ modkey }, "#" .. i + 9,
+		function ()
+			local screen = awful.screen.focused()
+			local tag = screen.tags[i]
+			if tag then
+				tag:view_only()
+			end
+		end,
+		{description = "view tag #"..i, group = "tag"}),
+	-- Move client to tag.
+	awful.key({ modkey, "Shift" }, "#" .. i + 9,
+		function ()
+			if client.focus then
+				local tag = client.focus.screen.tags[i]
+				if tag then
+					client.focus:move_to_tag(tag)
 				end
-		end),
-
-		awful.key({ modkey, "Control" }, "#" .. i + 9, function ()
-				local screen = mouse.screen
-				if tags[screen][i] then
-					awful.tag.viewtoggle(tags[screen][i])
-				end
-		end),
-
-		awful.key({ modkey, "Shift" }, "#" .. i + 9, function ()
-				if client.focus then
-					local tag = awful.tag.gettags(client.focus.screen)[i]
-					if tag then
-						awful.client.movetotag(tag)
-					end
-				end
-		end),
-
-		-- Multi screen
-		awful.key({ modkey, "Shift", "Control" }, "#" .. i + 9, function ()
-				if client.focus then
-					if tags[client.focus.screen+1] and tags[client.focus.screen+1][i] then
-						awful.client.movetotag(tags[client.focus.screen+1][i])
-					elseif tags[1][i] then
-						awful.client.movetotag(tags[1][i])
-					end
-				end
-		end)
+			end
+		end,
+		{description = "move focused client to tag #"..i, group = "tag"})
 	)
 end
 
 clientbuttons = awful.util.table.join(
-	awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
-	awful.button({ modkey }, 1, awful.mouse.client.move),
-	awful.button({ modkey }, 3, awful.mouse.client.resize))
+		awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
+		awful.button({ modkey }, 1, awful.mouse.client.move),
+		awful.button({ modkey }, 3, awful.mouse.client.resize))
 
 -- Set keys
 root.keys(globalkeys)
+-- }}}
 
---------------------------------------------------------------------------------
--- Rules
-
+-- {{{ Rules
+-- Rules to apply to new clients (through the "manage" signal).
 awful.rules.rules = {
 	-- All clients will match this rule.
 	{ rule = { },
@@ -484,77 +449,78 @@ awful.rules.rules = {
 			border_color = beautiful.border_normal,
 			size_hints_honor = false,
 			focus = awful.client.focus.filter,
-			-- focus = true,
+			raise = true,
 			keys = clientkeys,
-			buttons = clientbuttons } },
+			buttons = clientbuttons,
+			screen = awful.screen.preferred,
+			placement = awful.placement.no_overlap+awful.placement.no_offscreen
+		}
+	},
 
-	{ rule = { class = "MPlayer" },
-		properties = { floating = true } },
-	{ rule = { class = "mplayer2" },
-		properties = { floating = true } },
-	{ rule = { class = "mpv" },
-		properties = { floating = true } },
-	{ rule = { class = "mupen64plus" },
-		properties = { floating = true } },
-	{ rule = { class = "pinentry" },
-		properties = { floating = true } },
-	{ rule = { name = "QEMU" },
-		properties = { floating = true } },
-	{ rule = { class = "Steam" },
-		properties = { floating = true } },
+	-- Floating clients.
+	{ rule_any = {
+			instance = {
+				"DTA", -- Firefox addon DownThemAll.
+				"copyq", -- Includes session name in class.
+				"exe", -- wine
+			},
+			class = {
+				"Arandr",
+				"Gpick",
+				"Kruler",
+				"MessageWin", -- kalarm.
+				"Sxiv",
+				"Wpa_gui",
+				"pinentry",
+				"veromix",
+				"xtightvncviewer",
+				"mupen64plus",
+				"mpv",
+			},
 
-	-- Flash workaround. Does not work?
-	{ rule = { instance = "plugin-container" },
-		properties = { floating = true } },
-
-	{ rule = { instance = "exe" },
-		properties = { floating = true } },
+			name = {
+				"Event Tester", -- xev.
+			},
+			role = {
+				"AlarmWindow", -- Thunderbird's calendar.
+				"pop-up", -- e.g. Google Chrome's (detached) Developer Tools.
+			}
+	}, properties = { floating = true }},
 
+	-- Set Firefox to always map on the tag named "2" on screen 1.
+	-- { rule = { class = "Firefox" },
+	--	 properties = { screen = 1, tag = "2" } },
 	-- Only works for terminal with WM_COMMAND property?
-	-- Does not work with LXTerminal.
 	{ rule = { name = "cmus" },
-		properties = { tag = tags[1][6] } },
+		properties = { screen = 1, tag = " 6 ♫ " } },
 	{ rule = { name = "mutt" },
-		properties = { tag = tags[1][7] } },
-
-	-- { rule = { class = "Gimp" },
-	--   properties = { floating = false } },
-
-	-- Emacs Speedbar. This does not work when Speedbar is first launched,
-	-- because its frame is called "emacs...", not speedbar. It only works when
-	-- 'speedbar' command is issued thereafter. Use 'C-x z z' after the first
-	-- speedbar call to automate this.
-	{ rule = { name = "Speedbar 1.0" },
-		callback = function( c ) awful.tag.setmwfact(0.15) end },
+		properties = { screen = 1, tag = "7 ✉ " } },
 }
+-- }}}
 
---------------------------------------------------------------------------------
--- Signals
-
+-- {{{ Signals
 -- Signal function to execute when a new client appears.
-client.connect_signal("manage", function (c, startup)
-		-- Enable sloppy focus
-		c:connect_signal("mouse::enter", function(c)
-				if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
-					and awful.client.focus.filter(c) then
-					client.focus = c
-				end
-			end)
+client.connect_signal("manage", function (c)
+	-- Set the windows at the slave,
+	-- i.e. put it at the end of others instead of setting it master.
+	-- if not awesome.startup then awful.client.setslave(c) end
 
-		if not startup then
-			-- Set the windows at the slave,
-			-- i.e. put it at the end of others instead of setting it master.
-			-- awful.client.setslave(c)
+	if awesome.startup and
+		not c.size_hints.user_position
+		and not c.size_hints.program_position then
+			-- Prevent clients from being unreachable after screen count changes.
+			awful.placement.no_offscreen(c)
+	end
+end)
 
-			-- Put windows in a smart way, only if they does not set an initial position.
-			if not c.size_hints.user_position and not c.size_hints.program_position then
-				awful.placement.no_overlap(c)
-				awful.placement.no_offscreen(c)
-			end
-		end
+-- Enable sloppy focus, so that focus follows mouse.
+client.connect_signal("mouse::enter", function(c)
+	if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
+		and awful.client.focus.filter(c) then
+		client.focus = c
+	end
 end)
 
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
-
--- End of Awesome config
+-- }}}