diff --git a/.gitignore b/.gitignore
index 204da06..8861a41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 rc.lua
+theme-personal.lua
diff --git a/README.rst b/README.rst
index e900706..0afee13 100644
--- a/README.rst
+++ b/README.rst
@@ -51,7 +51,11 @@ Gallery
 
 .. image:: http://dotshare.it/public/images/uploads/650.png
 
-**Powerarrow Dark**, inspired by romockee_
+**Powerarrow**, porting of romockee_'s
+
+.. image:: http://dotshare.it/public/images/uploads/1453.png
+
+**Powerarrow Dark**
 
 .. image:: http://dotshare.it/public/images/uploads/649.jpg
 
diff --git a/themes/powerarrow-dark/theme.lua b/themes/powerarrow-dark/theme.lua
index c8e5b74..fe07f3e 100644
--- a/themes/powerarrow-dark/theme.lua
+++ b/themes/powerarrow-dark/theme.lua
@@ -36,7 +36,6 @@ theme.menu_submenu_icon                         = theme.dir .. "/icons/submenu.p
 theme.taglist_squares_sel                       = theme.dir .. "/icons/square_sel.png"
 theme.taglist_squares_unsel                     = theme.dir .. "/icons/square_unsel.png"
 theme.layout_tile                               = theme.dir .. "/icons/tile.png"
-theme.layout_tilegaps                           = theme.dir .. "/icons/tilegaps.png"
 theme.layout_tileleft                           = theme.dir .. "/icons/tileleft.png"
 theme.layout_tilebottom                         = theme.dir .. "/icons/tilebottom.png"
 theme.layout_tiletop                            = theme.dir .. "/icons/tiletop.png"
@@ -113,7 +112,7 @@ theme.cal = lain.widget.calendar({
 -- Mail IMAP check
 local mailicon = wibox.widget.imagebox(theme.widget_mail)
 --[[ commented because it needs to be set before use
-mailicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn(mail) end)))
+mailicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.spawn(mail) end)))
 local mail = lain.widget.imap({
     timeout  = 180,
     server   = "server",
@@ -133,7 +132,7 @@ local mail = lain.widget.imap({
 
 -- MPD
 local mpdicon = wibox.widget.imagebox(theme.widget_music)
-mpdicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn_with_shell(musicplr) end)))
+mpdicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.spawn_with_shell(musicplr) end)))
 theme.mpd = lain.widget.mpd({
     settings = function()
         if mpd_now.state == "play" then
diff --git a/themes/powerarrow/binclock.lua b/themes/powerarrow/binclock.lua
new file mode 100644
index 0000000..9d144dc
--- /dev/null
+++ b/themes/powerarrow/binclock.lua
@@ -0,0 +1,96 @@
+
+--[[
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2017, Luke Bonham                     
+      * (c) 2013, romockee                        
+                                                  
+--]]
+
+local gears    = require("gears")
+local wibox    = require("wibox")
+local date     = os.date
+local ipairs   = ipairs
+local math     = math
+local select   = select
+local string   = string
+
+local binclock = {}
+
+function binclock.dec2bin(num, bits)
+    local bits, t = bits or select(2, math.frexp(num)), {}
+    for b = bits, 1, -1 do
+        t[b] = math.fmod(num, 2)
+        num = (num - t[b]) / 2
+    end
+    return t
+end
+
+function binclock.paintdot(cr, val, shift)
+    local height = 0
+    for _, bit in ipairs(binclock.dec2bin(val, 4)) do
+        if bit >= 1 then
+            cr:set_source(gears.color(binclock.color_active))
+        else
+            cr:set_source(gears.color(binclock.color_inactive))
+        end
+        cr:rectangle(shift, height, binclock.dotsize, binclock.dotsize)
+        cr:fill()
+        height = height + binclock.dotsize + binclock.step
+    end
+end
+
+local function factory(args)
+    local args = args or {}
+
+    binclock.width          = args.width or 42
+    binclock.height         = args.height or 18
+    binclock.show_seconds   = args.show_seconds or false
+    binclock.color_active   = args.color_active or "#CCCCCC"
+    binclock.color_inactive = args.color_inactive or "#444444"
+    binclock.dotsize        = math.floor(binclock.height / 5)
+    binclock.step           = math.floor(binclock.dotsize / 3)
+
+    binclock.widget = wibox.widget {
+        fit = function(self, context, width, height)
+            return binclock.width, binclock.height
+        end,
+        draw = function(self, context, cr, width, height)
+            local t = date("*t")
+
+            local hour = string.format("%02d", t.hour)
+            local min  = string.format("%02d", t.min)
+            local sec  = string.format("%02d", t.sec)
+
+            local col_count = 4
+            if binclock.show_seconds then
+                col_count = 6
+            end
+            local step = math.floor((binclock.width - col_count * binclock.dotsize) / 8)
+
+            binclock.paintdot(cr, string.sub(hour, 1, 1), step, 2)
+            binclock.paintdot(cr, string.sub(hour, 2, 2), binclock.dotsize + 2 * step)
+
+            binclock.paintdot(cr, string.sub(min, 1, 1), binclock.dotsize * 2 + 4 * step)
+            binclock.paintdot(cr, string.sub(min, 2, 2), binclock.dotsize * 3 + 5 * step)
+
+            if binclock.show_seconds then
+                binclock.paintdot(cr, string.sub(sec, 1, 1), binclock.dotsize * 4 + 7 * step)
+                binclock.paintdot(cr, string.sub(sec, 2, 2), binclock.dotsize * 5 + 8 * step)
+            end
+        end,
+        layout = wibox.widget.base.make_widget
+    }
+
+    binclock.timer = gears.timer { timeout = binclock.show_seconds and 1 or 60 }
+
+    binclock.timer:connect_signal("timeout", function()
+        binclock.widget:emit_signal("widget::redraw_needed")
+    end)
+
+    binclock.timer:start()
+
+    return binclock
+end
+
+return factory
diff --git a/themes/powerarrow/icons/ac.png b/themes/powerarrow/icons/ac.png
new file mode 100644
index 0000000..453af4e
Binary files /dev/null and b/themes/powerarrow/icons/ac.png differ
diff --git a/themes/powerarrow/icons/awesome.png b/themes/powerarrow/icons/awesome.png
new file mode 100644
index 0000000..4cabb6c
Binary files /dev/null and b/themes/powerarrow/icons/awesome.png differ
diff --git a/themes/powerarrow/icons/battery.png b/themes/powerarrow/icons/battery.png
new file mode 100644
index 0000000..7dd78a5
Binary files /dev/null and b/themes/powerarrow/icons/battery.png differ
diff --git a/themes/powerarrow/icons/battery_empty.png b/themes/powerarrow/icons/battery_empty.png
new file mode 100644
index 0000000..763aa93
Binary files /dev/null and b/themes/powerarrow/icons/battery_empty.png differ
diff --git a/themes/powerarrow/icons/battery_low.png b/themes/powerarrow/icons/battery_low.png
new file mode 100644
index 0000000..626222f
Binary files /dev/null and b/themes/powerarrow/icons/battery_low.png differ
diff --git a/themes/powerarrow/icons/cpu.png b/themes/powerarrow/icons/cpu.png
new file mode 100644
index 0000000..c28a787
Binary files /dev/null and b/themes/powerarrow/icons/cpu.png differ
diff --git a/themes/powerarrow/icons/floating.png b/themes/powerarrow/icons/floating.png
new file mode 100644
index 0000000..146a87c
Binary files /dev/null and b/themes/powerarrow/icons/floating.png differ
diff --git a/themes/powerarrow/icons/fwd.png b/themes/powerarrow/icons/fwd.png
new file mode 100644
index 0000000..e9b875e
Binary files /dev/null and b/themes/powerarrow/icons/fwd.png differ
diff --git a/themes/powerarrow/icons/hdd.png b/themes/powerarrow/icons/hdd.png
new file mode 100644
index 0000000..db4458c
Binary files /dev/null and b/themes/powerarrow/icons/hdd.png differ
diff --git a/themes/powerarrow/icons/mail.png b/themes/powerarrow/icons/mail.png
new file mode 100644
index 0000000..4641aea
Binary files /dev/null and b/themes/powerarrow/icons/mail.png differ
diff --git a/themes/powerarrow/icons/mail_on.png b/themes/powerarrow/icons/mail_on.png
new file mode 100644
index 0000000..65dfb3c
Binary files /dev/null and b/themes/powerarrow/icons/mail_on.png differ
diff --git a/themes/powerarrow/icons/mem.png b/themes/powerarrow/icons/mem.png
new file mode 100644
index 0000000..ee6d480
Binary files /dev/null and b/themes/powerarrow/icons/mem.png differ
diff --git a/themes/powerarrow/icons/net.png b/themes/powerarrow/icons/net.png
new file mode 100644
index 0000000..769bfec
Binary files /dev/null and b/themes/powerarrow/icons/net.png differ
diff --git a/themes/powerarrow/icons/next.png b/themes/powerarrow/icons/next.png
new file mode 100644
index 0000000..9a62593
Binary files /dev/null and b/themes/powerarrow/icons/next.png differ
diff --git a/themes/powerarrow/icons/note.png b/themes/powerarrow/icons/note.png
new file mode 100644
index 0000000..19866aa
Binary files /dev/null and b/themes/powerarrow/icons/note.png differ
diff --git a/themes/powerarrow/icons/note_on.png b/themes/powerarrow/icons/note_on.png
new file mode 100644
index 0000000..aae5ca3
Binary files /dev/null and b/themes/powerarrow/icons/note_on.png differ
diff --git a/themes/powerarrow/icons/pacman.png b/themes/powerarrow/icons/pacman.png
new file mode 100644
index 0000000..bdb9b7b
Binary files /dev/null and b/themes/powerarrow/icons/pacman.png differ
diff --git a/themes/powerarrow/icons/pause.png b/themes/powerarrow/icons/pause.png
new file mode 100644
index 0000000..d4546e6
Binary files /dev/null and b/themes/powerarrow/icons/pause.png differ
diff --git a/themes/powerarrow/icons/phones.png b/themes/powerarrow/icons/phones.png
new file mode 100644
index 0000000..bec0e57
Binary files /dev/null and b/themes/powerarrow/icons/phones.png differ
diff --git a/themes/powerarrow/icons/play.png b/themes/powerarrow/icons/play.png
new file mode 100644
index 0000000..b228f74
Binary files /dev/null and b/themes/powerarrow/icons/play.png differ
diff --git a/themes/powerarrow/icons/prev.png b/themes/powerarrow/icons/prev.png
new file mode 100644
index 0000000..4c4ca40
Binary files /dev/null and b/themes/powerarrow/icons/prev.png differ
diff --git a/themes/powerarrow/icons/rwd.png b/themes/powerarrow/icons/rwd.png
new file mode 100644
index 0000000..ac3d6f4
Binary files /dev/null and b/themes/powerarrow/icons/rwd.png differ
diff --git a/themes/powerarrow/icons/scissors.png b/themes/powerarrow/icons/scissors.png
new file mode 100644
index 0000000..68bf003
Binary files /dev/null and b/themes/powerarrow/icons/scissors.png differ
diff --git a/themes/powerarrow/icons/square_sel.png b/themes/powerarrow/icons/square_sel.png
new file mode 100755
index 0000000..874a3a5
Binary files /dev/null and b/themes/powerarrow/icons/square_sel.png differ
diff --git a/themes/powerarrow/icons/square_unsel.png b/themes/powerarrow/icons/square_unsel.png
new file mode 100755
index 0000000..979642f
Binary files /dev/null and b/themes/powerarrow/icons/square_unsel.png differ
diff --git a/themes/powerarrow/icons/stop.png b/themes/powerarrow/icons/stop.png
new file mode 100644
index 0000000..207915b
Binary files /dev/null and b/themes/powerarrow/icons/stop.png differ
diff --git a/themes/powerarrow/icons/submenu.png b/themes/powerarrow/icons/submenu.png
new file mode 100755
index 0000000..e9a6b7c
Binary files /dev/null and b/themes/powerarrow/icons/submenu.png differ
diff --git a/themes/powerarrow/icons/task.png b/themes/powerarrow/icons/task.png
new file mode 100644
index 0000000..962b51a
Binary files /dev/null and b/themes/powerarrow/icons/task.png differ
diff --git a/themes/powerarrow/icons/temp.png b/themes/powerarrow/icons/temp.png
new file mode 100644
index 0000000..7952de8
Binary files /dev/null and b/themes/powerarrow/icons/temp.png differ
diff --git a/themes/powerarrow/icons/tile.png b/themes/powerarrow/icons/tile.png
new file mode 100644
index 0000000..d2fd6bd
Binary files /dev/null and b/themes/powerarrow/icons/tile.png differ
diff --git a/themes/powerarrow/icons/tilebottom.png b/themes/powerarrow/icons/tilebottom.png
new file mode 100644
index 0000000..30513ec
Binary files /dev/null and b/themes/powerarrow/icons/tilebottom.png differ
diff --git a/themes/powerarrow/icons/tileleft.png b/themes/powerarrow/icons/tileleft.png
new file mode 100644
index 0000000..ddbf7bb
Binary files /dev/null and b/themes/powerarrow/icons/tileleft.png differ
diff --git a/themes/powerarrow/icons/tiletop.png b/themes/powerarrow/icons/tiletop.png
new file mode 100644
index 0000000..f7671bf
Binary files /dev/null and b/themes/powerarrow/icons/tiletop.png differ
diff --git a/themes/powerarrow/icons/titlebar/close_focus.png b/themes/powerarrow/icons/titlebar/close_focus.png
new file mode 100644
index 0000000..e9b4179
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/close_focus.png differ
diff --git a/themes/powerarrow/icons/titlebar/close_normal.png b/themes/powerarrow/icons/titlebar/close_normal.png
new file mode 100644
index 0000000..cb0c3fa
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/close_normal.png differ
diff --git a/themes/powerarrow/icons/titlebar/floating_focus_active.png b/themes/powerarrow/icons/titlebar/floating_focus_active.png
new file mode 100644
index 0000000..0f9ee0d
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/floating_focus_active.png differ
diff --git a/themes/powerarrow/icons/titlebar/floating_focus_inactive.png b/themes/powerarrow/icons/titlebar/floating_focus_inactive.png
new file mode 100644
index 0000000..d254a73
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/floating_focus_inactive.png differ
diff --git a/themes/powerarrow/icons/titlebar/floating_normal_active.png b/themes/powerarrow/icons/titlebar/floating_normal_active.png
new file mode 100644
index 0000000..c5ce3de
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/floating_normal_active.png differ
diff --git a/themes/powerarrow/icons/titlebar/floating_normal_inactive.png b/themes/powerarrow/icons/titlebar/floating_normal_inactive.png
new file mode 100644
index 0000000..850b602
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/floating_normal_inactive.png differ
diff --git a/themes/powerarrow/icons/titlebar/maximized_focus_active.png b/themes/powerarrow/icons/titlebar/maximized_focus_active.png
new file mode 100644
index 0000000..7e8498a
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/maximized_focus_active.png differ
diff --git a/themes/powerarrow/icons/titlebar/maximized_focus_inactive.png b/themes/powerarrow/icons/titlebar/maximized_focus_inactive.png
new file mode 100644
index 0000000..f684470
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/maximized_focus_inactive.png differ
diff --git a/themes/powerarrow/icons/titlebar/maximized_normal_active.png b/themes/powerarrow/icons/titlebar/maximized_normal_active.png
new file mode 100644
index 0000000..4aa4196
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/maximized_normal_active.png differ
diff --git a/themes/powerarrow/icons/titlebar/maximized_normal_inactive.png b/themes/powerarrow/icons/titlebar/maximized_normal_inactive.png
new file mode 100644
index 0000000..bfe01a3
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/maximized_normal_inactive.png differ
diff --git a/themes/powerarrow/icons/titlebar/ontop_focus_active.png b/themes/powerarrow/icons/titlebar/ontop_focus_active.png
new file mode 100644
index 0000000..86e61b7
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/ontop_focus_active.png differ
diff --git a/themes/powerarrow/icons/titlebar/ontop_focus_inactive.png b/themes/powerarrow/icons/titlebar/ontop_focus_inactive.png
new file mode 100644
index 0000000..286d439
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/ontop_focus_inactive.png differ
diff --git a/themes/powerarrow/icons/titlebar/ontop_normal_active.png b/themes/powerarrow/icons/titlebar/ontop_normal_active.png
new file mode 100644
index 0000000..fcee772
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/ontop_normal_active.png differ
diff --git a/themes/powerarrow/icons/titlebar/ontop_normal_inactive.png b/themes/powerarrow/icons/titlebar/ontop_normal_inactive.png
new file mode 100644
index 0000000..a628626
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/ontop_normal_inactive.png differ
diff --git a/themes/powerarrow/icons/titlebar/sticky_focus_active.png b/themes/powerarrow/icons/titlebar/sticky_focus_active.png
new file mode 100644
index 0000000..b10e604
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/sticky_focus_active.png differ
diff --git a/themes/powerarrow/icons/titlebar/sticky_focus_inactive.png b/themes/powerarrow/icons/titlebar/sticky_focus_inactive.png
new file mode 100644
index 0000000..22d7453
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/sticky_focus_inactive.png differ
diff --git a/themes/powerarrow/icons/titlebar/sticky_normal_active.png b/themes/powerarrow/icons/titlebar/sticky_normal_active.png
new file mode 100644
index 0000000..aad079e
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/sticky_normal_active.png differ
diff --git a/themes/powerarrow/icons/titlebar/sticky_normal_inactive.png b/themes/powerarrow/icons/titlebar/sticky_normal_inactive.png
new file mode 100644
index 0000000..5f3e655
Binary files /dev/null and b/themes/powerarrow/icons/titlebar/sticky_normal_inactive.png differ
diff --git a/themes/powerarrow/theme.lua b/themes/powerarrow/theme.lua
new file mode 100644
index 0000000..e043e94
--- /dev/null
+++ b/themes/powerarrow/theme.lua
@@ -0,0 +1,371 @@
+
+--[[
+                                 
+     Powerarrow Awesome WM theme 
+     github.com/copycat-killer   
+                                 
+--]]
+
+local gears = require("gears")
+local lain  = require("lain")
+local awful = require("awful")
+local wibox = require("wibox")
+local os, math, string = os, math, string
+
+local theme                                     = {}
+theme.dir                                       = os.getenv("HOME") .. "/.config/awesome/themes/powerarrow"
+theme.wallpaper                                 = theme.dir .. "/wall.png"
+theme.font                                      = "xos4 Terminus 9"
+theme.fg_normal                                 = "#FEFEFE"
+theme.fg_focus                                  = "#32D6FF"
+theme.fg_urgent                                 = "#C83F11"
+theme.bg_normal                                 = "#222222"
+theme.bg_focus                                  = "#1E2320"
+theme.bg_urgent                                 = "#3F3F3F"
+theme.taglist_fg_focus                          = "#00CCFF"
+theme.tasklist_bg_focus                         = "#222222"
+theme.tasklist_fg_focus                         = "#00CCFF"
+theme.border_width                              = 1
+theme.border_normal                             = "#3F3F3F"
+theme.border_focus                              = "#6F6F6F"
+theme.border_marked                             = "#CC9393"
+theme.titlebar_bg_focus                         = "#3F3F3F"
+theme.titlebar_bg_normal                        = "#3F3F3F"
+theme.titlebar_bg_focus                         = theme.bg_focus
+theme.titlebar_bg_normal                        = theme.bg_normal
+theme.titlebar_fg_focus                         = theme.fg_focus
+theme.menu_height                               = 16
+theme.menu_width                                = 140
+theme.menu_submenu_icon                         = theme.dir .. "/icons/submenu.png"
+theme.awesome_icon                              = theme.dir .. "/icons/awesome.png"
+theme.taglist_squares_sel                       = theme.dir .. "/icons/square_sel.png"
+theme.taglist_squares_unsel                     = theme.dir .. "/icons/square_unsel.png"
+theme.layout_tile                               = theme.dir .. "/icons/tile.png"
+theme.layout_tileleft                           = theme.dir .. "/icons/tileleft.png"
+theme.layout_tilebottom                         = theme.dir .. "/icons/tilebottom.png"
+theme.layout_tiletop                            = theme.dir .. "/icons/tiletop.png"
+theme.layout_fairv                              = theme.dir .. "/icons/fairv.png"
+theme.layout_fairh                              = theme.dir .. "/icons/fairh.png"
+theme.layout_spiral                             = theme.dir .. "/icons/spiral.png"
+theme.layout_dwindle                            = theme.dir .. "/icons/dwindle.png"
+theme.layout_max                                = theme.dir .. "/icons/max.png"
+theme.layout_fullscreen                         = theme.dir .. "/icons/fullscreen.png"
+theme.layout_magnifier                          = theme.dir .. "/icons/magnifier.png"
+theme.layout_floating                           = theme.dir .. "/icons/floating.png"
+theme.widget_ac                                 = theme.dir .. "/icons/ac.png"
+theme.widget_battery                            = theme.dir .. "/icons/battery.png"
+theme.widget_battery_low                        = theme.dir .. "/icons/battery_low.png"
+theme.widget_battery_empty                      = theme.dir .. "/icons/battery_empty.png"
+theme.widget_mem                                = theme.dir .. "/icons/mem.png"
+theme.widget_cpu                                = theme.dir .. "/icons/cpu.png"
+theme.widget_temp                               = theme.dir .. "/icons/temp.png"
+theme.widget_net                                = theme.dir .. "/icons/net.png"
+theme.widget_hdd                                = theme.dir .. "/icons/hdd.png"
+theme.widget_music                              = theme.dir .. "/icons/note.png"
+theme.widget_music_on                           = theme.dir .. "/icons/note_on.png"
+theme.widget_music_pause                        = theme.dir .. "/icons/pause.png"
+theme.widget_music_stop                         = theme.dir .. "/icons/stop.png"
+theme.widget_vol                                = theme.dir .. "/icons/vol.png"
+theme.widget_vol_low                            = theme.dir .. "/icons/vol_low.png"
+theme.widget_vol_no                             = theme.dir .. "/icons/vol_no.png"
+theme.widget_vol_mute                           = theme.dir .. "/icons/vol_mute.png"
+theme.widget_mail                               = theme.dir .. "/icons/mail.png"
+theme.widget_mail_on                            = theme.dir .. "/icons/mail_on.png"
+theme.widget_task                               = theme.dir .. "/icons/task.png"
+theme.widget_scissors                           = theme.dir .. "/icons/scissors.png"
+theme.tasklist_plain_task_name                  = true
+theme.tasklist_disable_icon                     = true
+theme.useless_gap                               = 0
+theme.titlebar_close_button_focus               = theme.dir .. "/icons/titlebar/close_focus.png"
+theme.titlebar_close_button_normal              = theme.dir .. "/icons/titlebar/close_normal.png"
+theme.titlebar_ontop_button_focus_active        = theme.dir .. "/icons/titlebar/ontop_focus_active.png"
+theme.titlebar_ontop_button_normal_active       = theme.dir .. "/icons/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_inactive      = theme.dir .. "/icons/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_inactive     = theme.dir .. "/icons/titlebar/ontop_normal_inactive.png"
+theme.titlebar_sticky_button_focus_active       = theme.dir .. "/icons/titlebar/sticky_focus_active.png"
+theme.titlebar_sticky_button_normal_active      = theme.dir .. "/icons/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_inactive     = theme.dir .. "/icons/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_inactive    = theme.dir .. "/icons/titlebar/sticky_normal_inactive.png"
+theme.titlebar_floating_button_focus_active     = theme.dir .. "/icons/titlebar/floating_focus_active.png"
+theme.titlebar_floating_button_normal_active    = theme.dir .. "/icons/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_inactive   = theme.dir .. "/icons/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_inactive  = theme.dir .. "/icons/titlebar/floating_normal_inactive.png"
+theme.titlebar_maximized_button_focus_active    = theme.dir .. "/icons/titlebar/maximized_focus_active.png"
+theme.titlebar_maximized_button_normal_active   = theme.dir .. "/icons/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_inactive  = theme.dir .. "/icons/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_inactive = theme.dir .. "/icons/titlebar/maximized_normal_inactive.png"
+
+local markup = lain.util.markup
+local separators = lain.util.separators
+
+-- Textclock
+local binclock = require("themes.powerarrow.binclock"){
+    height = 16,
+    show_seconds = true,
+    color_active = theme.fg_normal,
+    color_inactive = theme.bg_focus
+}
+
+-- Calendar
+theme.cal = lain.widget.calendar({
+    --cal = "cal --color=always",
+    attach_to = { binclock.widget },
+    notification_preset = {
+        font = "xos4 Terminus 10",
+        fg   = theme.fg_normal,
+        bg   = theme.bg_normal
+    }
+})
+
+-- Taskwarrior
+local task = wibox.widget.imagebox(theme.widget_task)
+lain.widget.contrib.task.attach(task)
+task:buttons(awful.util.table.join(awful.button({}, 1, lain.widget.contrib.task.prompt)))
+
+-- Scissors (xsel copy and paste)
+local scissors = wibox.widget.imagebox(theme.widget_scissors)
+scissors:buttons(awful.util.table.join(awful.button({}, 1, function() awful.spawn("xsel | xsel -i -b") end)))
+
+-- Mail IMAP check
+local mailicon = wibox.widget.imagebox(theme.widget_mail)
+--[[ commented because it needs to be set before use
+mailicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.spawn(mail) end)))
+local mail = lain.widget.imap({
+    timeout  = 180,
+    server   = "server",
+    mail     = "mail",
+    password = "keyring get mail",
+    settings = function()
+        if mailcount > 0 then
+            widget:set_text(" " .. mailcount .. " ")
+            mailicon:set_image(theme.widget_mail_on)
+        else
+            widget:set_text("")
+            mailicon:set_image(theme.widget_mail)
+        end
+    end
+})
+--]]
+
+-- ALSA volume
+theme.volume = lain.widget.alsabar({
+    --togglechannel = "IEC958,3",
+    notification_preset = { font = "xos4 Terminus 10", fg = theme.fg_normal },
+})
+
+-- MPD
+local musicplr = awful.util.terminal .. " -title Music -g 130x34-320+16 -e ncmpcpp"
+local mpdicon = wibox.widget.imagebox(theme.widget_music)
+mpdicon:buttons(awful.util.table.join(
+    awful.button({ modkey }, 1, function () awful.spawn_with_shell(musicplr) end),
+    awful.button({ }, 1, function () awful.spawn_with_shell("mpc prev") end),
+    awful.button({ }, 2, function () awful.spawn_with_shell("mpc toggle") end),
+    awful.button({ }, 3, function () awful.spawn_with_shell("mpc next") end)))
+theme.mpd = lain.widget.mpd({
+    settings = function()
+        if mpd_now.state == "play" then
+            artist = " " .. mpd_now.artist .. " "
+            title  = mpd_now.title  .. " "
+            mpdicon:set_image(theme.widget_music_on)
+            widget:set_markup(markup.font(theme.font, markup("#FF8466", artist) .. " " .. title))
+        elseif mpd_now.state == "pause" then
+            widget:set_markup(markup.font(theme.font, " mpd paused "))
+            mpdicon:set_image(theme.widget_music_pause)
+        else
+            widget:set_text("")
+            mpdicon:set_image(theme.widget_music)
+        end
+    end
+})
+
+-- MEM
+local memicon = wibox.widget.imagebox(theme.widget_mem)
+local mem = lain.widget.mem({
+    settings = function()
+        widget:set_markup(markup.font(theme.font, " " .. mem_now.used .. "MB "))
+    end
+})
+
+-- CPU
+local cpuicon = wibox.widget.imagebox(theme.widget_cpu)
+local cpu = lain.widget.cpu({
+    settings = function()
+        widget:set_markup(markup.font(theme.font, " " .. cpu_now.usage .. "% "))
+    end
+})
+
+--[[ Coretemp (lm_sensors, per core)
+local tempwidget = awful.widget.watch({awful.util.shell, '-c', 'sensors | grep Core'}, 30,
+function(widget, stdout)
+    local temps = ""
+    for line in stdout:gmatch("[^\r\n]+") do
+        temps = temps .. line:match("+(%d+).*°C")  .. "° " -- in Celsius
+    end
+    widget:set_markup(markup.font(theme.font, " " .. temps))
+end)
+--]]
+-- Coretemp (lain, average)
+local temp = lain.widget.temp({
+    settings = function()
+        widget:set_markup(markup.font(theme.font, " " .. coretemp_now .. "°C "))
+    end
+})
+--]]
+local tempicon = wibox.widget.imagebox(theme.widget_temp)
+
+-- / fs
+local fsicon = wibox.widget.imagebox(theme.widget_hdd)
+theme.fs = lain.widget.fs({
+    options  = "--exclude-type=tmpfs",
+    notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "xos4 Terminus 10" },
+    settings = function()
+        widget:set_markup(markup.font(theme.font, " " .. fs_now.available_gb .. "GB "))
+    end
+})
+
+-- Battery
+local baticon = wibox.widget.imagebox(theme.widget_battery)
+local bat = lain.widget.bat({
+    settings = function()
+        if bat_now.status ~= "N/A" then
+            if bat_now.ac_status == 1 then
+                widget:set_markup(markup.font(theme.font, " AC "))
+                baticon:set_image(theme.widget_ac)
+                return
+            elseif not bat_now.perc and tonumber(bat_now.perc) <= 5 then
+                baticon:set_image(theme.widget_battery_empty)
+            elseif not bat_now.perc and tonumber(bat_now.perc) <= 15 then
+                baticon:set_image(theme.widget_battery_low)
+            else
+                baticon:set_image(theme.widget_battery)
+            end
+            widget:set_markup(markup.font(theme.font, " " .. bat_now.perc .. "% "))
+        else
+            widget:set_markup()
+            baticon:set_image(theme.widget_ac)
+        end
+    end
+})
+
+-- Net
+local neticon = wibox.widget.imagebox(theme.widget_net)
+local net = lain.widget.net({
+    settings = function()
+        widget:set_markup(markup.fontfg(theme.font, "#FEFEFE", " " .. net_now.received .. " ↓↑ " .. net_now.sent .. " "))
+    end
+})
+
+-- Separators
+local arrow = separators.arrow_left
+
+function theme.powerline_rl(cr, width, height)
+    local arrow_depth, offset = height/2, 0
+
+    -- Avoid going out of the (potential) clip area
+    if arrow_depth < 0 then
+        width  =  width + 2*arrow_depth
+        offset = -arrow_depth
+    end
+
+    cr:move_to(offset + arrow_depth         , 0        )
+    cr:line_to(offset + width               , 0        )
+    cr:line_to(offset + width - arrow_depth , height/2 )
+    cr:line_to(offset + width               , height   )
+    cr:line_to(offset + arrow_depth         , height   )
+    cr:line_to(offset                       , height/2 )
+
+    cr:close_path()
+end
+
+local function pl(widget, bgcolor, padding)
+    return wibox.container.background(wibox.container.margin(widget, 16, 16), bgcolor, theme.powerline_rl)
+end
+
+function theme.at_screen_connect(s)
+    -- Quake application
+    s.quake = lain.util.quake({ app = awful.util.terminal })
+
+    -- If wallpaper is a function, call it with the screen
+    if type(theme.wallpaper) == "function" then
+        theme.wallpaper = theme.wallpaper(s)
+    end
+    gears.wallpaper.maximized(theme.wallpaper, s, true)
+
+    -- Tags
+    awful.tag(awful.util.tagnames, s, awful.layout.layouts)
+
+    -- Create a promptbox for each screen
+    s.mypromptbox = awful.widget.prompt()
+    -- Create an imagebox widget which will contains an icon indicating which layout we're using.
+    -- We need one layoutbox per screen.
+    s.mylayoutbox = awful.widget.layoutbox(s)
+    s.mylayoutbox:buttons(awful.util.table.join(
+                           awful.button({ }, 1, function () awful.layout.inc( 1) end),
+                           awful.button({ }, 3, function () awful.layout.inc(-1) end),
+                           awful.button({ }, 4, function () awful.layout.inc( 1) end),
+                           awful.button({ }, 5, function () awful.layout.inc(-1) end)))
+    -- Create a taglist widget
+    s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
+
+    -- Create a tasklist widget
+    s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, awful.util.tasklist_buttons)
+
+    -- Create the wibox
+    s.mywibox = awful.wibar({ position = "top", screen = s, height = 16, bg = theme.bg_normal, fg = theme.fg_normal })
+
+    -- Add widgets to the wibox
+    s.mywibox:setup {
+        layout = wibox.layout.align.horizontal,
+        { -- Left widgets
+            layout = wibox.layout.fixed.horizontal,
+            --spr,
+            s.mytaglist,
+            s.mypromptbox,
+            spr,
+        },
+        s.mytasklist, -- Middle widget
+        { -- Right widgets
+            layout = wibox.layout.fixed.horizontal,
+            wibox.widget.systray(),
+            wibox.container.margin(scissors, 4, 8),
+            --[[[[ using shapes
+            pl(wibox.widget { mpdicon, theme.mpd.widget, layout = wibox.layout.align.horizontal }, "#343434"),
+            pl(task, "#343434"),
+            --pl(wibox.widget { mailicon, mail and mail.widget, layout = wibox.layout.align.horizontal }, "#343434"),
+            pl(wibox.widget { memicon, mem.widget, layout = wibox.layout.align.horizontal }, "#777E76"),
+            pl(wibox.widget { cpuicon, cpu.widget, layout = wibox.layout.align.horizontal }, "#4B696D"),
+            pl(wibox.widget { tempicon, temp.widget, layout = wibox.layout.align.horizontal }, "#4B3B51"),
+            pl(wibox.widget { fsicon, theme.fs.widget, layout = wibox.layout.align.horizontal }, "#CB755B"),
+            pl(wibox.widget { baticon, bat.widget, layout = wibox.layout.align.horizontal }, "#8DAA9A"),
+            pl(wibox.widget { neticon, net.widget, layout = wibox.layout.align.horizontal }, "#C0C0A2"),
+            pl(binclock.widget, "#777E76"),
+            --]]
+            -- using separators
+            arrow(theme.bg_normal, "#343434"),
+            wibox.container.background(wibox.container.margin(wibox.widget { mailicon, mail and mail.widget, layout = wibox.layout.align.horizontal }, 4, 7), "#343434"),
+            arrow("#343434", theme.bg_normal),
+            wibox.container.background(wibox.container.margin(wibox.widget { mpdicon, theme.mpd.widget, layout = wibox.layout.align.horizontal }, 3, 6), theme.bg_focus),
+            arrow(theme.bg_normal, "#343434"),
+            wibox.container.background(wibox.container.margin(task, 3, 7), "#343434"),
+            arrow("#343434", "#777E76"),
+            wibox.container.background(wibox.container.margin(wibox.widget { memicon, mem.widget, layout = wibox.layout.align.horizontal }, 2, 3), "#777E76"),
+            arrow("#777E76", "#4B696D"),
+            wibox.container.background(wibox.container.margin(wibox.widget { cpuicon, cpu.widget, layout = wibox.layout.align.horizontal }, 3, 4), "#4B696D"),
+            arrow("#4B696D", "#4B3B51"),
+            wibox.container.background(wibox.container.margin(wibox.widget { tempicon, temp.widget, layout = wibox.layout.align.horizontal }, 4, 4), "#4B3B51"),
+            arrow("#4B3B51", "#CB755B"),
+            wibox.container.background(wibox.container.margin(wibox.widget { fsicon, theme.fs.widget, layout = wibox.layout.align.horizontal }, 3, 3), "#CB755B"),
+            arrow("#CB755B", "#8DAA9A"),
+            wibox.container.background(wibox.container.margin(wibox.widget { baticon, bat.widget, layout = wibox.layout.align.horizontal }, 3, 3), "#8DAA9A"),
+            arrow("#8DAA9A", "#C0C0A2"),
+            wibox.container.background(wibox.container.margin(wibox.widget { nil, neticon, net.widget, layout = wibox.layout.align.horizontal }, 3, 3), "#C0C0A2"),
+            arrow("#C0C0A2", "#777E76"),
+            wibox.container.background(wibox.container.margin(binclock.widget, 4, 8), "#777E76"),
+            arrow("#777E76", "alpha"),
+            --]]
+            s.mylayoutbox,
+        },
+    }
+end
+
+return theme
diff --git a/themes/powerarrow/wall.png b/themes/powerarrow/wall.png
new file mode 100644
index 0000000..c503913
Binary files /dev/null and b/themes/powerarrow/wall.png differ
diff --git a/themes/vertex/theme.lua b/themes/vertex/theme.lua
index 02db31c..7b5f6dc 100644
--- a/themes/vertex/theme.lua
+++ b/themes/vertex/theme.lua
@@ -183,7 +183,7 @@ theme.mpd = lain.widget.mpd({
 -- ALSA volume
 local volicon = wibox.widget.imagebox()
 theme.volume = lain.widget.alsabar({
-    togglechannel = "IEC958,3",
+    --togglechannel = "IEC958,3",
     notification_preset = { font = "Monospace 12", fg = theme.fg_normal },
     settings = function()
         local index, perc = "", tonumber(volume_now.level) or 0