diff --git a/lain b/lain
index 555b872..1b42851 160000
--- a/lain
+++ b/lain
@@ -1 +1 @@
-Subproject commit 555b872d16393774089df3b3453000571a73a3dd
+Subproject commit 1b428513fdede06ef54679edbfd267534f49659e
diff --git a/rc.lua.blackburn b/rc.lua.blackburn
index 9f53ffc..5ae5759 100644
--- a/rc.lua.blackburn
+++ b/rc.lua.blackburn
@@ -142,7 +142,8 @@ gray       = "#9E9C9A"
 local mytextclock = wibox.widget.textclock(" %H:%M ")
 
 -- Calendar
-lain.widgets.calendar.attach(mytextclock, {
+lain.widgets.calendar({
+    attach_to = { mytextclock },
     notification_preset = {
         font = "Tamsyn 10.5",
         fg   = beautiful.fg_normal,
diff --git a/rc.lua.copland b/rc.lua.copland
index 5234811..c019f39 100644
--- a/rc.lua.copland
+++ b/rc.lua.copland
@@ -146,7 +146,8 @@ local green  = "#8FEB8F"
 local mytextclock = wibox.widget.textclock("<span font='Tamsyn 5'> </span>%H:%M ")
 
 -- Calendar
-lain.widgets.calendar.attach(mytextclock, {
+lain.widgets.calendar({
+    attach_to = { mytextclock },
     notification_preset = {
         font = "Tamsyn 10.5",
         fg   = beautiful.fg_normal,
@@ -281,6 +282,7 @@ local volicon = wibox.widget.imagebox(beautiful.vol)
 local volume = lain.widgets.alsabar({
     width = 59, border_width = 0, ticks = true, ticks_size = 6,
     notification_preset = { font = beautiful.font },
+    --togglechannel = "IEC958,3",
     settings = function()
         if volume_now.status == "off" then
             volicon:set_image(beautiful.vol_mute)
@@ -301,6 +303,28 @@ local volume = lain.widgets.alsabar({
 local volumebg = wibox.container.background(volume.bar, "#474747", shape.rectangle)
 local volumewidget = wibox.container.margin(volumebg, 2, 7, 4, 4)
 
+volume.bar:buttons(awful.util.table.join (
+          awful.button({}, 1, function()
+            awful.spawn.with_shell(string.format("%s -e alsamixer", terminal))
+          end),
+          awful.button({}, 2, function()
+            awful.spawn(string.format("%s set %s 100%%", volume.cmd, volume.channel))
+            volume.update()
+          end),
+          awful.button({}, 3, function()
+            awful.spawn(string.format("%s set %s toggle", volume.cmd, volume.togglechannel or volume.channel))
+            volume.update()
+          end),
+          awful.button({}, 4, function()
+            awful.spawn(string.format("%s set %s 1%%+", volume.cmd, volume.channel))
+            volume.update()
+          end),
+          awful.button({}, 5, function()
+            awful.spawn(string.format("%s set %s 1%%-", volume.cmd, volume.channel))
+            volume.update()
+          end)
+))
+
 -- Weather
 local myweather = lain.widgets.weather({
     city_id = 2643743, -- placeholder (London)
diff --git a/rc.lua.dremora b/rc.lua.dremora
index 920c55d..e806269 100644
--- a/rc.lua.dremora
+++ b/rc.lua.dremora
@@ -144,7 +144,8 @@ local mytextclock = wibox.widget.textclock(markup(gray, " %a")
 .. markup(white, " %d ") .. markup(gray, "%b ") ..  markup(white, "%H:%M "))
 
 -- Calendar
-lain.widgets.calendar.attach(mytextclock, {
+lain.widgets.calendar({
+    attach_to = { mytextclock },
     notification_preset = {
         font = "Tamsyn 10.5",
         fg   = white,
diff --git a/rc.lua.holo b/rc.lua.holo
index d922b7f..6285495 100644
--- a/rc.lua.holo
+++ b/rc.lua.holo
@@ -153,7 +153,10 @@ local mytextcalendar = wibox.widget.textclock(markup("#FFFFFF", space3 .. "%d %b
 local calendar_icon = wibox.widget.imagebox(beautiful.calendar)
 local calbg = wibox.container.background(mytextcalendar, beautiful.bg_focus, shape.rectangle)
 local calendarwidget = wibox.container.margin(calbg, 0, 0, 5, 5)
-lain.widgets.calendar.attach(calendarwidget, { notification_preset = { fg = "#FFFFFF", bg = beautiful.bg_normal, position = "bottom_right", font = "Monospace 10" } })
+lain.widgets.calendar({
+    attach_to = { calendarwidget, clockwidget },
+    notification_preset = { fg = "#FFFFFF", bg = beautiful.bg_normal, position = "bottom_right", font = "Monospace 10" }
+})
 
 --[[ Mail IMAP check
 -- commented because it needs to be set before use
diff --git a/rc.lua.multicolor b/rc.lua.multicolor
index 5e02be4..51f5580 100644
--- a/rc.lua.multicolor
+++ b/rc.lua.multicolor
@@ -156,7 +156,8 @@ local mytextclock = lain.widgets.base({
 ]]
 
 -- Calendar
-lain.widgets.calendar.attach(mytextclock, {
+lain.widgets.calendar({
+    attach_to = { mytextclock },
     notification_preset = {
         font = "Terminus 10",
         fg   = beautiful.fg_normal,
diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker
index c7cc927..3587630 100644
--- a/rc.lua.powerarrow-darker
+++ b/rc.lua.powerarrow-darker
@@ -148,7 +148,8 @@ local clock = lain.widgets.abase({
 })
 
 -- calendar
-lain.widgets.calendar.attach(mytextclock, {
+lain.widgets.calendar({
+    attach_to = { clock.widget },
     notification_preset = {
         font = "Terminus 10",
         fg   = beautiful.fg_normal,
diff --git a/rc.lua.rainbow b/rc.lua.rainbow
index 97f87a9..ab318a6 100644
--- a/rc.lua.rainbow
+++ b/rc.lua.rainbow
@@ -143,7 +143,8 @@ local gray   = beautiful.fg_normal
 local mytextclock = wibox.widget.textclock(markup(white, " %H:%M "))
 
 -- Calendar
-lain.widgets.calendar.attach(mytextclock, {
+lain.widgets.calendar({
+    attach_to = { mytextclock },
     notification_preset = {
         font = "Tamsyn 10.5",
         fg   = white,
diff --git a/rc.lua.steamburn b/rc.lua.steamburn
index fa0e0ce..6c92a92 100644
--- a/rc.lua.steamburn
+++ b/rc.lua.steamburn
@@ -141,7 +141,8 @@ local gray   = "#94928F"
 local mytextclock = wibox.widget.textclock(" %H:%M ")
 
 -- Calendar
-lain.widgets.calendar.attach(mytextclock, {
+lain.widgets.calendar({
+    attach_to = { mytextclock },
     notification_preset = {
         font = "Tamsyn 10.5",
         fg   = gray,