From 50be274ee0366f3b06755455d8dbe9f2a98d20c3 Mon Sep 17 00:00:00 2001
From: copycat-killer <dada@archlinux.info>
Date: Tue, 10 Jan 2017 19:45:16 +0100
Subject: [PATCH] holo enhanced and ported to 4.0

---
 README.rst                               |  17 +-
 lain                                     |   2 +-
 rc.lua.blackburn                         |  21 +-
 rc.lua.copland                           |  27 +-
 rc.lua.dremora                           |  19 +-
 rc.lua.holo                              | 881 ++++++++++++-----------
 rc.lua.multicolor                        |  19 +-
 themes/holo/icons/awesome_icon_white.png | Bin 0 -> 181 bytes
 themes/holo/icons/bar.png                | Bin 145 -> 163 bytes
 themes/holo/icons/base_widget.png        | Bin 142 -> 0 bytes
 themes/holo/icons/bg_focus.png           | Bin 1229 -> 0 bytes
 themes/holo/icons/bg_focus_noline.png    | Bin 462 -> 0 bytes
 themes/holo/icons/bottom_bar.png         | Bin 181 -> 181 bytes
 themes/holo/icons/last.png               | Bin 146 -> 0 bytes
 themes/holo/icons/mail_notify.png        | Bin 1554 -> 0 bytes
 themes/holo/icons/mpd.png                | Bin 418 -> 428 bytes
 themes/holo/icons/next.png               | Bin 399 -> 419 bytes
 themes/holo/icons/prev.png               | Bin 404 -> 414 bytes
 themes/holo/icons/spr.png                | Bin 144 -> 0 bytes
 themes/holo/icons/spr_left.png           | Bin 136 -> 160 bytes
 themes/holo/icons/stop.png               | Bin 169 -> 188 bytes
 themes/holo/icons/submenu.png            | Bin 84 -> 0 bytes
 themes/holo/icons/taglist_bg_focus.png   | Bin 227 -> 0 bytes
 themes/holo/icons/topbar/1024.png        | Bin 347 -> 0 bytes
 themes/holo/icons/topbar/1152.png        | Bin 387 -> 0 bytes
 themes/holo/icons/topbar/1280.png        | Bin 403 -> 0 bytes
 themes/holo/icons/topbar/1366.png        | Bin 433 -> 0 bytes
 themes/holo/icons/topbar/1440.png        | Bin 380 -> 0 bytes
 themes/holo/icons/topbar/1600.png        | Bin 394 -> 0 bytes
 themes/holo/icons/topbar/1680.png        | Bin 403 -> 0 bytes
 themes/holo/icons/topbar/1920.png        | Bin 426 -> 0 bytes
 themes/holo/icons/topbar/2560.png        | Bin 483 -> 0 bytes
 themes/holo/icons/uselesstile.png        | Bin 203 -> 0 bytes
 themes/holo/icons/uselesstileleft.png    | Bin 197 -> 0 bytes
 themes/holo/icons/uselesstiletop.png     | Bin 198 -> 0 bytes
 themes/holo/theme.lua                    |  37 +-
 36 files changed, 554 insertions(+), 469 deletions(-)
 create mode 100644 themes/holo/icons/awesome_icon_white.png
 delete mode 100644 themes/holo/icons/base_widget.png
 delete mode 100644 themes/holo/icons/bg_focus.png
 delete mode 100644 themes/holo/icons/bg_focus_noline.png
 delete mode 100644 themes/holo/icons/last.png
 delete mode 100644 themes/holo/icons/mail_notify.png
 delete mode 100644 themes/holo/icons/spr.png
 delete mode 100644 themes/holo/icons/submenu.png
 delete mode 100644 themes/holo/icons/taglist_bg_focus.png
 delete mode 100644 themes/holo/icons/topbar/1024.png
 delete mode 100644 themes/holo/icons/topbar/1152.png
 delete mode 100644 themes/holo/icons/topbar/1280.png
 delete mode 100644 themes/holo/icons/topbar/1366.png
 delete mode 100644 themes/holo/icons/topbar/1440.png
 delete mode 100644 themes/holo/icons/topbar/1600.png
 delete mode 100644 themes/holo/icons/topbar/1680.png
 delete mode 100644 themes/holo/icons/topbar/1920.png
 delete mode 100644 themes/holo/icons/topbar/2560.png
 delete mode 100644 themes/holo/icons/uselesstile.png
 delete mode 100644 themes/holo/icons/uselesstileleft.png
 delete mode 100644 themes/holo/icons/uselesstiletop.png

diff --git a/README.rst b/README.rst
index fe8491b..7f454d5 100644
--- a/README.rst
+++ b/README.rst
@@ -11,6 +11,7 @@ I am in the process of updating to awesome 4.0. Currently, the ported themes are
 - blackburn
 - copland
 - dremora
+- holo
 - multicolor
 
 -------------------------
@@ -41,14 +42,13 @@ Notable features
 - Net carrier status notifier
 - Colorful autoupdating icons
 - Symbolic tag names
-- TXT layoutbox
-- Cairo wibox bar
+- Text layoutbox
+- Cairo wibar
 - Custom layouts
 - No borders when there's only one visible client
 - Freedesktop.org compliant menu and desktop icons
 - Vi-like client focus
 - Non-empty tag browsing
-- Dynamic client borders (colors change along with processes status)
 - Dynamic useless gaps
 - Dynamic tagging
 
@@ -123,7 +123,7 @@ Only compatible with **stable** versions of Lua and Awesome (git/unstable versio
 
 Complements are provided by lain_: be sure to meet its dependencies_.
 
-Fonts are Terminus_ (Multicolor, Powerarrow Darker), Tamzen_ (Copland) and Tamsyn_ (other ones).
+Fonts are Terminus_ (Multicolor, Powerarrow Darker), Tamzen_ (Copland), Roboto_ (Holo) and Tamsyn_ (other ones).
 
 Every theme has a colorscheme_.
 
@@ -133,19 +133,20 @@ Default additional software used: ::
 
     unclutter firefox scrot mpd mpc dmenu xsel
 
-.. _BY-NC-SA: http://creativecommons.org/licenses/by-nc-sa/4.0/
+.. _BY-NC-SA: http://creativecommons.org/licenses/by-nc-sa/4.0
 .. _Awesome: http://github.com/awesomeWM/awesome
 .. _lucamanni: https://github.com/lucamanni/awesome
 .. _romockee: https://github.com/romockee/powerarrow
 .. _ok100: http://ok100.deviantart.com/art/DWM-January-2013-348656846
 .. _amouly: https://bbs.archlinux.org/viewtopic.php?pid=1307158#p1307158
-.. _foozer: http://dotshare.it/dots/499/
+.. _foozer: http://dotshare.it/dots/499
 .. _`switch-theme.sh`: https://github.com/copycat-killer/awesome-copycats/issues/36
 .. _lain: https://github.com/copycat-killer/lain
 .. _dependencies: https://github.com/copycat-killer/lain/wiki#dependencies
-.. _Terminus: http://terminus-font.sourceforge.net/
+.. _Terminus: http://terminus-font.sourceforge.net
 .. _Tamzen: https://github.com/sunaku/tamzen-font
-.. _Tamsyn: http://www.fial.com/~scott/tamsyn-font/
+.. _Roboto: https://fonts.google.com/specimen/Roboto
+.. _Tamsyn: http://www.fial.com/~scott/tamsyn-font
 .. _colorscheme: https://github.com/copycat-killer/dots/tree/master/.colors
 .. _Icons: https://github.com/copycat-killer/dots/tree/master/.fonts
 .. _Debian: http://weiwu.sdf.org/100921.html
diff --git a/lain b/lain
index 5d892e0..617675d 160000
--- a/lain
+++ b/lain
@@ -1 +1 @@
-Subproject commit 5d892e0ceb9d4dece6d2d61b2e5c4046bbc91e9f
+Subproject commit 617675d6c3a7b79d650bfcd52a3c13e8dcdfa459
diff --git a/rc.lua.blackburn b/rc.lua.blackburn
index 6a85c53..a57e35b 100644
--- a/rc.lua.blackburn
+++ b/rc.lua.blackburn
@@ -1,7 +1,7 @@
 
 --[[
                                      
-     Blackburn Awesome WM config 2.0 
+     Blackburn Awesome WM config 3.0 
      github.com/copycat-killer       
                                      
 --]]
@@ -561,17 +561,22 @@ globalkeys = awful.util.table.join(
 
     --[[ Default
     -- Prompt
-    awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
+    awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end,
+              {description = "run prompt", group = "launcher"}),
 
     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)
+    awful.key({ modkey }, "p", function() menubar.show() end,
+              {description = "show the menubar", group = "launcher"})
     --]]
 
     -- dmenu
diff --git a/rc.lua.copland b/rc.lua.copland
index bce1a00..e23f540 100644
--- a/rc.lua.copland
+++ b/rc.lua.copland
@@ -1,9 +1,9 @@
 
 --[[
-                               
-     Copland Awesome WM config 
-     github.com/copycat-killer 
-                               
+                                   
+     Copland Awesome WM config 2.0 
+     github.com/copycat-killer     
+                                   
 --]]
 
 -- {{{ Required libraries
@@ -627,17 +627,22 @@ globalkeys = awful.util.table.join(
 
     --[[ Default
     -- Prompt
-    awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
+    awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end,
+              {description = "run prompt", group = "launcher"}),
 
     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)
+    awful.key({ modkey }, "p", function() menubar.show() end,
+              {description = "show the menubar", group = "launcher"})
     --]]
 
     -- dmenu
diff --git a/rc.lua.dremora b/rc.lua.dremora
index 284baba..e5a6392 100644
--- a/rc.lua.dremora
+++ b/rc.lua.dremora
@@ -554,17 +554,22 @@ globalkeys = awful.util.table.join(
 
     --[[ Default
     -- Prompt
-    awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
+    awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end,
+              {description = "run prompt", group = "launcher"}),
 
     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)
+    awful.key({ modkey }, "p", function() menubar.show() end,
+              {description = "show the menubar", group = "launcher"})
     --]]
 
     -- dmenu
diff --git a/rc.lua.holo b/rc.lua.holo
index 8764d52..b3cda62 100644
--- a/rc.lua.holo
+++ b/rc.lua.holo
@@ -1,20 +1,23 @@
+
 --[[
                                 
-     Holo Awesome WM config 2.0 
+     Holo Awesome WM config 3.0 
      github.com/copycat-killer  
                                 
 --]]
 
 -- {{{ Required libraries
-local gears     = require("gears")
-local awful     = require("awful")
-awful.rules     = require("awful.rules")
-                  require("awful.autofocus")
-local wibox     = require("wibox")
-local beautiful = require("beautiful")
-local naughty   = require("naughty")
-local lain      = require("lain")
---local menubar   = require("menubar")
+local gears         = require("gears")
+local awful         = require("awful")
+                      require("awful.autofocus")
+local wibox         = require("wibox")
+local beautiful     = require("beautiful")
+local naughty       = require("naughty")
+local lain          = require("lain")
+local shape         = require("gears.shape")
+--local menubar       = require("menubar")
+local freedesktop   = require("freedesktop")
+local hotkeys_popup = require("awful.hotkeys_popup").widget
 -- }}}
 
 -- {{{ Error handling
@@ -32,20 +35,20 @@ do
 
         naughty.notify({ preset = naughty.config.presets.critical,
                          title = "Oops, an error happened!",
-                         text = err })
+                         text = tostring(err) })
         in_error = false
     end)
 end
 -- }}}
 
 -- {{{ Autostart applications
-function run_once(cmd)
+local function run_once(cmd)
   findme = cmd
   firstspace = cmd:find(" ")
   if firstspace then
      findme = cmd:sub(0, firstspace-1)
   end
-  awful.util.spawn_with_shell("pgrep -u $USER -x " .. findme .. " > /dev/null || (" .. cmd .. ")")
+  awful.spawn.with_shell(string.format("pgrep -u $USER -x %s > /dev/null || (%s)", findme, cmd))
 end
 
 run_once("urxvtd")
@@ -62,78 +65,80 @@ modkey     = "Mod4"
 altkey     = "Mod1"
 terminal   = "urxvtc" or "xterm"
 editor     = os.getenv("EDITOR") or "nano" or "vi"
-editor_cmd = terminal .. " -e " .. editor
 
 -- user defined
 browser    = "firefox"
 gui_editor = "gvim"
 graphics   = "gimp"
-musicplr   = terminal .. " -e ncmpcpp "
+musicplr = terminal .. " -e ncmpcpp "
 
-local layouts = {
-    awful.layout.suit.floating,
-    lain.layout.uselesstile,
-    awful.layout.suit.fair,
-    lain.layout.uselesstile.left,
-    lain.layout.uselesstile.top
-}
+-- lain
+lain.layout.termfair.nmaster   = 3
+lain.layout.termfair.ncol      = 1
+lain.layout.centerfair.nmaster = 3
+lain.layout.centerfair.ncol    = 1
 
 -- quake terminal
 local quakeconsole = {}
-for s = 1, screen.count() do
-   quakeconsole[s] = lain.util.quake({ app = terminal, wibox_height = 32})
+for s in screen do
+   quakeconsole[s] = lain.util.quake({ app = terminal })
 end
 -- }}}
 
--- {{{ Tags
-tags = {
-   names = { " WEB ", " TERMINAL ", " FILES ", " OTHER " },
-   layout = { layouts[1], layouts[3], layouts[2], layouts[4] }
-}
-for s = 1, screen.count() do
-   tags[s] = awful.tag(tags.names, s, tags.layout)
-end
--- }}}
+-- {{{ Helper functions
+local function client_menu_toggle_fn()
+    local instance = nil
 
--- {{{ Wallpaper
-if beautiful.wallpaper then
-    for s = 1, screen.count() do
-        gears.wallpaper.maximized(beautiful.wallpaper, s, true)
+    return function ()
+        if instance and instance.wibox.visible then
+            instance:hide()
+            instance = nil
+        else
+            instance = awful.menu.clients({ theme = { width = 250 } })
+        end
     end
 end
 -- }}}
 
 -- {{{ Menu
-mymainmenu = awful.menu.new({ items = require("freedesktop").menu.build(),
-                              theme = { height = 16, width = 130 }})
-mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
-                                     menu = mymainmenu })
--- Menubar configuration
---menubar.utils.terminal = terminal -- Set the terminal for applications that require it
+myawesomemenu = {
+    { "hotkeys", function() return false, hotkeys_popup.show_help end },
+    { "manual", terminal .. " -e man awesome" },
+    { "edit config", string.format("%s -e %s %s", terminal, editor, awesome.conffile) },
+    { "restart", awesome.restart },
+    { "quit", function() awesome.quit() end }
+}
+mymainmenu = freedesktop.menu.build({
+    before = {
+        { "Awesome", myawesomemenu, beautiful.awesome_icon_white },
+        -- other triads can be put here
+    },
+    after = {
+        { "Open terminal", terminal },
+        -- other triads can be put here
+    }
+})
+mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, menu = mymainmenu })
+--menubar.utils.terminal = terminal -- Set the Menubar terminal for applications that require it
 -- }}}
 
--- {{{ Wibox
+-- {{{ Wibar
 markup = lain.util.markup
 blue   = "#80CCE6"
 space3 = markup.font("Tamsyn 3", " ")
-space2 = markup.font("Tamsyn 2", " ")
 
 -- Clock
-mytextclock = awful.widget.textclock(markup("#FFFFFF", space3 .. "%H:%M" .. space2))
-clock_icon = wibox.widget.imagebox()
-clock_icon:set_image(beautiful.clock)
-clockwidget = wibox.widget.background()
-clockwidget:set_widget(mytextclock)
-clockwidget:set_bgimage(beautiful.widget_bg)
+mytextclock = wibox.widget.textclock(markup("#FFFFFF", space3 .. "%H:%M   " .. markup.font("Tamsyn 4", " ")))
+clock_icon = wibox.widget.imagebox(beautiful.clock)
+clockbg = wibox.container.background(mytextclock, beautiful.bg_focus, shape.rectangle)
+clockwidget = wibox.container.margin(clockbg, 0, 3, 5, 5)
 
 -- Calendar
-mytextcalendar = awful.widget.textclock(markup("#FFFFFF", space3 .. "%d %b<span font='Tamsyn 5'> </span>"))
-calendar_icon = wibox.widget.imagebox()
-calendar_icon:set_image(beautiful.calendar)
-calendarwidget = wibox.widget.background()
-calendarwidget:set_widget(mytextcalendar)
-calendarwidget:set_bgimage(beautiful.widget_bg)
-lain.widgets.calendar.attach(calendarwidget, { fg = "#FFFFFF", position = "bottom_right" })
+mytextcalendar = wibox.widget.textclock(markup("#FFFFFF", space3 .. "%d %b " .. markup.font("Tamsyn 5", " ")))
+calendar_icon = wibox.widget.imagebox(beautiful.calendar)
+calbg = wibox.container.background(mytextcalendar, beautiful.bg_focus, shape.rectangle)
+calendarwidget = wibox.container.margin(calbg, 0, 0, 5, 5)
+lain.widgets.calendar.attach(calendarwidget, { fg = "#FFFFFF", position = "bottom_right", font = "Monospace", font_size = 9 })
 
 --[[ Mail IMAP check
 -- commented because it needs to be set before use
@@ -158,35 +163,27 @@ mailwidget = lain.widgets.imap({
 ]]
 
 -- MPD
-mpd_icon = wibox.widget.imagebox()
-mpd_icon:set_image(beautiful.mpd)
-prev_icon = wibox.widget.imagebox()
-prev_icon:set_image(beautiful.prev)
-next_icon = wibox.widget.imagebox()
-next_icon:set_image(beautiful.nex)
-stop_icon = wibox.widget.imagebox()
-stop_icon:set_image(beautiful.stop)
-pause_icon = wibox.widget.imagebox()
-pause_icon:set_image(beautiful.pause)
-play_pause_icon = wibox.widget.imagebox()
-play_pause_icon:set_image(beautiful.play)
-
+mpd_icon = wibox.widget.imagebox(beautiful.mpd)
+prev_icon = wibox.widget.imagebox(beautiful.prev)
+next_icon = wibox.widget.imagebox(beautiful.nex)
+stop_icon = wibox.widget.imagebox(beautiful.stop)
+pause_icon = wibox.widget.imagebox(beautiful.pause)
+play_pause_icon = wibox.widget.imagebox(beautiful.play)
 mpdwidget = lain.widgets.mpd({
     settings = function ()
         if mpd_now.state == "play" then
             mpd_now.artist = mpd_now.artist:upper():gsub("&.-;", string.lower)
             mpd_now.title = mpd_now.title:upper():gsub("&.-;", string.lower)
             widget:set_markup(markup.font("Tamsyn 4", " ")
-                              .. markup.font("Tamsyn 8",
-                              mpd_now.artist
+                              .. markup.font(beautiful.taglist_font,
+                              " " .. mpd_now.artist
                               .. " - " ..
-                              mpd_now.title
-                              .. markup.font("Tamsyn 10", " ")))
+                              mpd_now.title .. "  ") .. markup.font("Tamsyn 5", " "))
             play_pause_icon:set_image(beautiful.pause)
         elseif mpd_now.state == "pause" then
             widget:set_markup(markup.font("Tamsyn 4", " ") ..
-                              markup.font("Tamsyn 8", "MPD PAUSED") ..
-                              markup.font("Tamsyn 10", " "))
+                              markup.font(beautiful.taglist_font, " MPD PAUSED  ") ..
+                              markup.font("Tamsyn 5", " "))
             play_pause_icon:set_image(beautiful.play)
         else
             widget:set_markup("")
@@ -194,37 +191,37 @@ mpdwidget = lain.widgets.mpd({
         end
     end
 })
+musicbg = wibox.container.background(mpdwidget, beautiful.bg_focus, shape.rectangle)
+musicwidget = wibox.container.margin(musicbg, 0, 0, 5, 5)
 
-musicwidget = wibox.widget.background()
-musicwidget:set_widget(mpdwidget)
-musicwidget:set_bgimage(beautiful.widget_bg)
 musicwidget:buttons(awful.util.table.join(awful.button({ }, 1,
-function () awful.util.spawn_with_shell(musicplr) end)))
+function () awful.spawn.with_shell(musicplr) end)))
 mpd_icon:buttons(awful.util.table.join(awful.button({ }, 1,
-function () awful.util.spawn_with_shell(musicplr) end)))
+function () awful.spawn.with_shell(musicplr) end)))
 prev_icon:buttons(awful.util.table.join(awful.button({}, 1,
 function ()
-    awful.util.spawn_with_shell("mpc prev || ncmpc prev || pms prev")
+    awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
     mpdwidget.update()
 end)))
 next_icon:buttons(awful.util.table.join(awful.button({}, 1,
 function ()
-    awful.util.spawn_with_shell("mpc next || ncmpc next || pms next")
+    awful.spawn.with_shell("mpc next || ncmpc next || pms next")
     mpdwidget.update()
 end)))
 stop_icon:buttons(awful.util.table.join(awful.button({}, 1,
 function ()
     play_pause_icon:set_image(beautiful.play)
-    awful.util.spawn_with_shell("mpc stop || ncmpc stop || pms stop")
+    awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
     mpdwidget.update()
 end)))
 play_pause_icon:buttons(awful.util.table.join(awful.button({}, 1,
 function ()
-    awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
+    awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
     mpdwidget.update()
 end)))
 
 -- Battery
+--[[
 batwidget = lain.widgets.bat({
     settings = function()
         bat_header = " Bat "
@@ -235,70 +232,60 @@ batwidget = lain.widgets.bat({
         widget:set_markup(markup(blue, bat_header) .. bat_p)
     end
 })
+--]]
 
 -- ALSA volume bar
-myvolumebar = lain.widgets.alsabar({
-    card   = "0",
-    ticks  = true,
-    width  = 80,
-    height = 10,
+volume = lain.widgets.alsabar({
+    notifications = { font = "Monospace", font_size = 10 },
+    --togglechannel = "IEC958,3",
+    --[[
+    width = 75, height = 10, border_width = 0,
     colors = {
         background = "#383838",
         unmute     = "#80CCE6",
         mute       = "#FF9F9F"
     },
-    notifications = {
-        font      = "Tamsyn",
-        font_size = "12",
-        bar_size  = 32
-    }
+    --]]
 })
-alsamargin = wibox.layout.margin(myvolumebar.bar, 5, 8, 80)
-wibox.layout.margin.set_top(alsamargin, 12)
-wibox.layout.margin.set_bottom(alsamargin, 12)
-volumewidget = wibox.widget.background()
-volumewidget:set_widget(alsamargin)
-volumewidget:set_bgimage(beautiful.widget_bg)
+--[[
+volumemar = wibox.container.margin(volume.bar, 0, 0, 10, 10)
+volumewidget = wibox.container.background(volumemar, beautiful.bg_focus, shape.rectangle)
+volumewidget.shape_border_width = 5
+volumewidget.shape_border_color = beautiful.tasklist_bg_normal
+--]]
+
 
 -- CPU
+cpu_icon = wibox.widget.imagebox(beautiful.cpu)
 cpu_widget = lain.widgets.cpu({
     settings = function()
         widget:set_markup(space3 .. "CPU " .. cpu_now.usage
-                          .. "%" .. markup.font("Tamsyn 5", " "))
+                          .. "% " .. markup.font("Tamsyn 5", " "))
     end
 })
-cpuwidget = wibox.widget.background()
-cpuwidget:set_widget(cpu_widget)
-cpuwidget:set_bgimage(beautiful.widget_bg)
-cpu_icon = wibox.widget.imagebox()
-cpu_icon:set_image(beautiful.cpu)
+cpubg = wibox.container.background(cpu_widget, beautiful.bg_focus, shape.rectangle)
+cpuwidget = wibox.container.margin(cpubg, 0, 0, 5, 5)
 
 -- Net
-netdown_icon = wibox.widget.imagebox()
-netdown_icon:set_image(beautiful.net_down)
-netup_icon = wibox.widget.imagebox()
-netup_icon:set_image(beautiful.net_up)
+netdown_icon = wibox.widget.imagebox(beautiful.net_down)
+netup_icon = wibox.widget.imagebox(beautiful.net_up)
 netwidget = lain.widgets.net({
     settings = function()
         widget:set_markup(markup.font("Tamsyn 1", " ") .. net_now.received .. " - "
-                          .. net_now.sent .. space2)
+                          .. net_now.sent .. markup.font("Tamsyn 2", " "))
     end
 })
-networkwidget = wibox.widget.background()
-networkwidget:set_widget(netwidget)
-networkwidget:set_bgimage(beautiful.widget_bg)
+netbg = wibox.container.background(netwidget, beautiful.bg_focus, shape.rectangle)
+networkwidget = wibox.container.margin(netbg, 0, 0, 5, 5)
 
 -- Weather
 myweather = lain.widgets.weather({
+    notification_preset = { font = "Monospace 9" },
     city_id = 123456 -- placeholder
 })
 
 -- Separators
-first = wibox.widget.textbox('<span font="Tamsyn 4"> </span>')
-last = wibox.widget.imagebox()
-last:set_image(beautiful.last)
-spr = wibox.widget.imagebox()
-spr:set_image(beautiful.spr)
+first = wibox.widget.textbox('<span font="Tamsyn 7"> </span>')
 spr_small = wibox.widget.imagebox()
 spr_small:set_image(beautiful.spr_small)
 spr_very_small = wibox.widget.imagebox()
@@ -315,21 +302,24 @@ bottom_bar = wibox.widget.imagebox()
 bottom_bar:set_image(beautiful.bottom_bar)
 
 -- Create a wibox for each screen and add it
-mywibox = {}
-mybottomwibox = {}
-mypromptbox = {}
-mylayoutbox = {}
-mytaglist = {}
-mytaglist.buttons = awful.util.table.join(
-                    awful.button({ }, 1, awful.tag.viewonly),
-                    awful.button({ modkey }, 1, awful.client.movetotag),
+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, awful.client.toggletag),
-                    awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end),
-                    awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end)
-                    )
-mytasklist = {}
-mytasklist.buttons = awful.util.table.join(
+                    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)
+                )
+
+local tasklist_buttons = awful.util.table.join(
                      awful.button({ }, 1, function (c)
                                               if c == client.focus then
                                                   c.minimized = true
@@ -337,8 +327,8 @@ mytasklist.buttons = awful.util.table.join(
                                                   -- Without this, the following
                                                   -- :isvisible() makes no sense
                                                   c.minimized = false
-                                                  if not c:isvisible() then
-                                                      awful.tag.viewonly(c:tags()[1])
+                                                  if not c:isvisible() and c.first_tag then
+                                                      c.first_tag:view_only()
                                                   end
                                                   -- This will also un-minimize
                                                   -- the client, if needed
@@ -346,114 +336,133 @@ mytasklist.buttons = awful.util.table.join(
                                                   c:raise()
                                               end
                                           end),
-                     awful.button({ }, 3, function ()
-                                              if instance then
-                                                  instance:hide()
-                                                  instance = nil
-                                              else
-                                                  instance = awful.menu.clients({ width=250 })
-                                              end
-                                          end),
+                     awful.button({ }, 3, client_menu_toggle_fn()),
                      awful.button({ }, 4, function ()
                                               awful.client.focus.byidx(1)
-                                              if client.focus then client.focus:raise() end
                                           end),
                      awful.button({ }, 5, function ()
                                               awful.client.focus.byidx(-1)
-                                              if client.focus then client.focus:raise() end
                                           end))
 
-for s = 1, screen.count() do
+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.maximized(wallpaper, s, true)
+    end
+end
+
+local barcolor  = gears.color({
+    type  = "linear",
+    from  = { 32, 0 },
+    to    = { 32, 32 },
+    stops = { {0, beautiful.bg_focus }, {0.25, "#505050"}, {1, beautiful.bg_focus} }
+})
+
+-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
+screen.connect_signal("property::geometry", set_wallpaper)
+
+awful.screen.connect_for_each_screen(function(s)
+    -- Wallpaper
+    set_wallpaper(s)
+
+    awful.tag({ " WEB ", " TERMINAL ", " FILES ", " OTHER " }, s, {
+        awful.layout.suit.floating,
+        awful.layout.suit.fair,
+        awful.layout.suit.tile,
+        awful.layout.suit.tile.left,
+        awful.layout.suit.tile.top,
+    })
+
     -- Create a promptbox for each screen
-    mypromptbox[s] = awful.widget.prompt()
+    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.
-    mylayoutbox[s] = awful.widget.layoutbox(s)
-    mylayoutbox[s]:buttons(awful.util.table.join(
-                           awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end),
-                           awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end),
-                           awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
-                           awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
+    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
-    mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons)
+    s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons, {bg_focus = barcolor})
+
+    mytaglistcont = wibox.container.background(s.mytaglist, beautiful.bg_focus, shape.rectangle)
+    s.mytag = wibox.container.margin(mytaglistcont, 0, 0, 5, 5)
 
     -- Create a tasklist widget
-    mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons)
+    s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons, { bg_focus = beautiful.bg_focus, shape = shape.rectangle, shape_border_width = 5, shape_border_color = beautiful.tasklist_bg_normal, align = "center" })
 
     -- Create the wibox
-    mywibox[s] = awful.wibox({ position = "top", screen = s, height = 32 })
+    s.mywibox = awful.wibar({ position = "top", screen = s, height = 32 })
 
-    -- Widgets that are aligned to the upper left
-    local left_layout = wibox.layout.fixed.horizontal()
-    left_layout:add(first)
-    left_layout:add(mytaglist[s])
-    left_layout:add(spr_small)
-    left_layout:add(mylayoutbox[s])
-    left_layout:add(mypromptbox[s])
-
-    -- Widgets that are aligned to the upper right
-    local right_layout = wibox.layout.fixed.horizontal()
-    if s == 1 then right_layout:add(wibox.widget.systray()) end
-    --right_layout:add(mailwidget)
-    right_layout:add(batwidget)
-    right_layout:add(spr_right)
-    right_layout:add(prev_icon)
-    right_layout:add(next_icon)
-    right_layout:add(stop_icon)
-    right_layout:add(play_pause_icon)
-    right_layout:add(bar)
-    right_layout:add(mpd_icon)
-    right_layout:add(musicwidget)
-    right_layout:add(bar)
-    right_layout:add(spr_very_small)
-    right_layout:add(volumewidget)
-    right_layout:add(spr_left)
-
-    -- Now bring it all together (with the tasklist in the middle)
-    local layout = wibox.layout.align.horizontal()
-    layout:set_left(left_layout)
-    layout:set_right(right_layout)
-
-    mywibox[s]:set_widget(layout)
+    -- Add widgets to the wibox
+    s.mywibox:setup {
+        layout = wibox.layout.align.horizontal,
+        { -- Left widgets
+            layout = wibox.layout.fixed.horizontal,
+            first,
+            s.mytag,
+            spr_small,
+            s.mylayoutbox,
+            spr_small,
+            s.mypromptbox,
+        },
+        nil, -- Middle widget
+        { -- Right widgets
+            layout = wibox.layout.fixed.horizontal,
+            wibox.widget.systray(),
+            --mailwidget,
+            --batwidget,
+            spr_right,
+            musicwidget,
+            bar,
+            prev_icon,
+            next_icon,
+            stop_icon,
+            play_pause_icon,
+            bar,
+            mpd_icon,
+            --bar,
+            --spr_very_small,
+            --volumewidget,
+            spr_left,
+        },
+    }
 
     -- Create the bottom wibox
-    mybottomwibox[s] = awful.wibox({ position = "bottom", screen = s, border_width = 0, height = 32 })
+    s.mybottomwibox = awful.wibar({ position = "bottom", screen = s, border_width = 0, height = 32 })
 
-    -- Widgets that are aligned to the bottom left
-    bottom_left_layout = wibox.layout.fixed.horizontal()
-    bottom_left_layout:add(mylauncher)
-
-    -- Widgets that are aligned to the bottom right
-    bottom_right_layout = wibox.layout.fixed.horizontal()
-    bottom_right_layout:add(spr_bottom_right)
-    bottom_right_layout:add(netdown_icon)
-    bottom_right_layout:add(networkwidget)
-    bottom_right_layout:add(netup_icon)
-    bottom_right_layout:add(bottom_bar)
-    bottom_right_layout:add(cpu_icon)
-    bottom_right_layout:add(cpuwidget)
-    bottom_right_layout:add(bottom_bar)
-    bottom_right_layout:add(calendar_icon)
-    bottom_right_layout:add(calendarwidget)
-    bottom_right_layout:add(bottom_bar)
-    bottom_right_layout:add(clock_icon)
-    bottom_right_layout:add(clockwidget)
-    bottom_right_layout:add(last)
-
-    -- Now bring it all together (with the tasklist in the middle)
-    bottom_layout = wibox.layout.align.horizontal()
-    bottom_layout:set_left(bottom_left_layout)
-    bottom_layout:set_middle(mytasklist[s])
-    bottom_layout:set_right(bottom_right_layout)
-    mybottomwibox[s]:set_widget(bottom_layout)
-
-    -- Set proper backgrounds, instead of beautiful.bg_normal
-    mywibox[s]:set_bg(beautiful.topbar_path .. math.floor((screen[mouse.screen].workarea.width)) .. ".png")
-    mybottomwibox[s]:set_bg("#242424")
-
-    -- Create a borderbox above the bottomwibox
-    lain.widgets.borderbox(mybottomwibox[s], s, { position = "top", color = "#0099CC" } )
-end
+    -- Add widgets to the bottom wibox
+    s.mybottomwibox:setup {
+        layout = wibox.layout.align.horizontal,
+        { -- Left widgets
+            layout = wibox.layout.fixed.horizontal,
+            mylauncher,
+        },
+        s.mytasklist, -- Middle widget
+        { -- Right widgets
+            layout = wibox.layout.fixed.horizontal,
+            spr_bottom_right,
+            netdown_icon,
+            networkwidget,
+            netup_icon,
+            bottom_bar,
+            cpu_icon,
+            cpuwidget,
+            bottom_bar,
+            calendar_icon,
+            calendarwidget,
+            bottom_bar,
+            clock_icon,
+            clockwidget,
+        },
+    }
+end)
 -- }}}
 
 -- {{{ Mouse bindings
@@ -470,26 +479,36 @@ globalkeys = awful.util.table.join(
     -- https://github.com/copycat-killer/dots/blob/master/bin/screenshot
     awful.key({ altkey }, "p", function() os.execute("screenshot") end),
 
+    -- Hotkeys
+    awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
+              {description="show help", group="awesome"}),
     -- Tag browsing
-    awful.key({ modkey }, "Left",   awful.tag.viewprev       ),
-    awful.key({ modkey }, "Right",  awful.tag.viewnext       ),
-    awful.key({ modkey }, "Escape", awful.tag.history.restore),
+    awful.key({ modkey,           }, "Left",   awful.tag.viewprev,
+              {description = "view previous", group = "tag"}),
+    awful.key({ modkey,           }, "Right",  awful.tag.viewnext,
+              {description = "view next", group = "tag"}),
+    awful.key({ modkey,           }, "Escape", awful.tag.history.restore,
+              {description = "go back", group = "tag"}),
 
     -- Non-empty tag browsing
-    awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end),
-    awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end),
+    awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end,
+              {description = "view  previous nonempty", group = "tag"}),
+    awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end,
+              {description = "view  previous nonempty", group = "tag"}),
 
     -- Default client focus
-    awful.key({ altkey }, "k",
+    awful.key({ altkey,           }, "j",
         function ()
             awful.client.focus.byidx( 1)
-            if client.focus then client.focus:raise() end
-        end),
-    awful.key({ altkey }, "j",
+        end,
+        {description = "focus next by index", group = "client"}
+    ),
+    awful.key({ altkey,           }, "k",
         function ()
             awful.client.focus.byidx(-1)
-            if client.focus then client.focus:raise() end
-        end),
+        end,
+        {description = "focus previous by index", group = "client"}
+    ),
 
     -- By direction client focus
     awful.key({ modkey }, "j",
@@ -512,50 +531,79 @@ globalkeys = awful.util.table.join(
             awful.client.focus.bydirection("right")
             if client.focus then client.focus:raise() end
         end),
-
-    -- Show Menu
-    awful.key({ modkey }, "w",
-        function ()
-            mymainmenu:show({ keygrabber = true })
-        end),
-
-    -- Show/Hide Wibox
-    awful.key({ modkey }, "b", function ()
-        mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible
-        mybottomwibox[mouse.screen].visible = not mybottomwibox[mouse.screen].visible
-    end),
-
-    -- On the fly useless gaps change
-    awful.key({ altkey, "Control" }, "+", function () lain.util.useless_gaps_resize(1) end),
-    awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) end),
+    awful.key({ modkey,           }, "w", function () mymainmenu:show() end,
+              {description = "show main menu", group = "awesome"}),
 
     -- Layout manipulation
-    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end),
-    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end),
-    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end),
-    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end),
-    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto),
+    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,           }, "u", awful.client.urgent.jumpto,
+              {description = "jump to urgent client", group = "client"}),
     awful.key({ modkey,           }, "Tab",
         function ()
             awful.client.focus.history.previous()
             if client.focus then
                 client.focus:raise()
             end
-        end),
-    awful.key({ altkey, "Shift"   }, "l",      function () awful.tag.incmwfact( 0.05)     end),
-    awful.key({ altkey, "Shift"   }, "h",      function () awful.tag.incmwfact(-0.05)     end),
-    awful.key({ modkey, "Shift"   }, "l",      function () awful.tag.incnmaster(-1)       end),
-    awful.key({ modkey, "Shift"   }, "h",      function () awful.tag.incnmaster( 1)       end),
-    awful.key({ modkey, "Control" }, "l",      function () awful.tag.incncol(-1)          end),
-    awful.key({ modkey, "Control" }, "h",      function () awful.tag.incncol( 1)          end),
-    awful.key({ modkey,           }, "space",  function () awful.layout.inc(layouts,  1)  end),
-    awful.key({ modkey, "Shift"   }, "space",  function () awful.layout.inc(layouts, -1)  end),
-    awful.key({ modkey, "Control" }, "n",      awful.client.restore),
+        end,
+        {description = "go back", group = "client"}),
+
+    -- Show/Hide Wibox
+    awful.key({ modkey }, "b", function ()
+        for s in screen do
+            s.mywibox.visible       = not s.mywibox.visible
+            s.mybottomwibox.visible = not s.mybottomwibox.visible
+        end
+    end),
+
+    -- On the fly useless gaps change
+    awful.key({ altkey, "Control" }, "+", function () lain.util.useless_gaps_resize(1) end),
+    awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) end),
+
+    -- Rename tag
+    awful.key({ altkey, "Shift"   }, "r", function () lain.util.rename_tag() end),
 
     -- Standard program
-    awful.key({ modkey,           }, "Return", function () awful.util.spawn(terminal) end),
-    awful.key({ modkey, "Control" }, "r",      awesome.restart),
-    awful.key({ modkey, "Shift"   }, "q",      awesome.quit),
+    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, "Shift"   }, "q", awesome.quit,
+              {description = "quit awesome", group = "awesome"}),
+
+    awful.key({ altkey, "Shift"   }, "l",     function () awful.tag.incmwfact( 0.05)          end,
+              {description = "increase master width factor", group = "layout"}),
+    awful.key({ altkey, "Shift"   }, "h",     function () awful.tag.incmwfact(-0.05)          end,
+              {description = "decrease master width factor", group = "layout"}),
+    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1, nil, true) end,
+              {description = "increase the number of master clients", group = "layout"}),
+    awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1, nil, true) end,
+              {description = "decrease the number of master clients", group = "layout"}),
+    awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1, nil, true)    end,
+              {description = "increase the number of columns", group = "layout"}),
+    awful.key({ modkey, "Control" }, "l",     function () awful.tag.incncol(-1, nil, true)    end,
+              {description = "decrease the number of columns", group = "layout"}),
+    awful.key({ modkey,           }, "space", function () awful.layout.inc( 1)                end,
+              {description = "select next", group = "layout"}),
+    awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(-1)                end,
+              {description = "select previous", group = "layout"}),
+
+    awful.key({ modkey, "Control" }, "n",
+              function ()
+                  local c = awful.client.restore()
+                  -- Focus restored client
+                  if c then
+                      client.focus = c
+                      c:raise()
+                  end
+              end,
+              {description = "restore minimized", group = "client"}),
 
     -- Dropdown terminal
     awful.key({ modkey,	          }, "z",      function () quakeconsole[mouse.screen]:toggle() end),
@@ -567,140 +615,171 @@ globalkeys = awful.util.table.join(
     -- ALSA volume control
     awful.key({ altkey }, "Up",
         function ()
-            os.execute(string.format("amixer set %s %s+", myvolumebar.channel, myvolumebar.step))
-            myvolumebar.update()
+            os.execute(string.format("amixer set %s 1%%+", volume.channel))
+            volume.notify()
         end),
     awful.key({ altkey }, "Down",
         function ()
-            os.execute(string.format("amixer set %s %s-", myvolumebar.channel, myvolumebar.step))
-            myvolumebar.update()
+            os.execute(string.format("amixer set %s 1%%-", volume.channel))
+            volume.notify()
         end),
     awful.key({ altkey }, "m",
         function ()
-            os.execute(string.format("amixer set %s toggle", myvolumebar.channel))
-            myvolumebar.update()
+            os.execute(string.format("amixer set %s toggle", volume.togglechannel or volume.channel))
+            volume.notify()
         end),
     awful.key({ altkey, "Control" }, "m",
         function ()
-            os.execute(string.format("amixer set %s 100%%", myvolumebar.channel))
-            myvolumebar.update()
+            os.execute(string.format("amixer set %s 100%%", volume.channel))
+            volume.notify()
         end),
 
+		awful.key({ altkey, "Control" }, "0",
+				function ()
+						os.execute(string.format("amixer -q set %s 0%%", volume.channel))
+						volume.notify()
+				end),
+
     -- MPD control
     awful.key({ altkey, "Control" }, "Up",
         function ()
-            awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
+            awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
             mpdwidget.update()
         end),
     awful.key({ altkey, "Control" }, "Down",
         function ()
-            awful.util.spawn_with_shell("mpc stop || ncmpc stop || pms stop")
+            awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
             mpdwidget.update()
         end),
     awful.key({ altkey, "Control" }, "Left",
         function ()
-            awful.util.spawn_with_shell("mpc prev || ncmpc prev || pms prev")
+            awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
             mpdwidget.update()
         end),
     awful.key({ altkey, "Control" }, "Right",
         function ()
-            awful.util.spawn_with_shell("mpc next || ncmpc next || pms next")
+            awful.spawn.with_shell("mpc next || ncmpc next || pms next")
             mpdwidget.update()
         end),
+    --]]
 
-    -- Copy to clipboard
-    awful.key({ modkey }, "c", function () os.execute("xsel -p -o | xsel -i -b") end),
+    -- Copy primary to clipboard
+    awful.key({ modkey }, "c", function () os.execute("xsel | xsel -b") end),
 
     -- User programs
-    awful.key({ modkey }, "q", function () awful.util.spawn(browser) end),
-    awful.key({ modkey }, "s", function () awful.util.spawn(gui_editor) end),
-    awful.key({ modkey }, "g", function () awful.util.spawn(graphics) end),
+    awful.key({ modkey }, "q", function () awful.spawn(browser) end),
+    awful.key({ modkey }, "e", function () awful.spawn(gui_editor) end),
+    awful.key({ modkey }, "g", function () awful.spawn(graphics) end),
 
-    --[[ Default
+    -- Default
     -- Prompt
-    awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
+    awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end,
+              {description = "run prompt", group = "launcher"}),
 
     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)
+    awful.key({ modkey }, "p", function() menubar.show() end,
+              {description = "show the menubar", group = "launcher"})
     --]]
 
-    -- dmenu
+    --[[ dmenu
     awful.key({ modkey }, "x", function ()
-        awful.util.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'",
-        beautiful.bg_normal, beautiful.fg_normal, beautiful.bg_focus, beautiful.fg_focus))
+        awful.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'",
+        beautiful.bg_normal, beautiful.fg_normal, beautiful.bg_focus, beautiful.fg_focus)),
 		end)
+    --]]
 )
 
 clientkeys = awful.util.table.join(
-    awful.key({ modkey,           }, "f",      function (c) c.fullscreen = not c.fullscreen  end),
-    awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end),
-    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ),
-    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
-    awful.key({ modkey,           }, "o",      awful.client.movetoscreen                        ),
-    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end),
+    awful.key({ altkey, "Shift"   }, "m",      lain.util.magnify_client                         ),
+    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, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
+              {description = "move to master", group = "client"}),
+    awful.key({ modkey,           }, "o",      function (c) c:move_to_screen()               end,
+              {description = "move to screen", group = "client"}),
+    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end,
+              {description = "toggle keep on top", 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),
+        end ,
+        {description = "minimize", group = "client"}),
     awful.key({ modkey,           }, "m",
         function (c)
-            c.maximized_horizontal = not c.maximized_horizontal
-            c.maximized_vertical   = not c.maximized_vertical
-        end)
+            c.maximized = not c.maximized
+            c:raise()
+        end ,
+        {description = "maximize", group = "client"})
 )
 
 -- Bind all key numbers to tags.
--- be careful: we use keycodes to make it works on any keyboard layout.
+-- 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, 9 do
     globalkeys = awful.util.table.join(globalkeys,
         -- View tag only.
         awful.key({ modkey }, "#" .. i + 9,
                   function ()
-                        local screen = mouse.screen
-                        local tag = awful.tag.gettags(screen)[i]
+                        local screen = awful.screen.focused()
+                        local tag = screen.tags[i]
                         if tag then
-                           awful.tag.viewonly(tag)
+                           tag:view_only()
                         end
-                  end),
-        -- Toggle tag.
+                  end,
+                  {description = "view tag #"..i, group = "tag"}),
+        -- Toggle tag display.
         awful.key({ modkey, "Control" }, "#" .. i + 9,
                   function ()
-                      local screen = mouse.screen
-                      local tag = awful.tag.gettags(screen)[i]
+                      local screen = awful.screen.focused()
+                      local tag = screen.tags[i]
                       if tag then
                          awful.tag.viewtoggle(tag)
                       end
-                  end),
+                  end,
+                  {description = "toggle tag #" .. i, group = "tag"}),
         -- Move client to tag.
         awful.key({ modkey, "Shift" }, "#" .. i + 9,
                   function ()
                       if client.focus then
-                          local tag = awful.tag.gettags(client.focus.screen)[i]
+                          local tag = client.focus.screen.tags[i]
                           if tag then
-                              awful.client.movetotag(tag)
+                              client.focus:move_to_tag(tag)
                           end
                      end
-                  end),
-        -- Toggle tag.
+                  end,
+                  {description = "move focused client to tag #"..i, group = "tag"}),
+        -- Toggle tag on focused client.
         awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
                   function ()
                       if client.focus then
-                          local tag = awful.tag.gettags(client.focus.screen)[i]
+                          local tag = client.focus.screen.tags[i]
                           if tag then
-                              awful.client.toggletag(tag)
+                              client.focus:toggle_tag(tag)
                           end
                       end
-                  end))
+                  end,
+                  {description = "toggle focused client on tag #" .. i, group = "tag"})
+    )
 end
 
 clientbuttons = awful.util.table.join(
@@ -713,6 +792,7 @@ root.keys(globalkeys)
 -- }}}
 
 -- {{{ Rules
+-- Rules to apply to new clients (through the "manage" signal).
 awful.rules.rules = {
     -- All clients will match this rule.
     { rule = { },
@@ -722,15 +802,19 @@ awful.rules.rules = {
                      raise = true,
                      keys = clientkeys,
                      buttons = clientbuttons,
-	                   size_hints_honor = false } },
+                     screen = awful.screen.preferred,
+                     placement = awful.placement.no_overlap+awful.placement.no_offscreen,
+                     size_hints_honor = false
+     }
+    },
+
+    -- Titlebars
+    { rule_any = { type = { "dialog", "normal" } },
+      properties = { titlebars_enabled = false } },
+
+    -- Set Firefox to always map on the first tag on screen 1.
     { rule = { class = "Firefox" },
-          properties = { tag = tags[1][1] } },
-
-    { rule = { instance = "plugin-container" },
-          properties = { tag = tags[1][1] } },
-
-	  { rule = { class = "Gimp" },
-     	    properties = { tag = tags[1][4] } },
+      properties = { screen = 1, tag = awful.screen.focused().tags[1] } },
 
     { rule = { class = "Gimp", role = "gimp-image-window" },
           properties = { maximized_horizontal = true,
@@ -740,65 +824,77 @@ awful.rules.rules = {
 
 -- {{{ Signals
 -- Signal function to execute when a new client appears.
-local sloppyfocus_last = {c=nil}
-client.connect_signal("manage", function (c, startup)
-    -- Enable sloppy focus
-    client.connect_signal("mouse::enter", function(c)
-         if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
-            and awful.client.focus.filter(c) then
-             -- Skip focusing the client if the mouse wasn't moved.
-             if c ~= sloppyfocus_last.c then
-                 client.focus = c
-                 sloppyfocus_last.c = c
-             end
-         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
 
-    local titlebars_enabled = false
-    if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then
-        -- buttons for the titlebar
-        local buttons = awful.util.table.join(
-                awful.button({ }, 1, function()
-                    client.focus = c
-                    c:raise()
-                    awful.mouse.client.move(c)
-                end),
-                awful.button({ }, 3, function()
-                    client.focus = c
-                    c:raise()
-                    awful.mouse.client.resize(c)
-                end)
-                )
-
-        -- Widgets that are aligned to the right
-        local right_layout = wibox.layout.fixed.horizontal()
-        right_layout:add(awful.titlebar.widget.floatingbutton(c))
-        right_layout:add(awful.titlebar.widget.maximizedbutton(c))
-        right_layout:add(awful.titlebar.widget.stickybutton(c))
-        right_layout:add(awful.titlebar.widget.ontopbutton(c))
-        right_layout:add(awful.titlebar.widget.closebutton(c))
-
-        -- The title goes in the middle
-        local middle_layout = wibox.layout.flex.horizontal()
-        local title = awful.titlebar.widget.titlewidget(c)
-        title:set_align("center")
-        middle_layout:add(title)
-        middle_layout:buttons(buttons)
-
-        -- Now bring it all together
-        local layout = wibox.layout.align.horizontal()
-        layout:set_right(right_layout)
-        layout:set_middle(middle_layout)
-
-        awful.titlebar(c,{size=16}):set_widget(layout)
+    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)
 
--- No border for maximized or single clients
+-- Add a titlebar if titlebars_enabled is set to true in the rules.
+client.connect_signal("request::titlebars", function(c)
+    -- buttons for the titlebar
+    local buttons = awful.util.table.join(
+        awful.button({ }, 1, function()
+            client.focus = c
+            c:raise()
+            awful.mouse.client.move(c)
+        end),
+        awful.button({ }, 3, function()
+            client.focus = c
+            c:raise()
+            awful.mouse.client.resize(c)
+        end)
+    )
+
+    awful.titlebar(c, {size = 16}) : setup {
+        { -- Left
+            awful.titlebar.widget.iconwidget(c),
+            buttons = buttons,
+            layout  = wibox.layout.fixed.horizontal
+        },
+        { -- Middle
+            { -- Title
+                align  = "center",
+                widget = awful.titlebar.widget.titlewidget(c)
+            },
+            buttons = buttons,
+            layout  = wibox.layout.flex.horizontal
+        },
+        { -- Right
+            awful.titlebar.widget.floatingbutton (c),
+            awful.titlebar.widget.maximizedbutton(c),
+            awful.titlebar.widget.stickybutton   (c),
+            awful.titlebar.widget.ontopbutton    (c),
+            awful.titlebar.widget.closebutton    (c),
+            layout = wibox.layout.fixed.horizontal()
+        },
+        layout = wibox.layout.align.horizontal
+    }
+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)
+]]
+
+-- No border for maximized clients
 client.connect_signal("focus",
     function(c)
         if c.maximized_horizontal == true and c.maximized_vertical == true then
             c.border_width = 0
+        -- no borders if only 1 client visible
         elseif #awful.client.visible(mouse.screen) > 1 then
             c.border_width = beautiful.border_width
             c.border_color = beautiful.border_focus
@@ -806,20 +902,3 @@ client.connect_signal("focus",
     end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 -- }}}
-
--- {{{ Arrange signal handler
-for s = 1, screen.count() do screen[s]:connect_signal("arrange",
-    function ()
-        local clients = awful.client.visible(s)
-        local layout  = awful.layout.getname(awful.layout.get(s))
-
-        if #clients > 0 then
-            for _, c in pairs(clients) do -- Floaters always have borders
-                if awful.client.floating.get(c) or layout == "floating" then
-                    c.border_width = beautiful.border_width
-                end
-            end
-        end
-    end)
-end
--- }}}
diff --git a/rc.lua.multicolor b/rc.lua.multicolor
index d1144c7..5a04e2d 100644
--- a/rc.lua.multicolor
+++ b/rc.lua.multicolor
@@ -649,17 +649,22 @@ globalkeys = awful.util.table.join(
 
     --[[ Default
     -- Prompt
-    awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end),
+    awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end,
+              {description = "run prompt", group = "launcher"}),
 
     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)
+    awful.key({ modkey }, "p", function() menubar.show() end,
+              {description = "show the menubar", group = "launcher"})
     --]]
 
     -- dmenu
diff --git a/themes/holo/icons/awesome_icon_white.png b/themes/holo/icons/awesome_icon_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..476a86a766175c9047816334188017f1245a466a
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|wj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&pI+kxPJ6V(v_B8=#Prr;B5V#p&cf|NsB5XVYR(W7BF(
z%n?}J*vRN9b#A_WziE+#dvb3b+r|W86BCmZ71L`H|0Xl=@bDC@lJ7OOl44=_uNjhL
TGBscx&@={5S3j3^P6<r_aXT>h

literal 0
HcmV?d00001

diff --git a/themes/holo/icons/bar.png b/themes/holo/icons/bar.png
index 023f1988e7311ce635ac134f672e29ba6025f6c7..767885cfdcd09ab95d54ff32e0443fe63526b875 100644
GIT binary patch
delta 39
tcmbQpxR`N*3O`$tx4R3&e-K=-clqRrigH{J8My>?<ytPV&Y0-w0RR$S4gmlF

delta 47
zcmZ3?IFWIJiYjM;M`SSr1Gg{;GcwGYBf-GHz+U3%>&kwYgHe!CN?5g{b7Hgy0O|e;
A6aWAK

diff --git a/themes/holo/icons/base_widget.png b/themes/holo/icons/base_widget.png
deleted file mode 100644
index 059f9c0ecece7ba9ed51de802bcebd9f321eb1b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^VnD3G!3JVY@8||noCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#E(fE4Dbucno$^2-T~8Os5Rc=@2@<T%Vg^zY5`UJr9`xB#^l`<(#ccgjHd!CQ
g43TE{g92;}vrQRy8=VXR8p^=n>FVdQ&MBb@04%p8YXATM

diff --git a/themes/holo/icons/bg_focus.png b/themes/holo/icons/bg_focus.png
deleted file mode 100644
index 28673a1bcf23616506a8cdf9bc9a83b29d5783b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1229
zcmeAS@N?(olHy`uVBq!ia0y~yU~d4j6*$;{<Y&p$Wk8B8$=lt9;Xep2*t>i(P=vF<
zBeIx*fm;}a85w5HkpK#^mw5WRvft$p5>>QJOz!={z`zpa>EaktaqI1!=%Pm!A`AhM
zW|98etgC0Swl=)|xocf^qQc8rFV$uhuL@%PbLq2}$5fuzyTpJ-fk559RU8l&!><Hp
zkOe@nK-jE-5yG@eL<k=K{rmSSs1k-cyLv_*h?)zW(gz?chPfMth~SK4g*vZyO)HJ{
z)=d5V_lyBgYV36*p2OevUEB40jjjE<m0R!0L{CdCkFD;noHu`2ZsfGLr8bYN_R8JU
zU;Z%gU$xHsLYeL9vFoqTHhKCue&>3d|Nm_4v!<Wklym&?uhUP9D)wJ~xn-*7JO09Z
zCce8%wmvP=w=b-{v-)qRoyGajdgp)IO>9q%+*Z|-{MqLHJmIH7*}8`fro8^TYxU%9
zIgdA6=)cl=C;wFFW%lPer~kj0Q~lOpx}(kRwX5eGf4^;d=B#Zcy^kaGrl0=yX4~DK
z#}U&~Z=N!;U)(!8&~4}5D^aI6=`6jr>+ccU+uLqDQ{3LY_}^q#=@TzIYo6K7IGrPN
ze68;jv+X*k!_s%2-JUA-{Mg<{pBL|#@Ok?2$%zu%zSz7z@BVbcZx`#lr@x>5yY%h*
z{0nLOrLPy?efD~>U9o&d@{##nPaj*nd$mb6{oT>e>BY0=JnN|4`S<Vi<af7k-_|qR
zzW@Hcd)vNWfBp5@J@=0`cHKLK-Y>4X^+WLZ<5`)r@;;dW17Lmb?;n5u+?iUuuKP~>
zr;kBimh;c=wsF}x&u{r!{(sVM)h|tc{P1Fo!n~=EYtMxrd1oVjB2)VK#w$_f$?10b
zx5D+BYvQc0ZU6kn<Ne-G8NXex{C-+=^XQ3;;L1Ha&DZa~e(c|un6E4L+pk)EEpT3)
zY5ZlAyJrp-?JKI!eBRKXRNCiS$zwHZzie+{ZhiO0rM<5UeXsmqyz%jh`R-9leNQTG
zE&IBHcTd%?eMaFug-@+>zg&zld=&I<^~86Jt<JqXcf9_)j8+`~;Q(M1Tz>Ah@7-Gd
zCw2nQ?V=~2c>6+hpZE5+8~)BKFxkFSe12T!-Um~YJ}j<rwLkm#*TtG0bL(xRrMq`V
zUy1*+*CYR3xaB{e%UjNF|MY#y3;w{ow=!n+;<i%Xv)A69qj_rowWxE?Kl{Gv{+YUV
zYfVkfl+Qo^?2kUa`CR7Q%T~)v{a(+xX1TUF>iM6krRNs@`TG638#Es>#LcQ_<b`I>
r&WEf2GciFp4cDLPW6RrEGyH#s!!tEHYlK@jf;4-&`njxgN@xNAw*woj

diff --git a/themes/holo/icons/bg_focus_noline.png b/themes/holo/icons/bg_focus_noline.png
deleted file mode 100644
index a867946a41142b16c2b66715777b8fc001306e54..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 462
zcmeAS@N?(olHy`uVBq!ia0y~yU~d4j6*$;{<Y&p$Wk8B8$=lt9;Xep2*t>i(P=vF<
zBeIx*fm;}a85w5HkpK#^mw5WRvft&9=M`3-sK@n+fq^mF)5S5Q;?~>Sj)Dga7!GeJ
z?Km|*rY+fy(`nznIl25mO(5|9`z#29VSyt9$X+1m5NKe8u#{L5AdH5N;`ehUA#8?!
z=b1rv0)c`PK0O?aLqXZ2oXt!S-#9d|8$ekt3_K8)fFc7kgyq6<0K#Aplo#e?Kkh5F
Q+z2G#>FVdQ&MBb@0Qap!+yDRo

diff --git a/themes/holo/icons/bottom_bar.png b/themes/holo/icons/bottom_bar.png
index 0f6b809ae135b647468f20bf8302d08dc4333561..fa6a7aec31e8b7d3af56b4eb2bb079214609ad99 100644
GIT binary patch
delta 20
ccmdnWxRr52AlE}iE<ru5KF>w(CPqgA07xANS^xk5

delta 20
bcmdnWxRr52AlF?ECT?qkcgA9Q6QiR5MXm;*

diff --git a/themes/holo/icons/last.png b/themes/holo/icons/last.png
deleted file mode 100644
index 33a4b96294b87c23fcc448ba50557b071860aba6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^+(4|r!3HFc9B;Y|q&N#aB8!3I!XV7ZFl&wkP>{XE
z)7O>#E(fC!Cx;gE*$F@)Lr)jS5R22vAwfaE&O4|iBq=cR2p!d_si~<Dt@-sO)1$f|
n<l~A*f~#k+T7Ktq=VxMg=fz$xasI9&P&0$4tDnm{r-UW|GOs5|

diff --git a/themes/holo/icons/mail_notify.png b/themes/holo/icons/mail_notify.png
deleted file mode 100644
index 3816f53057582c774ab20e87baa21ad966c47ff7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1554
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsViyz`(-7#MsQ#$-vFf(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1POzUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1=
zG!Lpb1-DyFaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zo+r8a4+8^Ji>HfY
zNX4x;v-W0-I7+mae}8vorpK18hP}5`*c?3+HUDJ&VUt$ec<EaGfm3SrE($C@f>+#J
z1O$(CaCEjR_9}>padvS16nI~>vwQl<_pR{>5#P*a-+XgUc4lLHv+lQh>Gy7yKf7xk
zulcm}6UQDtdA|dkOJrQ@?AU4(E<5qqX*7C%I2n?_!PBrywb7_zvKq7K2XPY}&MUtA
ztuN#yRsYCj;cL|MR${#{H!ML$r$BdFvCzZ=)egKqjpyAmFZT%rajt6$w7bxi9h@q#
z!{?G#1^2wB_s3rMF{vL&I;K?EDF4hT%1m^^?7wXOJEoLO6ufZ$>9#}#A@LnG$4v|7
zpMKGrDLM6gbb`d0hRm)#OzRK27Vyux-P|Gf<8;6S_XDK`>~j(Y4NraOJ0SL*iSr#B
z^EKCd6SX;A%DDfS?cnxn{=esVSQMkb@JgvJ7EWgSqsrc?_TLsHb-z|qn%dGBzS-hT
zrKYQ1L;Qp2xJGr+4&h4vd5x7H6yG2Ct|g#aBpk!G`GKXyxu;XSA1q@ERGQTLdCg0$
z^#?9<y-+gkGBL6!OVL}<y<^@F2lKCQEjHHLO#8#~dhRqv%P9YXaCx6ejSbsaz4sO<
zKJp1kn=hauxMH)+ttxHB&^3~~?x|>X9#A&>x-BlW`^bC~{*RNi7yq_ibt~&e#&e@8
zu{kN}+l)oz9|+Cw^{#pOpk1xb*YC)_r|}ub4lsYvFNxjg7^JiEVdpftU#q`d-Da$C
z{@(PCUabdfyet16R9%|B;K=KFZ+W)ds;;^*PmY=YV9XIa#m4+w=Nya|{i{}7*(UyZ
zx9je(g-(|w?iSwS++r8?rD^f*x1n!u@t-*MZQ}aOuq5BR@w{^ygkQYbsC$4xy64!;
TJ=2(HfJ$jkS3j3^P6<r_JX%4*

diff --git a/themes/holo/icons/mpd.png b/themes/holo/icons/mpd.png
index 6a96cee966efd7f567fab18c1e008da4a35122ca..c61030b0db34646d6c7449a843040c8596331383 100644
GIT binary patch
delta 391
zcmV;20eJqR1FQofiBL{Q4GJ0x0000DNk~Le0000R0000W2nGNE0OM%`JCPwUf8hZN
z5+y4b{PpSp00B8kL_t(Y$L*Feii1!PhJRNhA$R~=t3aCAm_`U*Kx{mLjUuGAvDwlC
zBnJq&f|4R_ij=uRK*UaMd<u%&Ed<;|h=eS>znmH7<IS6SZ<wy@@GgDfjiRto#K^MT
z(K1rlN5HtDfwS2RuIs`u3<!b%e?kb3$0N4eEwU^dl!FyT@%vfObUH;41kiOIX`144
zxnMGxKvh*N77LuuXH-=+&dC%-!Fs*M>2!kUdB1kw_hFhQR8>V3MR@k854tl=(@+!z
zcDvo3eZSu$NfNA9E3hm(PJ=KEgSxJ9yWQ^WaU6pX0zwFyrg<G^+cqRgUHUUwS(aEX
zm)LAJufrV2fh@~t+qT!=wk_uKIV{Wir$f#2e1AK0+;~HMI2-@~d7k(B!!X44dL7h_
l^gpAp58AHi`b}Yv^aJxbXz#W@Gui+E002ovPDHLkV1gdOtAYRk

delta 381
zcmV-@0fPRl1EK>ViBL{Q4GJ0x0000DNk~Le0000P0000W2nGNE0Oy?329Y5!f87WI
z3??`l%jCrX00A#aL_t(Y$L*Cdio#G3hQDl#1n~g2sRA}h6Pti|0kQD}X$%2d8=EaX
zKym=_3W|lTg=MY~5V6xVc?J@)-Gboi5_gwfHh=lgd-E~O3<H(^r6kidi|>ZK{6r-c
z<o7{ppMBV9H1Ir+!C*kM*+dAze|o*f_kB*M)7`&vtJQja1W;9#*=$C?-{*KdvfJ%Y
z6b0M1X}8;Kw_7fk%X5`jmPNPQWwY5ZnM~gO>2%6)IK;MXR;v|7QIzjVuh%1vV}c;K
z^5^q8hr@wRr-LlZ&oy3>B+@h`ilQrjzuzN-KnOvWW#u8G(Fje`K1`A%QwfG)FdmP~
zLtNLzG)?k6zZuW-99`FO9OsWLW4&I#J)X7N^UJtcEC4v4&o|@C<&rQA?@m{BPbx^I
bN?)uu`E_FBb7G2200000NkvXXu0mjfw-Bld

diff --git a/themes/holo/icons/next.png b/themes/holo/icons/next.png
index 9de2da8436cb8fab6bc246769b99002804f004b1..d3caba71240cc906ba651c24cacce26598b27384 100644
GIT binary patch
delta 345
zcmV-f0jB<s1ET|wBo78+OGiWi{{a60|De66laV1FF5v+R5*|8E{yHE400A&bL_t(Y
z$L*Cdi-KSn$A8`(IYiQ?gP0i6(hz84AECjKZ5e-g!-30HL(v@v{>T5r`-As+p7;L>
zhGFmuz40P7;94J&Bvnl-8t@;3H=E55Z?RaQs_Jv#>2!+k`)Hb0d);oA{eF*a+lZq0
zcq>fPWV_umo6P{Is_(b7TrTlE4_()9o_$vo<?~v>aU1|7Nn$dYAj>knUJpf402mAg
zSeAc9S(c<}`q=Q=?KY#)h)$<ddx9X)@AnxFhmUQ=<#Hj4BIffsS(ep)p67U;$9lcK
z9zyq^MNzQZ?Km6`oX_XlkK>pi2uPCTcDmgv9FIp_*CkEUdT6ayi`8mH7>1N(dH1Hm
rcsy=mvjP9sFMT?lgr*h$6Z{2H&s2~D?UW6200000NkvXXu0mjfa$uy@

delta 351
zcmV-l0igb)1CIlcBuNQyNLh0L01FcU01FcV0GgZ_00007bV*G`2i*t(5HASoS(@4a
z00AyZL_t(Y$L*Cdi-K?%#(&-&IYi>7gP0i6(jaJKAEBX<e;I#u!-30HL(v@vKI8N9
z|H1!xU*1<RP4mJF^u~+SfNOn7lGH@efd3l2Uax<6^Z6W2)1Cv5$76yZK-cx!lVzFR
zZpU;wMHI!yqp)q8&1S=7G6CRn`Cf#J#RA{=F%0A8+jmt}Kd%*B*9Ab5Bu1kVilWf%
zc2QLofPTM^<2Zj*RYjI%k2SB|ZZjMX>2x}^CkO()UXQ_G@YqzG&u8K|W;UCV=XvcH
zMS<`8tX8Y*OXwc7EK9cAE&KhR)9F<ENs<tTA!(Z4-fp)Fhr<ES^T@KSZd$9=V!2!r
xMG;k1-TkRxSyprN8t`vj>ErR(MDb6-Uki6sk0oE1qW}v4002ovPDHLkV1l{Br27B>

diff --git a/themes/holo/icons/prev.png b/themes/holo/icons/prev.png
index 3cd3efbbf57957cf6f6a6094d6ac6a6f61d853af..8b9b50e99acbe88abb13f218fed148439d62119c 100644
GIT binary patch
delta 395
zcmV;60d)S91D*pjiBL{Q4GJ0x0000DNk~Le0000P0000W2nGNE0Oy?31^@s624YJ`
zL;(K){{a7>y{D6rAs&C>0SXc)IIeWowg3PDD@jB_R7l6|ma%GsP!xv$+ZF_k=p;gd
zNG?GH2j_r`qZbDsAs}Q8WD!B=8w4^%$U_9&d;lN7HE_WP@By6cQ0h`zThexD{Kubj
z&Ijkf&mn!^<G1yIKhOmEmWb=R{j{zLaz~KGVu3VG-}%Sm@pgZRAP9(}2t`pqRn@^a
z3<Kx$8J_2T*!%PqfN7eD;~0!F0Ki*vhhd2Ac8mFZ{%QXxBnSd*HXBe%2T#*9BuN6s
z7-qBC?KiP33zSk2LIzKkWjKxlNs@l%@Q1?zS(c$`n!)3oW53^{EK77<Hwt;wb^Up)
z=z6`Pu4^cYg5^(g3C=k#mkX+@Lff{mZ5yH}BG2>NQ&^HDFvhT6ud&<hUI!3@)oO*)
p=>*^Rr>LJG|MFXz-qibqya3;LN{?bo{L=sc002ovPDHLkV1f#*twaC-

literal 404
zcmV;F0c-w=P)<h;3K|Lk000e1NJLTq000&M001Be1^@s67MF;N00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-so0T3V-m(II(0003qNkl<ZNXPA!J&J=s7>3{3T@d`Q
zM2JXGf(R*63pOboQg{SGuoY}VAh0(OtPFUFKspbQ1K0)x4`5?wl`R4`n`A*YunT_W
z^D$5H4(|*x3<Iy2H@s*j@h~5vC|;*1Ch;E<Ynq1LZugC6SvF40FbsU($LVx}EXxDe
zbsa@fz;)fn1$nfX&*uok5R_5?!1a3T(Ppzj6h)ZLX3v{<4|<-5AP8WZ=D-w1!FIa^
zr4&5RkIUGyESRPVLdd`bLBMjk1jljXFE33~?Du;#O*62%u8|}O%Cbb?_dkl?RaO1G
zx42v`sHzH*B*8EY)OC&H@rd*JjJ9oI+csF1#o=(cD<-Se>gnsoaU3Y6a2yA59N!KR
yg2iHiJkPOSug8g}N>Acn{H43DBU2RrQ~U)1B}Z~aX_?yq0000<MNUMnLSTZ%L!spW

diff --git a/themes/holo/icons/spr.png b/themes/holo/icons/spr.png
deleted file mode 100644
index 148aa8062cba728a2c9a0fc22b761fc77b573b6f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^d_b(g!3HFi-g!<3Qk(@Ik;M!Q+`=Ht$S`Y;1W=H@
z#M9T6{VoTiAd}=m#;y-QA$?C5#}JFt$ss{Ozs@_bB_t^b^C<S})YR1QEN(PjRT%Pk
m#j%Icr)qzF$uub_U|?Xr%CgeR@>?8GD}$%2pUXO@geCy9O(zKe

diff --git a/themes/holo/icons/spr_left.png b/themes/holo/icons/spr_left.png
index a74db86f964a84c156b94ae2cd0c8ddad4266b52..44822ed936cc62292ce998e3e8ed34e94c27c362 100644
GIT binary patch
delta 116
zcmeBRT);R%Qi_d%f#DY4rUW3xmgMd3!tfsi7wla=d7`46|3gMDL2dEXVN$z*^17Zb
zjv*T7lmGnxZ_jL%kaU1aLnOt(z~D!ILc)jn*Tj0cE;&wkdU?5j&zB7x42sh^jl#?y
R!~iuic)I$ztaD0e0s!eaDK-EA

delta 118
zcmZ3$*ugkKGM|Zofgv<U)f`B17I;J!Gca%qgD@k*tT_@uLG}_)Usv|K987`?#!;4i
zUO*vrPZ!4!iOb0$K|x6lOg=m-8dB`!!Qkr|>8Fbsruome3%qQ@P=0{<lHlwk_kmg%
NJYD@<);T3K0RR>KA5Q=P

diff --git a/themes/holo/icons/stop.png b/themes/holo/icons/stop.png
index 95d8116beddfb278051e7e2e7a21953ead8e27d5..63ed4058e0bde2c5c256fb57733ba44748289907 100644
GIT binary patch
delta 167
zcmZ3<xQEfWGr-TCmrII^fq{Y7)59eQNQ(lo0tXwA{JX%o14ywYdAqwX{0G4WdzVk1
zs3@2HkdaGBQ+d}UqboppPfr)e5Rc=@fByfsXWq&v%*=a$!+grc0|y@b&zR9C<z;)I
z$^X-xoy9yoJv|mrd3kx=50_jC2;w<9eU4lAzCh=fk+b{Es@vKYGVIyJ6ZLYI5(m&w
N22WQ%mvv4FO#mu(J9Yp7

literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^VnD3G!2~2{ewDuiq&N#aB8wRqxP?KOkzv*x37{Z*
ziKnkC`&|x30b#R<)BpN_LLQzjjv*e$lS6`nk{0k77zXgP^$P0L)YL3aG`yoEy86Y=
z;^z{Ql7>fld3oKNi&scBnz|J-x-m01Uwj~wH}mi1<^GEk9Zi)Px*FN-oOFdij$-h1
L^>bP0l+XkK72hrb

diff --git a/themes/holo/icons/submenu.png b/themes/holo/icons/submenu.png
deleted file mode 100644
index 10ca01449cf2d16cad80879e7ca05ef095ca70d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 84
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`(w;7kAr_~T6C_x-F#iVvdmbK1
fi?fRx&M`398VkQImp%~-RL0=x>gTe~DWM4fCUq9j

diff --git a/themes/holo/icons/taglist_bg_focus.png b/themes/holo/icons/taglist_bg_focus.png
deleted file mode 100644
index d911dfe34e676a9dc185f62e3628558922a1c6e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 227
zcmeAS@N?(olHy`uVBq!ia0vp^9zd+X!3HEZdf62KDYhhUcNYdF5M1+Gq!1{=S>O>_
z%)r1c48n{Iv*t(u1=&kHeO=k_vdarvC>I!6xdDX=JY5_^GVZ;-<jB>aAkg~I-1+<c
z^5uOY`@}SP+_vcb<9C^RG0=q*s1gEx?BB50qbPsUlMadGy-&4o2WEe_4SaSp*>aoD
z&l#V#hG}P;_Nu<rDBlyi_WRl+$0UC{@7>e%I_=-d%};=a%r9kHdr3CS#Y1g1$T&||
KKbLh*2~7Z4nM$Dm

diff --git a/themes/holo/icons/topbar/1024.png b/themes/holo/icons/topbar/1024.png
deleted file mode 100644
index bc1449b4ac030d953f0dcd8b5dc78d4b07f9bcf7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 347
zcmeAS@N?(olHy`uVBq!ia0y~yU;#226gb#`WY0gYWk8Cvz$3Dlfq`2Xgc%uT&5-~K
zvX^-Jy0YKpVCJ<JYESZs1q%K0ba4!+xb^myBHsZ80oQ}u92G5CzT4mB%E>nLT{UaN
z84DHp?}u(y@8<_9R@izPWRn6AGcYiLhz(6f@=@7hjjpaOf(#4|;dLOv1`xr(0U{be
z1duuZO4Qz<L$-IA85kVELSPpoF$KV)j35#ZvtcUp0g1!fs&@|C0u`d0;Q-RzAUpM^
nfS?%Aq=uG1AOQxfhBnN%X-XEZKksA<3M~dtS3j3^P6<r_5t2U}

diff --git a/themes/holo/icons/topbar/1152.png b/themes/holo/icons/topbar/1152.png
deleted file mode 100644
index 8f16c02c483034e3e8e46a731da37fad9e93d795..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 387
zcmeAS@N?(olHy`uVBq!ia0y~yU}*rd6*$;{WY%xy<v@zFz$3Dlfq`2Xgc%uT&5-~K
zvX^-Jy0YKpVCG{m$(}vqAOi!VlBbJfNX4zUw-osf8wfBQ+{VTALHW=B>yj<oOcq#p
zg&Ci@P@Yrz-tzf(R-ge6*N$@lDTZ4t3P7^Kf)T`1$g{RTCZWc}zxA3C3y}Y>h!I2y
zs53AEsUw^YK$4-5NdQPX+<D7<Vc+|0B6Hg7f!qV7F<8{hVZf;!j}*w{LK&h=-ac18
nTNfB83=AEGxSa~M>pSxo5#joIai5fc>KQy;{an^LB{Ts5`P@@R

diff --git a/themes/holo/icons/topbar/1280.png b/themes/holo/icons/topbar/1280.png
deleted file mode 100644
index c4f7637c2d0869057cdabb88125d8b64b8d6485f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 403
zcmeAS@N?(olHy`uVBq!ia0y~yU<EQ66gb#`q;J91G$6%U;1OBOz`!jG!i)^F=12eq
z*-JcqUD@w)F!M3+-<nYPl!1ZK$kW9!q~g}wTZ(*#4FnhtZsX$mp#10mb;*`(CP9@`
z)}+l?`2NPLd&TG8a{~=v@c1Rc2%<|k8$gtR8UquMa=1}e*JJ3zBA2x`l>^8>ATQnk
zq~Ovs7(k*7iA)M0s^zX7!@J*k-UlmxumiaVOk*I1ps7N&ffPxg`Eth-i8O!PT={HW
kU<ffVGzj2zHPk)dm{YF^*MGRpuLSaor>mdKI;Vst0H}Ub6#xJL

diff --git a/themes/holo/icons/topbar/1366.png b/themes/holo/icons/topbar/1366.png
deleted file mode 100644
index 8a5ac444bfcbcf5a848969c705d385429e971136..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 433
zcmeAS@N?(olHy`uVBq!ia0y~yU=0JZ6*$;{<j*SQOd!RU<n8XlU;u(q7p@%zif|Tq
zL>4nJa0`PlBg3pY5<o%r5>H=O_PZQR{F0)qJvvtz7#Qt5T^vIyZoR#w$amO4fZ^aa
zF0K>GpZ;H$Y}sbACN}8kMIPfXve9>o?|=W!3^akEVgBA85Y4baFpLpID<z78C<P%1
zchS>7H@2O1NeD{jaR!P15Efqzq8TP`0QrDHfD@G)Yqw_I>nv~cIqmfzX#->Y%F%Qa
z#l86S@T)?ZZ6${*f3Sn>FfQJR)hSTJE*91G82Ye)R6gLw@0wbMo1((?8C#bHfK+?B
L`njxgN@xNA)XHJ)

diff --git a/themes/holo/icons/topbar/1440.png b/themes/holo/icons/topbar/1440.png
deleted file mode 100644
index 4fb7c7faa7552f6a88181adb9095422b2f1c55e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 380
zcmeAS@N?(olHy`uVBq!ia0y~yU|j%YD{wFY$!sr=2SAFmz$3Dlfq`2Xgc%uT&5-~K
zvX^-Jy0YKpVCG|DsF39Q#=yWR?djqeQgQ3;t%ZVz4FnhtswAr{P`XoJ%5*F-@1R|^
zIOi+*dw<IBf9D5kcer^TWM_j_BQuaXA#4HS*g!b9&t0E$*{Y&v>oirM=$>|NJ|Lyw
z{{Tobd}2Z7=yA&=_Z-*xIB)Y0QK01ehfSEKp%_ghXSYs)%<+#iRPPmw?FR<L1KXGa
zkmZ$3>_BpYIx=Vb-1S?hm4akl^^iS*V$*NtW+|bDjI~RyfE0SV`njxgN@xNAiFsj3

diff --git a/themes/holo/icons/topbar/1600.png b/themes/holo/icons/topbar/1600.png
deleted file mode 100644
index f58f733fd62669dbfa684a54b0c3344bec0e2719..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmeAS@N?(olHy`uVBq!ia0y~yU~>Sn6*!oH<WVo>2|$Xoz$3Dlfq`2Xgc%uT&5-~K
zvX^-Jy0YKpVCG{o)I832hJk@m)6>N<q~g}wTMGpb8wfBQR7qA@pme9cl<81n-a+$O
zu_`O-D?Z=<z0V$~ogv`sW{?#Or&x4A)Fmjj?z!pnEqr|&uWe!hidr;tqsXGFjpL3;
z?n$0@W6sg_K(!6VI}U(MRPdz=^>%B+*6(&{oo6HefC2}<OV&N#dTkRQP#Hs3Oadd2
dnxKY<`o=z^T&Q7JmWMP*ho`Hb%Q~loCIDK+U>*Pf

diff --git a/themes/holo/icons/topbar/1680.png b/themes/holo/icons/topbar/1680.png
deleted file mode 100644
index 2abea886f8e06f043dbfbeeb9504fef7f97d595b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 403
zcmeAS@N?(olHy`uVBq!ia0y~yV4DDBD{wFY$yw2BZUQOJ0*}aI1_o|n5N2eUHAey{
z$X?><>&kwYgPD(m_0t@o&kPKVMxHK?Ar-gY-dZSl*g$~cph~jJ1Eo9lrA&ts^A4(?
z*Au#8zvt)s(pY(*c7_EH(^*0E1;rbTK+2&bfgQwEJpR|}{AH_(Ud!dGAii}`B1F7N
z7Q}7gC<9RfN)Syak`Lzfe4M3fmi|#2DBK{sa|1Jo7C6WUQs%^B4Wc*%-+(9u7t$pw
zb#AQP8n^k#Go3n+Yd0v1qu38~G}Li2-?PtUg5CK+2d_e?FFvssu?saklivz*G=rzB
KpUXO@geCx4OI%z4

diff --git a/themes/holo/icons/topbar/1920.png b/themes/holo/icons/topbar/1920.png
deleted file mode 100644
index 7b3c216fff657f6867d082bd087c9516d0b96a8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 426
zcmeAS@N?(olHy`uVBq!ia0y~yU~d4j6*!oHWKH#_k3fpEz$3Dlfq`2Xgc%uT&5-~K
zvX^-Jy0SmuV&c=`dKr9f69WUIr>Bc!NX4zUw-osf8wfBQ+{VRqLiyAG>yi@F+qY@E
zU*s|VEE{w8x6OHRpne91KevyAtYu)(;J5&$Rai2>v=EaCnC^W0$*%8kP(_bnn<_})
zfR^3@Mi9dTmxiN^RrkLiU-N0+<{zRUg&VrKQH|telmdx2v@r03Xa}bTHW00#=)er3
zCkWuT0H*!OBL>^&HD|QmTXx5TU9@@!0fV-kuI@?H1lhsx=Nv1<e=yU~9rKa(pp8(&
S*Zao4AmyH}elF{r5}E*kvRioo

diff --git a/themes/holo/icons/topbar/2560.png b/themes/holo/icons/topbar/2560.png
deleted file mode 100644
index 6b496ac4244990bf42792b45332fcbf416bcc57b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 483
zcmeAS@N?(olHy`uVBq!ia0y~y05KU9IGBKB;Hz!lffQ$fM`SSr1Gg{;GcwGYBLNg-
zFY)wsWxvb8%*V+v`|WjG1_s6^PZ!6Kid%1QFBCj%Ai!`?C0S*G(w+KJreleD2ftN{
zbH18??@#&t@BBdRAaMTsW{@pF(7?tBG7|_CoEX?3td1M!uFtt_bs{1=5~?cyF%zaL
zfd)p1dL@<w2&19nG}8wO<;_Q`&pir<2z@Zq!&JtB#ZD}yk*w^|CWaar_q5LMbB?Zu
zSpOh5hJhKvbm2GvVK4|X89-PLEet#mmcYij>$grTg(|R_&Yb{ZHW2BC4*S!RLJcJ%
Rt5$&YdAj<!taD0e0svHdSbzWk

diff --git a/themes/holo/icons/uselesstile.png b/themes/holo/icons/uselesstile.png
deleted file mode 100644
index f482b1025fa97f8c547108019af8894c6bd216c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^VnD3G!3JVY@8||nY)RhkE(``B7<J*=QJ@HCfk$L9
z0|U1(2s1Lwnj--eWH0gbb!ETH!NkvHzL8mHF;FPN)5S5w<9Kp{1go={fs};ApXIFw
zeYO;RykI<oHTJ=upPy4CQ!+9-?kD7QP0&56)_&G-@x*rfo{x-4%F|mf-H^ANXfAb(
rS>)J{LlbWp$gOqE$p4@raR_MZY8mdHJ$9WyI~Y7&{an^LB{Ts5G5<a{

diff --git a/themes/holo/icons/uselesstileleft.png b/themes/holo/icons/uselesstileleft.png
deleted file mode 100644
index caf63662ccaa6d4a777ed2dae778bb46667e16ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^VnD3G!3JVY@8||nY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP)C#Qgnl5MPcGEgYU)5S5w<9Kp{1go={fs};ApXIFw
zeYO;RykI<oHTJ=upPy4CQ!+9-?kD7QC5R;nAAdUI;)%oZ$DX(;+?;4Gb!>5>&v64a
lRSUOlfm_lxTx|vn41sPk+zOqO7XwXa@O1TaS?83{1OUO|JCy(c

diff --git a/themes/holo/icons/uselesstiletop.png b/themes/holo/icons/uselesstiletop.png
deleted file mode 100644
index 8cddfb6a67c26bc43345945cd2c0deffdb15a33f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 198
zcmeAS@N?(olHy`uVBq!ia0vp^VnD3G!3JVY@8||nY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP)C#R684#(nBXP{89r;B5V$MNI@307w@11SlKKg(MW
z`fMrsc)@rEYwUwRKR>5PretJv+)pTReSUua@zckj&bWAD@!o?Hmi>7vn<NZoX|+`=
nx_C~KUhDWG`-6tWAqEDs07;+S`6pz6#xr=j`njxgN@xNAy~jW+

diff --git a/themes/holo/theme.lua b/themes/holo/theme.lua
index c3a45ed..5ef996f 100644
--- a/themes/holo/theme.lua
+++ b/themes/holo/theme.lua
@@ -1,48 +1,38 @@
 
 --[[
                                 
-     Holo Awesome WM config 2.0 
+     Holo Awesome WM config 3.0 
      github.com/copycat-killer  
                                 
 --]]
 
-theme                               = {}
+local theme                         = {}
 
 theme.icon_dir                      = os.getenv("HOME") .. "/.config/awesome/themes/holo/icons"
-
 theme.wallpaper                     = os.getenv("HOME") .. "/.config/awesome/themes/holo/wall.png"
 
-theme.topbar_path                   = "png:" .. theme.icon_dir .. "/topbar/"
-
-theme.font                          = "Tamsyn 10.5"
-theme.taglist_font                  = "Tamsyn 8"
+theme.font                          = "Roboto Bold 10"
+theme.taglist_font                  = "Roboto Condensed Regular 8"
 theme.fg_normal                     = "#FFFFFF"
 theme.fg_focus                      = "#0099CC"
+theme.bg_focus                      = "#303030"
 theme.bg_normal                     = "#242424"
 theme.fg_urgent                     = "#CC9393"
-theme.bg_urgent                     = "#2A1F1E"
-theme.border_width                  = "1"
+theme.bg_urgent                     = "#006B8E"
+theme.border_width                  = 3
 theme.border_normal                 = "#252525"
 theme.border_focus                  = "#0099CC"
 theme.taglist_fg_focus              = "#FFFFFF"
-theme.taglist_bg_focus              = "png:" .. theme.icon_dir .. "/taglist_bg_focus.png"
 theme.tasklist_bg_normal            = "#222222"
 theme.tasklist_fg_focus             = "#4CB7DB"
-theme.tasklist_bg_focus             = "png:" .. theme.icon_dir .. "/bg_focus_noline.png"
-theme.textbox_widget_margin_top     = 1
-theme.awful_widget_height           = 14
-theme.awful_widget_margin_top       = 2
-theme.menu_height                   = "20"
-theme.menu_width                    = "400"
+theme.menu_height                   = 20
+theme.menu_width                    = 160
 
-theme.widget_bg                     = theme.icon_dir .. "/bg_focus_noline.png"
 theme.awesome_icon                  = theme.icon_dir .. "/awesome_icon.png"
+theme.awesome_icon_white            = theme.icon_dir .. "/awesome_icon_white.png"
 theme.vol_bg                        = theme.icon_dir .. "/vol_bg.png"
-theme.menu_submenu_icon             = theme.icon_dir .. "/submenu.png"
 theme.taglist_squares_sel           = theme.icon_dir .. "/square_sel.png"
 theme.taglist_squares_unsel         = theme.icon_dir .. "/square_unsel.png"
-theme.last                          = theme.icon_dir .. "/last.png"
-theme.spr                           = theme.icon_dir .. "/spr.png"
 theme.spr_small                     = theme.icon_dir .. "/spr_small.png"
 theme.spr_very_small                = theme.icon_dir .. "/spr_very_small.png"
 theme.spr_right                     = theme.icon_dir .. "/spr_right.png"
@@ -62,7 +52,6 @@ theme.calendar                      = theme.icon_dir .. "/cal.png"
 theme.cpu                           = theme.icon_dir .. "/cpu.png"
 theme.net_up                        = theme.icon_dir .. "/net_up.png"
 theme.net_down                      = theme.icon_dir .. "/net_down.png"
-theme.widget_mail_notify            = theme.icon_dir .. "/mail_notify.png"
 
 theme.layout_tile                   = theme.icon_dir .. "/tile.png"
 theme.layout_tilegaps               = theme.icon_dir .. "/tilegaps.png"
@@ -81,10 +70,6 @@ theme.layout_floating               = theme.icon_dir .. "/floating.png"
 theme.tasklist_plain_task_name      = true
 theme.tasklist_disable_icon         = true
 
--- lain related
-theme.useless_gap_width             = 10
-theme.layout_uselesstile            = theme.icon_dir .. "/uselesstile.png"
-theme.layout_uselesstileleft        = theme.icon_dir .. "/uselesstileleft.png"
-theme.layout_uselesstiletop         = theme.icon_dir .. "/uselesstiletop.png"
+theme.useless_gap                   = 4
 
 return theme