diff --git a/README.rst b/README.rst
index a876940..ad86349 100644
--- a/README.rst
+++ b/README.rst
@@ -20,7 +20,7 @@ Features
 
 - Modularity
 - Autohide widgets
-- Autostart applications
+- Autostart windowless processes
 - Fast MPD and volume shortcuts (first time this trick has been used in Awesome)
 - Shortcuts for copying to the clipboard (no need for clipboard managers), toggle wiboxes, widgets popups, screenshots capture, moving and magnifying clients
 - Quake drop-down terminal
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.template b/rc.lua.template
index 752a125..34bc9ac 100644
--- a/rc.lua.template
+++ b/rc.lua.template
@@ -339,7 +339,7 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey, }, "z", function () awful.screen.focused().quake:toggle() end),
 
     -- Widgets popups
-    awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end),
+    awful.key({ altkey, }, "c", function () beautiful.cal.show(7) end),
     awful.key({ altkey, }, "h", function () beautiful.fs.show(7) end),
     awful.key({ altkey, }, "w", function () beautiful.weather.show(7) end),
 
diff --git a/themes/multicolor/theme.lua b/themes/multicolor/theme.lua
index 7d83df2..cb450f4 100644
--- a/themes/multicolor/theme.lua
+++ b/themes/multicolor/theme.lua
@@ -99,12 +99,14 @@ local clockicon = wibox.widget.imagebox(theme.widget_clock)
 local mytextclock = wibox.widget.textclock(markup("#7788af", "%A %d %B ") .. markup("#535f7a", ">") .. markup("#de5e1e", " %H:%M "))
 
 -- Calendar
-lain.widgets.calendar.attach(mytextclock, {
+theme.cal = lain.widgets.calendar({
+    attach_to = { mytextclock },
     notification_preset = {
         font = "Terminus 10",
         fg   = theme.fg_normal,
         bg   = theme.bg_normal
-}})
+    }
+})
 
 -- Weather
 local weathericon = wibox.widget.imagebox(theme.widget_weather)
diff --git a/themes/powerarrow-darker/theme.lua b/themes/powerarrow-darker/theme.lua
index a9f52bc..08138ef 100644
--- a/themes/powerarrow-darker/theme.lua
+++ b/themes/powerarrow-darker/theme.lua
@@ -101,7 +101,8 @@ local clock = lain.widgets.abase({
 })
 
 -- Calendar
-lain.widgets.calendar.attach(clock.widget, {
+theme.cal = lain.widgets.calendar({
+    attach_to = { clock.widget },
     notification_preset = {
         font = "Terminus 10",
         fg   = theme.fg_normal,