diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker
index 539d181..d7c5ebc 100644
--- a/rc.lua.powerarrow-darker
+++ b/rc.lua.powerarrow-darker
@@ -122,7 +122,7 @@ lain.widgets.calendar:attach(mytextclock, { font_size = 10 })
 mailicon = wibox.widget.imagebox(beautiful.widget_mail)
 mailicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn(mail) end)))
 --[[ commented because it needs to be set before use
-mailwidget = wibox.widget.background(lain.widgets.imap({
+mailwidget = lain.widgets.imap({
     timeout  = 180,
     server   = "server",
     mail     = "mail",
@@ -136,7 +136,7 @@ mailwidget = wibox.widget.background(lain.widgets.imap({
             mailicon:set_image(beautiful.widget_mail)
         end
     end
-}), "#313131")
+})
 ]]
 
 -- MPD
@@ -160,7 +160,6 @@ mpdwidget = lain.widgets.mpd({
         widget:set_markup(markup("#EA6F81", artist) .. title)
     end
 })
-mpdwidgetbg = wibox.widget.background(mpdwidget, "#313131")
 
 -- MEM
 memicon = wibox.widget.imagebox(beautiful.widget_mem)
@@ -172,11 +171,11 @@ memwidget = lain.widgets.mem({
 
 -- CPU
 cpuicon = wibox.widget.imagebox(beautiful.widget_cpu)
-cpuwidget = wibox.widget.background(lain.widgets.cpu({
+cpuwidget = lain.widgets.cpu({
     settings = function()
         widget:set_text(" " .. cpu_now.usage .. "% ")
     end
-}), "#313131")
+})
 
 -- Coretemp
 tempicon = wibox.widget.imagebox(beautiful.widget_temp)
@@ -193,7 +192,6 @@ fswidget = lain.widgets.fs({
         widget:set_text(" " .. fs_now.used .. "% ")
     end
 })
-fswidgetbg = wibox.widget.background(fswidget, "#313131")
 
 -- Battery
 baticon = wibox.widget.imagebox(beautiful.widget_battery)
@@ -235,13 +233,13 @@ volumewidget = lain.widgets.alsa({
 -- Net
 neticon = wibox.widget.imagebox(beautiful.widget_net)
 neticon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn_with_shell(iptraf) end)))
-netwidget = wibox.widget.background(lain.widgets.net({
+netwidget = lain.widgets.net({
     settings = function()
         widget:set_markup(markup("#7AC82E", " " .. net_now.received)
                           .. " " ..
                           markup("#46A8C3", " " .. net_now.sent .. " "))
     end
-}), "#313131")
+})
 
 -- Separators
 spr = wibox.widget.textbox(' ')
@@ -332,42 +330,39 @@ for s = 1, screen.count() do
     -- Widgets that are aligned to the upper right
     -- If you are moving widgets from a section with light grey background to dark grey or vice versa,
     -- use a replacement icon as appropriate from themes/powerarrow-darker/alticons so your icons match the bg.
+    
+    local right_layout_toggle = true
+    local function right_layout_add (...)  
+        local arg = {...}
+        if right_layout_toggle then
+            right_layout:add(arrl_ld)
+            for i, n in pairs(arg) do
+                right_layout:add(wibox.widget.background(n ,'#313131'))
+            end
+        else
+            right_layout:add(arrl_dl)
+            for i, n in pairs(arg) do
+                right_layout:add(n)
+            end
+        end
+        right_layout_toggle = not right_layout_toggle
+    end
+    
     local right_layout = wibox.layout.fixed.horizontal()
     if s == 1 then right_layout:add(wibox.widget.systray()) end
     right_layout:add(spr)
     right_layout:add(arrl)
-    right_layout:add(arrl_ld)
-    right_layout:add(mpdicon)
-    right_layout:add(mpdwidgetbg)
-    right_layout:add(arrl_dl)
-    right_layout:add(volicon)
-    right_layout:add(volumewidget)
-    right_layout:add(arrl_ld)
-    right_layout:add(mailicon)
-    --right_layout:add(mailwidget)
-    right_layout:add(arrl_dl)
-    right_layout:add(memicon)
-    right_layout:add(memwidget)
-    right_layout:add(arrl_ld)
-    right_layout:add(cpuicon)
-    right_layout:add(cpuwidget)
-    right_layout:add(arrl_dl)
-    right_layout:add(tempicon)
-    right_layout:add(tempwidget)
-    right_layout:add(arrl_ld)
-    right_layout:add(fsicon)
-    right_layout:add(fswidgetbg)
-    right_layout:add(arrl_dl)
-    right_layout:add(baticon)
-    right_layout:add(batwidget)
-    right_layout:add(arrl_ld)
-    right_layout:add(neticon)
-    right_layout:add(netwidget)
-    right_layout:add(arrl_dl)
-    right_layout:add(mytextclock)
-    right_layout:add(spr)
-    right_layout:add(arrl_ld)
-    right_layout:add(mylayoutbox[s])
+    right_layout_add(mpdicon, mpdwidget)
+    right_layout_add(voliconi, olumewidget)
+    --right_layout_add(mailicon, mailwidget)
+    right_layout_add(memicon, memwidget)
+    right_layout_add(cpuicon, cpuwidget)
+    right_layout_add(tempicon, tempwidget)
+    right_layout_add(fsicon, fswidget)
+    right_layout_add(baticon, batwidget)
+    right_layout_add(neticon,netwidget)
+    right_layout_add(mytextclock, spr)
+    right_layout_add(mylayoutbox[s])
 
     -- Now bring it all together (with the tasklist in the middle)
     local layout = wibox.layout.align.horizontal()
diff --git a/themes/powerarrow-darker/icons/cpu.png b/themes/powerarrow-darker/icons/cpu.png
index ea8bfef..35af1c3 100644
Binary files a/themes/powerarrow-darker/icons/cpu.png and b/themes/powerarrow-darker/icons/cpu.png differ
diff --git a/themes/powerarrow-darker/icons/dwindle.png b/themes/powerarrow-darker/icons/dwindle.png
index 6bf6508..649ea99 100644
Binary files a/themes/powerarrow-darker/icons/dwindle.png and b/themes/powerarrow-darker/icons/dwindle.png differ
diff --git a/themes/powerarrow-darker/icons/fairh.png b/themes/powerarrow-darker/icons/fairh.png
index 54a2f04..62d3d99 100644
Binary files a/themes/powerarrow-darker/icons/fairh.png and b/themes/powerarrow-darker/icons/fairh.png differ
diff --git a/themes/powerarrow-darker/icons/fairv.png b/themes/powerarrow-darker/icons/fairv.png
index 60dc36b..131dd0f 100644
Binary files a/themes/powerarrow-darker/icons/fairv.png and b/themes/powerarrow-darker/icons/fairv.png differ
diff --git a/themes/powerarrow-darker/icons/floating.png b/themes/powerarrow-darker/icons/floating.png
index a527fef..d25c47b 100644
Binary files a/themes/powerarrow-darker/icons/floating.png and b/themes/powerarrow-darker/icons/floating.png differ
diff --git a/themes/powerarrow-darker/icons/hdd.png b/themes/powerarrow-darker/icons/hdd.png
index ad7eca5..0fb6833 100644
Binary files a/themes/powerarrow-darker/icons/hdd.png and b/themes/powerarrow-darker/icons/hdd.png differ
diff --git a/themes/powerarrow-darker/icons/magnifier.png b/themes/powerarrow-darker/icons/magnifier.png
index fde2d74..60d3e0d 100644
Binary files a/themes/powerarrow-darker/icons/magnifier.png and b/themes/powerarrow-darker/icons/magnifier.png differ
diff --git a/themes/powerarrow-darker/icons/mail.png b/themes/powerarrow-darker/icons/mail.png
index 61abd6a..474e602 100644
Binary files a/themes/powerarrow-darker/icons/mail.png and b/themes/powerarrow-darker/icons/mail.png differ
diff --git a/themes/powerarrow-darker/icons/mail_on.png b/themes/powerarrow-darker/icons/mail_on.png
index c2b70ff..19106d7 100644
Binary files a/themes/powerarrow-darker/icons/mail_on.png and b/themes/powerarrow-darker/icons/mail_on.png differ
diff --git a/themes/powerarrow-darker/icons/max.png b/themes/powerarrow-darker/icons/max.png
index fde2d74..5b0a5b7 100644
Binary files a/themes/powerarrow-darker/icons/max.png and b/themes/powerarrow-darker/icons/max.png differ
diff --git a/themes/powerarrow-darker/icons/net.png b/themes/powerarrow-darker/icons/net.png
index 4c1b24e..bc42fdc 100644
Binary files a/themes/powerarrow-darker/icons/net.png and b/themes/powerarrow-darker/icons/net.png differ
diff --git a/themes/powerarrow-darker/icons/net_wired.png b/themes/powerarrow-darker/icons/net_wired.png
index a40d7f0..e8cc2bd 100644
Binary files a/themes/powerarrow-darker/icons/net_wired.png and b/themes/powerarrow-darker/icons/net_wired.png differ
diff --git a/themes/powerarrow-darker/icons/note.png b/themes/powerarrow-darker/icons/note.png
index 9163f32..baa29c3 100644
Binary files a/themes/powerarrow-darker/icons/note.png and b/themes/powerarrow-darker/icons/note.png differ
diff --git a/themes/powerarrow-darker/icons/note_on.png b/themes/powerarrow-darker/icons/note_on.png
index 790b7b4..1a7ab94 100644
Binary files a/themes/powerarrow-darker/icons/note_on.png and b/themes/powerarrow-darker/icons/note_on.png differ
diff --git a/themes/powerarrow-darker/icons/spiral.png b/themes/powerarrow-darker/icons/spiral.png
index 69d68b6..d9ee0f6 100644
Binary files a/themes/powerarrow-darker/icons/spiral.png and b/themes/powerarrow-darker/icons/spiral.png differ
diff --git a/themes/powerarrow-darker/icons/task.png b/themes/powerarrow-darker/icons/task.png
index 0376e42..9701b68 100644
Binary files a/themes/powerarrow-darker/icons/task.png and b/themes/powerarrow-darker/icons/task.png differ
diff --git a/themes/powerarrow-darker/icons/tile.png b/themes/powerarrow-darker/icons/tile.png
index 94a7410..922c05c 100644
Binary files a/themes/powerarrow-darker/icons/tile.png and b/themes/powerarrow-darker/icons/tile.png differ
diff --git a/themes/powerarrow-darker/icons/tilebottom.png b/themes/powerarrow-darker/icons/tilebottom.png
index d1d123f..6ec9cb8 100644
Binary files a/themes/powerarrow-darker/icons/tilebottom.png and b/themes/powerarrow-darker/icons/tilebottom.png differ
diff --git a/themes/powerarrow-darker/icons/tileleft.png b/themes/powerarrow-darker/icons/tileleft.png
index b988004..8e3d2d6 100644
Binary files a/themes/powerarrow-darker/icons/tileleft.png and b/themes/powerarrow-darker/icons/tileleft.png differ
diff --git a/themes/powerarrow-darker/icons/tiletop.png b/themes/powerarrow-darker/icons/tiletop.png
index f7e25b6..3da75a1 100644
Binary files a/themes/powerarrow-darker/icons/tiletop.png and b/themes/powerarrow-darker/icons/tiletop.png differ