diff --git a/themes/powerarrow-dark/rc.lua.custom b/themes/powerarrow-dark/rc.lua.custom
index eae0a9b..87338ab 100644
--- a/themes/powerarrow-dark/rc.lua.custom
+++ b/themes/powerarrow-dark/rc.lua.custom
@@ -572,10 +572,10 @@ globalkeys = mytable.join(-- Destroy all notifications
     awful.key({ altkey, "Control", "Shift" }, "b", function()
         os.execute("rfkill toggle bluetooth")
         if BLUESTATUS == false then
-            naughty.notify({ title = "Bluetooth", text = "Bluetooth is ON", icon = "/home/sirhadrian/.config/awesome/themes/powerarrow-dark/icons/bluetooth.png" })
+            naughty.notify({ title = "Bluetooth", text = "Bluetooth is ON", icon="/home/sirhadrian/.config/awesome/themes/powerarrow-dark/icons/bluetooth.png"})
             BLUESTATUS = true
         else
-            naughty.notify({ title = "Bluetooth", text = "Bluetooth is OFF", icon = "/home/sirhadrian/.config/awesome/themes/powerarrow-dark/icons/bluetooth.png" })
+            naughty.notify({ title = "Bluetooth", text = "Bluetooth is OFF", icon="/home/sirhadrian/.config/awesome/themes/powerarrow-dark/icons/bluetooth.png"})
             BLUESTATUS = false
         end
     end, {
@@ -983,8 +983,6 @@ end)
 -- Gaps
 beautiful.useless_gap = 6
 
--- Compositor
 awful.spawn.with_shell("picom")
-
--- Wallpapers
 awful.spawn.with_shell("nitrogen --set-zoom-fill --random ~/Pictures/SFW")
+
diff --git a/themes/powerarrow-dark/theme.lua b/themes/powerarrow-dark/theme.lua
index a4c974b..dd6539d 100644
--- a/themes/powerarrow-dark/theme.lua
+++ b/themes/powerarrow-dark/theme.lua
@@ -123,14 +123,37 @@ local clock = awful.widget.watch(
 )
 
 -- Calendar
-theme.cal = lain.widget.cal({
-    attach_to = { clock },
-    notification_preset = {
-        font = "Terminus 10",
-        fg   = theme.fg_normal,
-        bg   = theme.bg_normal
-    }
+-- theme.cal = lain.widget.cal({
+--     attach_to = { clock },
+--     notification_preset = {
+--         font = "Terminus 10",
+--         fg   = theme.fg_normal,
+--         bg   = theme.bg_normal
+--     }
+-- })
+
+-- Custom Calendar
+local calendar_widget = require("awesome-wm-widgets.calendar-widget.calendar")
+-- ...
+-- Create a textclock widget
+--mytextclock = wibox.widget.textclock()
+-- default
+local cw = calendar_widget()
+-- or customized
+local cw = calendar_widget({
+    theme = 'nord',
+    placement = 'top_right',
+    start_sunday = true,
+    radius = 8,
+-- with customized next/previous (see table above)
+    previous_month_button = 1,
+    next_month_button = 3,
 })
+clock:connect_signal("button::press",
+    function(_, _, _, button)
+        if button == 1 then cw.toggle() end
+    end)
+
 
 -- Mail IMAP check
 --local mailicon = wibox.widget.imagebox(theme.widget_mail)
@@ -300,6 +323,9 @@ local spr     = wibox.widget.textbox(' ')
 local arrl_dl = separators.arrow_left(theme.arrows, "alpha")
 local arrl_ld = separators.arrow_left("alpha", theme.arrows)
 
+-- LogOut widget
+local logout_menu_widget = require("awesome-wm-widgets.logout-menu-widget.logout-menu")
+
 function theme.at_screen_connect(s)
     -- Quake application
     s.quake = lain.util.quake({ app = awful.util.terminal })
@@ -354,30 +380,17 @@ function theme.at_screen_connect(s)
             -- keyboardlayout,
             spr,
             arrl_ld,
-            --wibox.container.background(mpdicon, theme.bg_focus),
-            --wibox.container.background(theme.mpd.widget, theme.bg_focus),
             arrl_dl,
             volicon,
             theme.volume.widget,
             arrl_ld,
-            --wibox.container.background(mailicon, theme.bg_focus),
-            --wibox.container.background(theme.mail.widget, theme.bg_focus),
-            arrl_dl,
-            memicon,
-            mem.widget,
-            arrl_ld,
             arrl_dl,
             cpuicon,
             cpu.widget,
-            --wibox.container.background(cpuicon, theme.bg_focus),
-            --wibox.container.background(cpu.widget, theme.bg_focus),
-
-            --tempicon,
-            --temp.widget,
-            --arrl_ld,
-            --wibox.container.background(fsicon, theme.bg_focus),
-            --wibox.container.background(theme.fs.widget, theme.bg_focus),
-            --arrl_dl,
+            arrl_ld,
+            arrl_dl,
+            memicon,
+            mem.widget,
             arrl_ld,
             arrl_dl,
             baticon,
@@ -388,6 +401,9 @@ function theme.at_screen_connect(s)
             wibox.container.background(net.widget, theme.bg_focus),
             arrl_ld,
             arrl_dl,
+            logout_menu_widget(),
+            arrl_ld,
+            arrl_dl,
             clock,
             spr,
             arrl_ld,