diff --git a/README.rst b/README.rst
index c5c2b01..4dc63e9 100644
--- a/README.rst
+++ b/README.rst
@@ -15,12 +15,12 @@ Power themes for Awesome WM 3.5+
 Description
 ==========
 
-A set of power themes with the aim of making Awesome_ appearance awesome too!
+A set of themes with the aim of making Awesome_ appearance awesome too!
 
 Notable features
 ================
 
-- Autohide widgets (*tell me only when you have to*)
+- Shadow widgets (*tell me only when you have to*)
 - Autostart functionality
 - Fast mpd and volume shortcuts (first time you see this trick in Awesome)
 - Other fancy shortcuts for copying to the clipboard (goodbye clipboard managers!), toggle wiboxes, widgets popups, screenshots capture, moving clients
@@ -31,19 +31,19 @@ Notable features
 - Net carrier status notifier 
 - Colorful autoupdating icons
 - Symbolic tag names
-- TXT layouts names (instead of icons)
+- TXT layoutbox option 
 - PNG taskbar
 - Custom layouts
 - No borders when there's only one visible client
 - Powerful volume bar
 - Freedesktop menu
-- Vi-like client focus (hjkl)
-- Nice client border (i.e. colors change along with process status)
+- Vi-like client focus
+- Nice client border (colors change along with process status)
 
 They're scattered all over the set, so try each theme and choose the one you enjoy the most. 
 
 Gallery
---------
+=======
 
 **Multicolor** copycatted from tip_ [liked so much --> compulsory personal version]
 
@@ -74,7 +74,7 @@ Gallery
 .. image:: http://dotshare.it/public/images/uploads/621.png
 
 Notes
---------
+=====
 
 **Do not** use without reading and modifying according to your preferences and system specs.
 
@@ -108,9 +108,6 @@ Instead, if you happen to get any ``surface.lua`` problem, be sure to have ``lua
 
 Also be sure to set your music dir in ``scripts/mpdinfo``, and to have ``imagemagick`` and ``notify-send`` installed.
 
-
-**Have any suggestions?** Did you see some great stuff and you'd like me to put my paws on it? Then tell me! It might just be the next copycat.
-
 .. _Awesome: http://awesome.naquadah.org/
 .. _vain: https://github.com/copycat-killer/vain
 .. _tip: http://theimmortalphoenix.deviantart.com/art/Full-Color-Awesome-340997258
diff --git a/freedesktop/README.md b/freedesktop/README.md
index 0be269a..5858dac 100644
--- a/freedesktop/README.md
+++ b/freedesktop/README.md
@@ -1,9 +1,10 @@
-This is [awesome-freedesktop](https://github.com/terceiro/awesome-freedesktop),
-simply adapted to work within [awesome-copycats](https://github.com/copycat-killer/awesome-copycats).
+This is [awesome-freedesktop](https://github.com/terceiro/awesome-freedesktop), 
+adapted to work within [awesome-copycats](https://github.com/copycat-killer/awesome-copycats).
 
 License
 =======
 
 Copyright © 2009-2011 Antonio Terceiro <terceiro@softwarelivre.org>
 
-This code is licensed under the same terms as Awesome itself.
+This code is licensed under the same terms as Awesome WM itself: [GNU
+GPLv2](http://www.gnu.org/licenses/gpl-2.0.txt).
diff --git a/icons/anrxc/LICENSE b/icons/anrxc/LICENSE
deleted file mode 100644
index 2a36ba7..0000000
--- a/icons/anrxc/LICENSE
+++ /dev/null
@@ -1,10 +0,0 @@
-All icons in this package were created by Adrian C. (anrxc).
-
-All icons except the 'huge' icon sets and 'small' titlebar icons are
-licensed under the Creative Commons Attribution-Share Alike
-License. To view a copy of this license, visit
-http://creativecommons.org/licenses/by-sa/3.0/
-
-The 'huge' icon sets and 'small' titlebar icons are licensed under the
-same terms as the awesome distribution it self - GNU General Public
-License version 2.
diff --git a/icons/anrxc/README.md b/icons/anrxc/README.md
new file mode 100644
index 0000000..71f059a
--- /dev/null
+++ b/icons/anrxc/README.md
@@ -0,0 +1,8 @@
+All icons in this package were created by Adrian C. (anrxc).
+
+All icons except the 'huge' icon sets and 'small' titlebar icons are
+licensed under the [Creative Commons Attribution-Share Alike
+License](http://creativecommons.org/licenses/by-sa/3.0/).
+
+The 'huge' icon sets and 'small' titlebar icons are licensed under the
+same terms as the Awesome WM itself: [GNU GPLv2](http://www.gnu.org/licenses/gpl-2.0.txt).
diff --git a/icons/xbm8x8/How to change color of icons and resize them b/icons/xbm/How to change color of icons and resize them
similarity index 100%
rename from icons/xbm8x8/How to change color of icons and resize them
rename to icons/xbm/How to change color of icons and resize them
diff --git a/icons/xbm8x8/ac.xbm b/icons/xbm/ac.xbm
similarity index 100%
rename from icons/xbm8x8/ac.xbm
rename to icons/xbm/ac.xbm
diff --git a/icons/xbm8x8/ac_01.xbm b/icons/xbm/ac_01.xbm
similarity index 100%
rename from icons/xbm8x8/ac_01.xbm
rename to icons/xbm/ac_01.xbm
diff --git a/icons/xbm8x8/arch.xbm b/icons/xbm/arch.xbm
similarity index 100%
rename from icons/xbm8x8/arch.xbm
rename to icons/xbm/arch.xbm
diff --git a/icons/xbm8x8/arch_10x10.xbm b/icons/xbm/arch_10x10.xbm
similarity index 100%
rename from icons/xbm8x8/arch_10x10.xbm
rename to icons/xbm/arch_10x10.xbm
diff --git a/icons/xbm8x8/bat_empty_01.xbm b/icons/xbm/bat_empty_01.xbm
similarity index 100%
rename from icons/xbm8x8/bat_empty_01.xbm
rename to icons/xbm/bat_empty_01.xbm
diff --git a/icons/xbm8x8/bat_empty_02.xbm b/icons/xbm/bat_empty_02.xbm
similarity index 100%
rename from icons/xbm8x8/bat_empty_02.xbm
rename to icons/xbm/bat_empty_02.xbm
diff --git a/icons/xbm8x8/bat_full_01.xbm b/icons/xbm/bat_full_01.xbm
similarity index 100%
rename from icons/xbm8x8/bat_full_01.xbm
rename to icons/xbm/bat_full_01.xbm
diff --git a/icons/xbm8x8/bat_full_02.xbm b/icons/xbm/bat_full_02.xbm
similarity index 100%
rename from icons/xbm8x8/bat_full_02.xbm
rename to icons/xbm/bat_full_02.xbm
diff --git a/icons/xbm8x8/bat_low_01.xbm b/icons/xbm/bat_low_01.xbm
similarity index 100%
rename from icons/xbm8x8/bat_low_01.xbm
rename to icons/xbm/bat_low_01.xbm
diff --git a/icons/xbm8x8/bat_low_02.xbm b/icons/xbm/bat_low_02.xbm
similarity index 100%
rename from icons/xbm8x8/bat_low_02.xbm
rename to icons/xbm/bat_low_02.xbm
diff --git a/icons/xbm8x8/bluetooth.xbm b/icons/xbm/bluetooth.xbm
similarity index 100%
rename from icons/xbm8x8/bluetooth.xbm
rename to icons/xbm/bluetooth.xbm
diff --git a/icons/xbm8x8/bug_01.xbm b/icons/xbm/bug_01.xbm
similarity index 100%
rename from icons/xbm8x8/bug_01.xbm
rename to icons/xbm/bug_01.xbm
diff --git a/icons/xbm8x8/bug_02.xbm b/icons/xbm/bug_02.xbm
similarity index 100%
rename from icons/xbm8x8/bug_02.xbm
rename to icons/xbm/bug_02.xbm
diff --git a/icons/xbm8x8/cat.xbm b/icons/xbm/cat.xbm
similarity index 100%
rename from icons/xbm8x8/cat.xbm
rename to icons/xbm/cat.xbm
diff --git a/icons/xbm8x8/clock.xbm b/icons/xbm/clock.xbm
similarity index 100%
rename from icons/xbm8x8/clock.xbm
rename to icons/xbm/clock.xbm
diff --git a/icons/xbm8x8/cpu.xbm b/icons/xbm/cpu.xbm
similarity index 100%
rename from icons/xbm8x8/cpu.xbm
rename to icons/xbm/cpu.xbm
diff --git a/icons/xbm8x8/dish.xbm b/icons/xbm/dish.xbm
similarity index 100%
rename from icons/xbm8x8/dish.xbm
rename to icons/xbm/dish.xbm
diff --git a/icons/xbm8x8/diskette.xbm b/icons/xbm/diskette.xbm
similarity index 100%
rename from icons/xbm8x8/diskette.xbm
rename to icons/xbm/diskette.xbm
diff --git a/icons/xbm8x8/empty.xbm b/icons/xbm/empty.xbm
similarity index 100%
rename from icons/xbm8x8/empty.xbm
rename to icons/xbm/empty.xbm
diff --git a/icons/xbm8x8/eye_l.xbm b/icons/xbm/eye_l.xbm
similarity index 100%
rename from icons/xbm8x8/eye_l.xbm
rename to icons/xbm/eye_l.xbm
diff --git a/icons/xbm8x8/eye_r.xbm b/icons/xbm/eye_r.xbm
similarity index 100%
rename from icons/xbm8x8/eye_r.xbm
rename to icons/xbm/eye_r.xbm
diff --git a/icons/xbm8x8/fox.xbm b/icons/xbm/fox.xbm
similarity index 100%
rename from icons/xbm8x8/fox.xbm
rename to icons/xbm/fox.xbm
diff --git a/icons/xbm8x8/fs_01.xbm b/icons/xbm/fs_01.xbm
similarity index 100%
rename from icons/xbm8x8/fs_01.xbm
rename to icons/xbm/fs_01.xbm
diff --git a/icons/xbm8x8/fs_02.xbm b/icons/xbm/fs_02.xbm
similarity index 100%
rename from icons/xbm8x8/fs_02.xbm
rename to icons/xbm/fs_02.xbm
diff --git a/icons/xbm8x8/full.xbm b/icons/xbm/full.xbm
similarity index 100%
rename from icons/xbm8x8/full.xbm
rename to icons/xbm/full.xbm
diff --git a/icons/xbm8x8/fwd.xbm b/icons/xbm/fwd.xbm
similarity index 100%
rename from icons/xbm8x8/fwd.xbm
rename to icons/xbm/fwd.xbm
diff --git a/icons/xbm8x8/half.xbm b/icons/xbm/half.xbm
similarity index 100%
rename from icons/xbm8x8/half.xbm
rename to icons/xbm/half.xbm
diff --git a/icons/xbm8x8/info_01.xbm b/icons/xbm/info_01.xbm
similarity index 100%
rename from icons/xbm8x8/info_01.xbm
rename to icons/xbm/info_01.xbm
diff --git a/icons/xbm8x8/info_02.xbm b/icons/xbm/info_02.xbm
similarity index 100%
rename from icons/xbm8x8/info_02.xbm
rename to icons/xbm/info_02.xbm
diff --git a/icons/xbm8x8/info_03.xbm b/icons/xbm/info_03.xbm
similarity index 100%
rename from icons/xbm8x8/info_03.xbm
rename to icons/xbm/info_03.xbm
diff --git a/icons/xbm8x8/mail.xbm b/icons/xbm/mail.xbm
similarity index 100%
rename from icons/xbm8x8/mail.xbm
rename to icons/xbm/mail.xbm
diff --git a/icons/xbm8x8/mem.xbm b/icons/xbm/mem.xbm
similarity index 100%
rename from icons/xbm8x8/mem.xbm
rename to icons/xbm/mem.xbm
diff --git a/icons/xbm8x8/mouse_01.xbm b/icons/xbm/mouse_01.xbm
similarity index 100%
rename from icons/xbm8x8/mouse_01.xbm
rename to icons/xbm/mouse_01.xbm
diff --git a/icons/xbm8x8/net_down_01.xbm b/icons/xbm/net_down_01.xbm
similarity index 100%
rename from icons/xbm8x8/net_down_01.xbm
rename to icons/xbm/net_down_01.xbm
diff --git a/icons/xbm8x8/net_down_02.xbm b/icons/xbm/net_down_02.xbm
similarity index 100%
rename from icons/xbm8x8/net_down_02.xbm
rename to icons/xbm/net_down_02.xbm
diff --git a/icons/xbm8x8/net_down_03.xbm b/icons/xbm/net_down_03.xbm
similarity index 100%
rename from icons/xbm8x8/net_down_03.xbm
rename to icons/xbm/net_down_03.xbm
diff --git a/icons/xbm8x8/net_up_01.xbm b/icons/xbm/net_up_01.xbm
similarity index 100%
rename from icons/xbm8x8/net_up_01.xbm
rename to icons/xbm/net_up_01.xbm
diff --git a/icons/xbm8x8/net_up_02.xbm b/icons/xbm/net_up_02.xbm
similarity index 100%
rename from icons/xbm8x8/net_up_02.xbm
rename to icons/xbm/net_up_02.xbm
diff --git a/icons/xbm8x8/net_up_03.xbm b/icons/xbm/net_up_03.xbm
similarity index 100%
rename from icons/xbm8x8/net_up_03.xbm
rename to icons/xbm/net_up_03.xbm
diff --git a/icons/xbm8x8/net_wired.xbm b/icons/xbm/net_wired.xbm
similarity index 100%
rename from icons/xbm8x8/net_wired.xbm
rename to icons/xbm/net_wired.xbm
diff --git a/icons/xbm8x8/next.xbm b/icons/xbm/next.xbm
similarity index 100%
rename from icons/xbm8x8/next.xbm
rename to icons/xbm/next.xbm
diff --git a/icons/xbm8x8/note.xbm b/icons/xbm/note.xbm
similarity index 100%
rename from icons/xbm8x8/note.xbm
rename to icons/xbm/note.xbm
diff --git a/icons/xbm8x8/pacman.xbm b/icons/xbm/pacman.xbm
similarity index 100%
rename from icons/xbm8x8/pacman.xbm
rename to icons/xbm/pacman.xbm
diff --git a/icons/xbm8x8/pause.xbm b/icons/xbm/pause.xbm
similarity index 100%
rename from icons/xbm8x8/pause.xbm
rename to icons/xbm/pause.xbm
diff --git a/icons/xbm8x8/phones.xbm b/icons/xbm/phones.xbm
similarity index 100%
rename from icons/xbm8x8/phones.xbm
rename to icons/xbm/phones.xbm
diff --git a/icons/xbm8x8/play.xbm b/icons/xbm/play.xbm
similarity index 100%
rename from icons/xbm8x8/play.xbm
rename to icons/xbm/play.xbm
diff --git a/icons/xbm8x8/plug.xbm b/icons/xbm/plug.xbm
similarity index 100%
rename from icons/xbm8x8/plug.xbm
rename to icons/xbm/plug.xbm
diff --git a/icons/xbm8x8/prev.xbm b/icons/xbm/prev.xbm
similarity index 100%
rename from icons/xbm8x8/prev.xbm
rename to icons/xbm/prev.xbm
diff --git a/icons/xbm8x8/rwd.xbm b/icons/xbm/rwd.xbm
similarity index 100%
rename from icons/xbm8x8/rwd.xbm
rename to icons/xbm/rwd.xbm
diff --git a/icons/xbm8x8/scorpio.xbm b/icons/xbm/scorpio.xbm
similarity index 100%
rename from icons/xbm8x8/scorpio.xbm
rename to icons/xbm/scorpio.xbm
diff --git a/icons/xbm8x8/shroom.xbm b/icons/xbm/shroom.xbm
similarity index 100%
rename from icons/xbm8x8/shroom.xbm
rename to icons/xbm/shroom.xbm
diff --git a/icons/xbm8x8/spkr_01.xbm b/icons/xbm/spkr_01.xbm
similarity index 100%
rename from icons/xbm8x8/spkr_01.xbm
rename to icons/xbm/spkr_01.xbm
diff --git a/icons/xbm8x8/spkr_02.xbm b/icons/xbm/spkr_02.xbm
similarity index 100%
rename from icons/xbm8x8/spkr_02.xbm
rename to icons/xbm/spkr_02.xbm
diff --git a/icons/xbm8x8/spkr_03.xbm b/icons/xbm/spkr_03.xbm
similarity index 100%
rename from icons/xbm8x8/spkr_03.xbm
rename to icons/xbm/spkr_03.xbm
diff --git a/icons/xbm8x8/stop.xbm b/icons/xbm/stop.xbm
similarity index 100%
rename from icons/xbm8x8/stop.xbm
rename to icons/xbm/stop.xbm
diff --git a/icons/xbm8x8/temp.xbm b/icons/xbm/temp.xbm
similarity index 100%
rename from icons/xbm8x8/temp.xbm
rename to icons/xbm/temp.xbm
diff --git a/icons/xbm8x8/test.xbm b/icons/xbm/test.xbm
similarity index 100%
rename from icons/xbm8x8/test.xbm
rename to icons/xbm/test.xbm
diff --git a/icons/xbm8x8/usb.xbm b/icons/xbm/usb.xbm
similarity index 100%
rename from icons/xbm8x8/usb.xbm
rename to icons/xbm/usb.xbm
diff --git a/icons/xbm8x8/usb_02.xbm b/icons/xbm/usb_02.xbm
similarity index 100%
rename from icons/xbm8x8/usb_02.xbm
rename to icons/xbm/usb_02.xbm
diff --git a/icons/xbm8x8/wifi_01.xbm b/icons/xbm/wifi_01.xbm
similarity index 100%
rename from icons/xbm8x8/wifi_01.xbm
rename to icons/xbm/wifi_01.xbm
diff --git a/icons/xbm8x8/wifi_02.xbm b/icons/xbm/wifi_02.xbm
similarity index 100%
rename from icons/xbm8x8/wifi_02.xbm
rename to icons/xbm/wifi_02.xbm
diff --git a/rc.lua.holo b/rc.lua.holo
index 6f2ff60..bec36a9 100755
--- a/rc.lua.holo
+++ b/rc.lua.holo
@@ -597,7 +597,7 @@ no_net_shown = true
 netwidget = wibox.widget.textbox()
 vicious.register(netwidget, vicious.widgets.net,
 function (widget, args)
-    if args["{wlan0 carrier}"] == 0 then
+    if args["{wlp3s0 carrier}"] == 0 then
        if no_net_shown == true then
          naughty.notify({ title = "wlan0", text = "No carrier",
          timeout = 7,
@@ -616,7 +616,7 @@ function (widget, args)
          netup_icon:set_image(beautiful.net_up)
          no_net_shown = true
        end
-       return white .. "<span font='Tamsyn 2'> </span>" .. args["{wlan0 down_kb}"] .. " - " .. args["{wlan0 up_kb}"] .. "<span font='Tamsyn 2'> </span>" .. coldef
+       return white .. "<span font='Tamsyn 2'> </span>" .. args["{wlp3s0 down_kb}"] .. " - " .. args["{wlp3s0 up_kb}"] .. "<span font='Tamsyn 2'> </span>" .. coldef
     end
 end, 3)
 networkwidget = wibox.widget.background()
diff --git a/rc.lua.rainbow b/rc.lua.rainbow
index 83b6a44..9473617 100755
--- a/rc.lua.rainbow
+++ b/rc.lua.rainbow
@@ -518,6 +518,7 @@ function alsawidget:notify ()
 		preset.title = alsawidget.channel .. " - Muted"
 	else
 		preset.title = alsawidget.channel .. " - " .. alsawidget._current_level .. "%"
+
 	end
 
   local int = math.modf (alsawidget._current_level / 100 * alsawidget.notifications.bar_size)
diff --git a/themes/holo/icons/bg_focus_noline.png b/themes/holo/icons/bg_focus_noline.png
index 3126d98..a867946 100644
Binary files a/themes/holo/icons/bg_focus_noline.png and b/themes/holo/icons/bg_focus_noline.png differ
diff --git a/themes/holo/theme.lua b/themes/holo/theme.lua
index 03a11f6..c1e052d 100644
--- a/themes/holo/theme.lua
+++ b/themes/holo/theme.lua
@@ -32,8 +32,8 @@ theme.tasklist_bg_focus                     = "png:" .. theme.icon_dir .. "/bg_f
 theme.textbox_widget_margin_top             = 1
 theme.awful_widget_height                   = 14
 theme.awful_widget_margin_top               = 2
-theme.menu_height                           = "16"
-theme.menu_width                            = "140"
+theme.menu_height                           = "20"
+theme.menu_width                            = "400"
 
 theme.widget_bg                             = theme.icon_dir .. "/bg_focus_noline.png"
 theme.awesome_icon                          = theme.icon_dir .. "/awesome_icon.png"
diff --git a/themes/rainbow/icons/square_sel.png b/themes/rainbow/icons/square_sel.png
index b49dac6..532719f 100644
Binary files a/themes/rainbow/icons/square_sel.png and b/themes/rainbow/icons/square_sel.png differ
diff --git a/themes/rainbow/icons/square_sel2.png b/themes/rainbow/icons/square_sel2.png
deleted file mode 100644
index 0485d33..0000000
Binary files a/themes/rainbow/icons/square_sel2.png and /dev/null differ
diff --git a/themes/rainbow/icons/square_unsel.png b/themes/rainbow/icons/square_unsel.png
index 0d08049..72dea5b 100644
Binary files a/themes/rainbow/icons/square_unsel.png and b/themes/rainbow/icons/square_unsel.png differ
diff --git a/themes/rainbow/icons/submenu.png b/themes/rainbow/icons/submenu.png
index 988ef9e..26ab82a 100644
Binary files a/themes/rainbow/icons/submenu.png and b/themes/rainbow/icons/submenu.png differ
diff --git a/themes/rainbow/theme.lua b/themes/rainbow/theme.lua
index 4fc5cac..a75d7af 100644
--- a/themes/rainbow/theme.lua
+++ b/themes/rainbow/theme.lua
@@ -21,8 +21,8 @@ theme.bg_urgent                     = "#FFFFFF"
 theme.border_width                  = "1"
 theme.border_normal                 = "#242424"
 theme.border_focus                  = "#EBEBFF"
-theme.taglist_fg_focus              = "#EBEBFF"
-theme.taglist_bg_focus              = "#3D3D3D"
+theme.taglist_fg_focus              = "#EDEFFF"
+theme.taglist_bg_focus              = "#242424"
 theme.menu_height                   = "16"
 theme.menu_width                    = "140"
 
@@ -37,10 +37,10 @@ theme.tasklist_disable_icon         = true
 
 theme.awesome_icon                  = theme.dir .. "/icons/awesome_icon.png"
 theme.menu_submenu_icon             = theme.dir .. "/icons/submenu.png"
-theme.taglist_squares_sel           = theme.dir .. "/icons/square_sel2.png"
+theme.taglist_squares_sel           = theme.dir .. "/icons/square_sel.png"
 theme.taglist_squares_unsel         = theme.dir .. "/icons/square_unsel.png"
-theme.vain_mail_notify              = theme.dir .. "/icons/mail_notify.png"
 theme.widget_no_net_notify          = theme.dir .. "/icons/no_net_notify.png"
+theme.vol_bg                        = theme.dir .. "/icons/vol_bg.png"
 
 theme.layout_txt_tile               = "[t]"
 theme.layout_txt_tileleft           = "[l]"