diff --git a/lain b/lain
index bf3a9ba..229d254 160000
--- a/lain
+++ b/lain
@@ -1 +1 @@
-Subproject commit bf3a9ba5efb874ad6370a3083afd409361e2912a
+Subproject commit 229d2545dd399b52c6128a823657c6266fbbe8a9
diff --git a/rc.lua.blackburn b/rc.lua.blackburn
index d1de877..9f53ffc 100644
--- a/rc.lua.blackburn
+++ b/rc.lua.blackburn
@@ -151,7 +151,7 @@ lain.widgets.calendar.attach(mytextclock, {
 
 --[[ Mail IMAP check
 -- commented because it needs to be set before use
-local mailwidget = lain.widgets.imap({
+local mail = lain.widgets.imap({
     timeout  = 180,
     server   = "server",
     mail     = "mail",
@@ -168,10 +168,10 @@ local mailwidget = lain.widgets.imap({
         widget:set_markup(markup(gray, mail) .. count)
     end
 })
-]]
+--]]
 
 -- MPD
-local mpdwidget = lain.widgets.mpd({
+local mpd = lain.widgets.mpd({
     settings = function()
         artist = mpd_now.artist .. " "
         title  = mpd_now.title  .. "  "
@@ -207,7 +207,7 @@ local fshome = lain.widgets.fs({
 })
 
 -- Battery
-local batwidget = lain.widgets.bat({
+local bat = lain.widgets.bat({
     settings = function()
         bat_header = " Bat "
         bat_p      = bat_now.perc .. " "
@@ -366,12 +366,12 @@ awful.screen.connect_for_each_screen(function(s)
             layout = wibox.layout.fixed.horizontal,
             wibox.widget.systray(),
             first,
-            mpdwidget,
-            --mailwidget,
+            mpd.widget,
+            --mail,
             myweather.icon,
-            myweather,
+            myweather.widget,
             fshome,
-            batwidget,
+            bat,
             volume,
             mytextclock,
         },
@@ -562,22 +562,22 @@ globalkeys = awful.util.table.join(
     awful.key({ altkey, "Control" }, "Up",
         function ()
             awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Down",
         function ()
             awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Left",
         function ()
             awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Right",
         function ()
             awful.spawn.with_shell("mpc next || ncmpc next || pms next")
-            mpdwidget.update()
+            mpd.update()
         end),
     --]]
 
diff --git a/rc.lua.copland b/rc.lua.copland
index 087ff26..5234811 100644
--- a/rc.lua.copland
+++ b/rc.lua.copland
@@ -155,7 +155,7 @@ lain.widgets.calendar.attach(mytextclock, {
 
 --[[ Mail IMAP check
 -- commented because it needs to be set before use
-local mailwidget = lain.widgets.imap({
+local mail = lain.widgets.imap({
     timeout  = 180,
     server   = "server",
     mail     = "mail",
@@ -172,11 +172,11 @@ local mailwidget = lain.widgets.imap({
         widget:set_markup(markup(blue, mail) .. count)
     end
 })
-]]
+--]]
 
 -- MPD
 local mpdicon = wibox.widget.imagebox()
-local mpdwidget = lain.widgets.mpd({
+local mpd = lain.widgets.mpd({
     settings = function()
         if mpd_now.state == "play" then
             title = mpd_now.title
@@ -415,9 +415,9 @@ awful.screen.connect_for_each_screen(function(s)
             layout = wibox.layout.fixed.horizontal,
             wibox.widget.systray(),
             small_spr,
-            --mailwidget,
+            --mail.widget,
             mpdicon,
-            mpdwidget,
+            mpd,
             baticon,
             batwidget,
             bar_spr,
@@ -616,22 +616,22 @@ globalkeys = awful.util.table.join(
     awful.key({ altkey, "Control" }, "Up",
         function ()
             awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Down",
         function ()
             awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Left",
         function ()
             awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Right",
         function ()
             awful.spawn.with_shell("mpc next || ncmpc next || pms next")
-            mpdwidget.update()
+            mpd.update()
         end),
     --]]
 
diff --git a/rc.lua.dremora b/rc.lua.dremora
index f5f4c6c..920c55d 100644
--- a/rc.lua.dremora
+++ b/rc.lua.dremora
@@ -153,7 +153,7 @@ lain.widgets.calendar.attach(mytextclock, {
 
 --[[ Mail IMAP check
 -- commented because it needs to be set before use
-local mailwidget = lain.widgets.imap({
+local mail = lain.widgets.imap({
     timeout  = 180,
     server   = "server",
     mail     = "mail",
@@ -171,10 +171,10 @@ local mailwidget = lain.widgets.imap({
         widget:set_markup(markup(gray, mail) .. markup(white, count))
     end
 })
-]]
+--]]
 
 -- MPD
-local mpdwidget = lain.widgets.mpd({
+local mpd = lain.widgets.mpd({
     settings = function()
         mpd_notification_preset.fg = white
         artist = mpd_now.artist .. " "
@@ -211,7 +211,7 @@ local fshome = lain.widgets.fs({
 })
 
 -- Battery
-local batwidget = lain.widgets.bat({
+local bat = lain.widgets.bat({
     settings = function()
         bat_header = " Bat "
         bat_p      = bat_now.perc .. " "
@@ -353,11 +353,11 @@ awful.screen.connect_for_each_screen(function(s)
             layout = wibox.layout.fixed.horizontal,
             wibox.widget.systray(),
             first,
-            mpdwidget,
-            --mailwidget,
-            fshome,
-            batwidget,
-            volume,
+            mpd.widget,
+            --mail.widget,
+            fshome.widget,
+            bat.widget,
+            volume.widget,
             mytextclock,
         },
     }
@@ -547,22 +547,22 @@ globalkeys = awful.util.table.join(
     awful.key({ altkey, "Control" }, "Up",
         function ()
             awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Down",
         function ()
             awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Left",
         function ()
             awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Right",
         function ()
             awful.spawn.with_shell("mpc next || ncmpc next || pms next")
-            mpdwidget.update()
+            mpd.update()
         end),
     --]]
 
diff --git a/rc.lua.holo b/rc.lua.holo
index 70d3d95..d922b7f 100644
--- a/rc.lua.holo
+++ b/rc.lua.holo
@@ -157,7 +157,7 @@ lain.widgets.calendar.attach(calendarwidget, { notification_preset = { fg = "#FF
 
 --[[ Mail IMAP check
 -- commented because it needs to be set before use
-local mailwidget = lain.widgets.imap({
+local mail = lain.widgets.imap({
     timeout  = 180,
     server   = "server",
     mail     = "mail",
@@ -175,7 +175,7 @@ local mailwidget = lain.widgets.imap({
         widget:set_markup(markup(blue, mail) .. markup("#FFFFFF", count))
     end
 })
-]]
+--]]
 
 -- MPD
 local mpd_icon = awful.widget.launcher({ image = beautiful.mpd, command = musicplr })
@@ -184,7 +184,7 @@ local next_icon = wibox.widget.imagebox(beautiful.nex)
 local stop_icon = wibox.widget.imagebox(beautiful.stop)
 local pause_icon = wibox.widget.imagebox(beautiful.pause)
 local play_pause_icon = wibox.widget.imagebox(beautiful.play)
-local mpdwidget = lain.widgets.mpd({
+local mpd = lain.widgets.mpd({
     settings = function ()
         if mpd_now.state == "play" then
             mpd_now.artist = mpd_now.artist:upper():gsub("&.-;", string.lower)
@@ -206,7 +206,7 @@ local mpdwidget = lain.widgets.mpd({
         end
     end
 })
-local musicbg = wibox.container.background(mpdwidget, beautiful.bg_focus, shape.rectangle)
+local musicbg = wibox.container.background(mpd.widget, beautiful.bg_focus, shape.rectangle)
 local musicwidget = wibox.container.margin(musicbg, 0, 0, 5, 5)
 
 musicwidget:buttons(awful.util.table.join(awful.button({ }, 1,
@@ -214,28 +214,28 @@ function () awful.spawn.with_shell(musicplr) end)))
 prev_icon:buttons(awful.util.table.join(awful.button({}, 1,
 function ()
     awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
-    mpdwidget.update()
+    mpd.update()
 end)))
 next_icon:buttons(awful.util.table.join(awful.button({}, 1,
 function ()
     awful.spawn.with_shell("mpc next || ncmpc next || pms next")
-    mpdwidget.update()
+    mpd.update()
 end)))
 stop_icon:buttons(awful.util.table.join(awful.button({}, 1,
 function ()
     play_pause_icon:set_image(beautiful.play)
     awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
-    mpdwidget.update()
+    mpd.update()
 end)))
 play_pause_icon:buttons(awful.util.table.join(awful.button({}, 1,
 function ()
     awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
-    mpdwidget.update()
+    mpd.update()
 end)))
 
 -- Battery
 --[[
-local batwidget = lain.widgets.bat({
+local bat = lain.widgets.bat({
     settings = function()
         bat_header = " Bat "
         bat_p      = bat_now.perc .. " "
@@ -269,31 +269,31 @@ volumewidget.shape_border_color = beautiful.tasklist_bg_normal
 
 -- CPU
 local cpu_icon = wibox.widget.imagebox(beautiful.cpu)
-local cpu_widget = lain.widgets.cpu({
+local cpu = lain.widgets.cpu({
     settings = function()
         widget:set_markup(space3 .. "CPU " .. cpu_now.usage
                           .. "% " .. markup.font("Tamsyn 5", " "))
     end
 })
-local cpubg = wibox.container.background(cpu_widget, beautiful.bg_focus, shape.rectangle)
+local cpubg = wibox.container.background(cpu.widget, beautiful.bg_focus, shape.rectangle)
 local cpuwidget = wibox.container.margin(cpubg, 0, 0, 5, 5)
 
 -- Net
 local netdown_icon = wibox.widget.imagebox(beautiful.net_down)
 local netup_icon = wibox.widget.imagebox(beautiful.net_up)
-local netwidget = lain.widgets.net({
+local net = lain.widgets.net({
     settings = function()
         widget:set_markup(markup.font("Tamsyn 1", " ") .. net_now.received .. " - "
                           .. net_now.sent .. markup.font("Tamsyn 2", " "))
     end
 })
-local netbg = wibox.container.background(netwidget, beautiful.bg_focus, shape.rectangle)
+local netbg = wibox.container.background(net.widget, beautiful.bg_focus, shape.rectangle)
 local networkwidget = wibox.container.margin(netbg, 0, 0, 5, 5)
 
 -- Weather
 local myweather = lain.widgets.weather({
     city_id = 2643743, -- placeholder (London)
-    notification_preset = { font = "Monospace 9" },
+    notification_preset = { font = "Monospace 9", position = "bottom_right" },
 })
 
 -- Separators
@@ -419,8 +419,8 @@ awful.screen.connect_for_each_screen(function(s)
         { -- Right widgets
             layout = wibox.layout.fixed.horizontal,
             wibox.widget.systray(),
-            --mailwidget,
-            --batwidget,
+            --mail,
+            --bat,
             spr_right,
             musicwidget,
             bar,
@@ -652,22 +652,22 @@ globalkeys = awful.util.table.join(
     awful.key({ altkey, "Control" }, "Up",
         function ()
             awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Down",
         function ()
             awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Left",
         function ()
             awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Right",
         function ()
             awful.spawn.with_shell("mpc next || ncmpc next || pms next")
-            mpdwidget.update()
+            mpd.update()
         end),
     --]]
 
diff --git a/rc.lua.multicolor b/rc.lua.multicolor
index e741554..94dee4d 100644
--- a/rc.lua.multicolor
+++ b/rc.lua.multicolor
@@ -188,7 +188,7 @@ local fsroot = lain.widgets.fs({
 --[[ Mail IMAP check
 -- commented because it needs to be set before use
 local mailicon = wibox.widget.imagebox()
-local mailwidget = lain.widgets.imap({
+local mail = lain.widgets.imap({
     timeout  = 180,
     server   = "server",
     mail     = "mail",
@@ -206,11 +206,11 @@ local mailwidget = lain.widgets.imap({
         end
     end
 })
-]]
+--]]
 
 -- CPU
 local cpuicon = wibox.widget.imagebox(beautiful.widget_cpu)
-local cpuwidget = lain.widgets.cpu({
+local cpu = lain.widgets.cpu({
     settings = function()
         widget:set_markup(markup("#e33a6e", cpu_now.usage .. "% "))
     end
@@ -218,7 +218,7 @@ local cpuwidget = lain.widgets.cpu({
 
 -- Coretemp
 local tempicon = wibox.widget.imagebox(beautiful.widget_temp)
-local tempwidget = lain.widgets.temp({
+local temp = lain.widgets.temp({
     settings = function()
         widget:set_markup(markup("#f1af5f", coretemp_now .. "°C "))
     end
@@ -226,7 +226,7 @@ local tempwidget = lain.widgets.temp({
 
 -- Battery
 local baticon = wibox.widget.imagebox(beautiful.widget_batt)
-local batwidget = lain.widgets.bat({
+local bat = lain.widgets.bat({
     settings = function()
         if bat_now.perc ~= "N/A" then
             bat_now.perc = bat_now.perc .. "%"
@@ -270,7 +270,7 @@ local netupinfo = lain.widgets.net({
 
 -- MEM
 local memicon = wibox.widget.imagebox(beautiful.widget_mem)
-local memwidget = lain.widgets.mem({
+local memory = lain.widgets.mem({
     settings = function()
         widget:set_markup(markup("#e0da37", mem_now.used .. "M "))
     end
@@ -407,26 +407,26 @@ awful.screen.connect_for_each_screen(function(s)
         { -- Right widgets
             layout = wibox.layout.fixed.horizontal,
             wibox.widget.systray(),
-            mailicon,
-            mailwidget,
+            --mailicon,
+            --mail.widget,
             netdownicon,
             netdowninfo,
             netupicon,
-            netupinfo,
+            netupinfo.widget,
             volicon,
             volume,
             memicon,
-            memwidget,
+            memory.widget,
             cpuicon,
-            cpuwidget,
+            cpu.widget,
             fsicon,
-            fsroot,
+            fsroot.widget,
             weathericon,
-            myweather,
+            myweather.widget,
             tempicon,
-            tempwidget,
+            temp.widget,
             baticon,
-            batwidget,
+            bat.widget,
             clockicon,
             mytextclock,
         },
diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker
index 7e54fc3..c7cc927 100644
--- a/rc.lua.powerarrow-darker
+++ b/rc.lua.powerarrow-darker
@@ -139,8 +139,7 @@ local separators = lain.util.separators
 
 local clockicon = wibox.widget.imagebox(beautiful.widget_clock)
 --local mytextclock = wibox.widget.textclock(" %a %d %b  %H:%M")
-
-local mytextclock = lain.widgets.abase({
+local clock = lain.widgets.abase({
     timeout  = 60,
     cmd      = " date +'%a %d %b %R'",
     settings = function()
@@ -159,9 +158,9 @@ lain.widgets.calendar.attach(mytextclock, {
 
 -- Mail IMAP check
 local 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
-local mailwidget = lain.widgets.imap({
+mailicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn(mail) end)))
+local mail = lain.widgets.imap({
     timeout  = 180,
     server   = "server",
     mail     = "mail",
@@ -176,12 +175,12 @@ local mailwidget = lain.widgets.imap({
         end
     end
 })
-]]
+--]]
 
 -- MPD
 local mpdicon = wibox.widget.imagebox(beautiful.widget_music)
 mpdicon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn_with_shell(musicplr) end)))
-local mpdwidget = lain.widgets.mpd({
+local mpd = lain.widgets.mpd({
     settings = function()
         if mpd_now.state == "play" then
             artist = " " .. mpd_now.artist .. " "
@@ -202,7 +201,7 @@ local mpdwidget = lain.widgets.mpd({
 
 -- MEM
 local memicon = wibox.widget.imagebox(beautiful.widget_mem)
-local memwidget = lain.widgets.mem({
+local mem = lain.widgets.mem({
     settings = function()
         widget:set_text(" " .. mem_now.used .. "MB ")
     end
@@ -210,7 +209,7 @@ local memwidget = lain.widgets.mem({
 
 -- CPU
 local cpuicon = wibox.widget.imagebox(beautiful.widget_cpu)
-local cpuwidget = lain.widgets.cpu({
+local cpu = lain.widgets.cpu({
     settings = function()
         widget:set_text(" " .. cpu_now.usage .. "% ")
     end
@@ -218,7 +217,7 @@ local cpuwidget = lain.widgets.cpu({
 
 -- Coretemp
 local tempicon = wibox.widget.imagebox(beautiful.widget_temp)
-local tempwidget = lain.widgets.temp({
+local temp = lain.widgets.temp({
     settings = function()
         widget:set_text(" " .. coretemp_now .. "°C ")
     end
@@ -236,7 +235,7 @@ local fsroot = lain.widgets.fs({
 
 -- Battery
 local baticon = wibox.widget.imagebox(beautiful.widget_battery)
-local batwidget = lain.widgets.bat({
+local bat = lain.widgets.bat({
     settings = function()
         if bat_now.status ~= "N/A" then
             if bat_now.ac_status == 1 then
@@ -278,7 +277,7 @@ local volume = lain.widgets.alsa({
 -- Net
 local neticon = wibox.widget.imagebox(beautiful.widget_net)
 neticon:buttons(awful.util.table.join(awful.button({ }, 1, function () awful.util.spawn_with_shell(iptraf) end)))
-local netwidget = lain.widgets.net({
+local net = lain.widgets.net({
     settings = function()
         widget:set_markup(markup("#7AC82E", " " .. net_now.received)
                           .. " " ..
@@ -395,33 +394,34 @@ awful.screen.connect_for_each_screen(function(s)
             spr,
             arrl_ld,
             wibox.container.background(mpdicon, beautiful.bg_focus),
-            wibox.container.background(mpdwidget, beautiful.bg_focus),
+            wibox.container.background(mpd.widget, beautiful.bg_focus),
             arrl_dl,
             volicon,
-            volume,
+            volume.widget,
             arrl_ld,
             wibox.container.background(mailicon, beautiful.bg_focus),
-            --wibox.container.background(mailwidget, beautiful.bg_focus),
+            --wibox.container.background(mail.widget, beautiful.bg_focus),
             arrl_dl,
             memicon,
-            memwidget,
+            mem.widget,
             arrl_ld,
             wibox.container.background(cpuicon, beautiful.bg_focus),
-            wibox.container.background(cpuwidget, beautiful.bg_focus),
+            wibox.container.background(cpu.widget, beautiful.bg_focus),
             arrl_dl,
             tempicon,
-            tempwidget,
+            temp.widget,
             arrl_ld,
             wibox.container.background(fsicon, beautiful.bg_focus),
-            wibox.container.background(fsroot, beautiful.bg_focus),
+            wibox.container.background(fsroot.widget, beautiful.bg_focus),
             arrl_dl,
             baticon,
-            batwidget,
+            bat.widget,
             arrl_ld,
             wibox.container.background(neticon, beautiful.bg_focus),
-            wibox.container.background(netwidget, beautiful.bg_focus),
+            wibox.container.background(net.widget, beautiful.bg_focus),
             arrl_dl,
-            mytextclock,
+            clock.widget,
+            --mytextclock,
             spr,
             arrl_ld,
             wibox.container.background(s.mylayoutbox, beautiful.bg_focus),
@@ -612,22 +612,22 @@ globalkeys = awful.util.table.join(
     awful.key({ altkey, "Control" }, "Up",
         function ()
             awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Down",
         function ()
             awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Left",
         function ()
             awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Right",
         function ()
             awful.spawn.with_shell("mpc next || ncmpc next || pms next")
-            mpdwidget.update()
+            mpd.update()
         end),
     --]]
 
diff --git a/rc.lua.rainbow b/rc.lua.rainbow
index 7dd94ba..97f87a9 100644
--- a/rc.lua.rainbow
+++ b/rc.lua.rainbow
@@ -152,7 +152,7 @@ lain.widgets.calendar.attach(mytextclock, {
 
 --[[ Mail IMAP check
 -- commented because it needs to be set before use
-local mailwidget = lain.widgets.imap({
+local mail = lain.widgets.imap({
     timeout  = 180,
     server   = "server",
     mail     = "mail",
@@ -174,7 +174,7 @@ local mailwidget = lain.widgets.imap({
 ]]
 
 -- MPD
-local mpdwidget = lain.widgets.mpd({
+local mpd = lain.widgets.mpd({
     settings = function()
         mpd_notification_preset.fg = white
 
@@ -356,9 +356,9 @@ awful.screen.connect_for_each_screen(function(s)
             layout = wibox.layout.fixed.horizontal,
             wibox.widget.systray(),
             spr,
-            mpdwidget,
-            mailwidget,
-            fshome,
+            mpd.widget,
+            --mail.widget,
+            fshome.widget,
             volumewidget,
             mytextclock,
         },
@@ -549,22 +549,22 @@ globalkeys = awful.util.table.join(
     awful.key({ altkey, "Control" }, "Up",
         function ()
             awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Down",
         function ()
             awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Left",
         function ()
             awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Right",
         function ()
             awful.spawn.with_shell("mpc next || ncmpc next || pms next")
-            mpdwidget.update()
+            mpd.update()
         end),
     --]]
 
diff --git a/rc.lua.steamburn b/rc.lua.steamburn
index 2f3a46d..fa0e0ce 100644
--- a/rc.lua.steamburn
+++ b/rc.lua.steamburn
@@ -144,12 +144,13 @@ local mytextclock = wibox.widget.textclock(" %H:%M ")
 lain.widgets.calendar.attach(mytextclock, {
     notification_preset = {
         font = "Tamsyn 10.5",
-        fg   = white,
+        fg   = gray,
         bg   = beautiful.bg_normal
 }})
 
--- Mail IMAP check
-local mailwidget = lain.widgets.imap({
+--[[ Mail IMAP check
+-- commented because it needs to be set before use
+local mail = lain.widgets.imap({
     timeout  = 180,
     server   = "server",
     mail     = "mail",
@@ -166,9 +167,10 @@ local mailwidget = lain.widgets.imap({
         widget:set_markup(markup(gray, mail) .. count)
     end
 })
+--]]
 
 -- MPD
-local mpdwidget = lain.widgets.mpd({
+local mpd = lain.widgets.mpd({
     settings = function()
         artist = mpd_now.artist .. " "
         title  = mpd_now.title  .. " "
@@ -186,14 +188,14 @@ local mpdwidget = lain.widgets.mpd({
 })
 
 -- CPU
-local cpuwidget = lain.widgets.sysload({
+local cpu = lain.widgets.sysload({
     settings = function()
         widget:set_markup(markup(gray, " Cpu ") .. load_1 .. " ")
     end
 })
 
 -- MEM
-local memwidget = lain.widgets.mem({
+local mem = lain.widgets.mem({
     settings = function()
         widget:set_markup(markup(gray, " Mem ") .. mem_now.used .. " ")
     end
@@ -201,12 +203,13 @@ local memwidget = lain.widgets.mem({
 
 -- /home fs
 local fshome = lain.widgets.fs({
+    options = "--exclude-type=tmpfs",
     partition = "/home",
     notification_preset = { fg = beautiful.fg_normal, bg = beautiful.bg_normal, font = "Tamsyn 10.5" },
 })
 
 -- Battery
-local batwidget = lain.widgets.bat({
+local bat = lain.widgets.bat({
     settings = function()
         bat_perc = bat_now.perc
         if bat_now.ac_status == 1 then bat_perc = "Plug" end
@@ -215,7 +218,7 @@ local batwidget = lain.widgets.bat({
 })
 
 -- Net checker
-local netwidget = lain.widgets.net({
+local net = lain.widgets.net({
     settings = function()
         if net_now.state == "up" then net_state = "On"
         else net_state = "Off" end
@@ -373,13 +376,13 @@ awful.screen.connect_for_each_screen(function(s)
             layout = wibox.layout.fixed.horizontal,
             wibox.widget.systray(),
             spr,
-            mpdwidget,
-            mailwidget,
-            cpuwidget,
-            memwidget,
-            batwidget,
-            netwidget,
-            volume,
+            mpd.widget,
+            --mail.widget,
+            cpu.widget,
+            mem.widget,
+            bat.widget,
+            net.widget,
+            volume.widget,
             mytextclock
         },
     }
@@ -569,22 +572,22 @@ globalkeys = awful.util.table.join(
     awful.key({ altkey, "Control" }, "Up",
         function ()
             awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Down",
         function ()
             awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Left",
         function ()
             awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev")
-            mpdwidget.update()
+            mpd.update()
         end),
     awful.key({ altkey, "Control" }, "Right",
         function ()
             awful.spawn.with_shell("mpc next || ncmpc next || pms next")
-            mpdwidget.update()
+            mpd.update()
         end),
     --]]