diff --git a/justfile b/justfile
index f7d9c9a..02942bc 100644
--- a/justfile
+++ b/justfile
@@ -44,7 +44,7 @@ setup-mpv:
 
 # Installs AUR packages for my WM setup
 setup-river:
-  paru -S --noprovides lswt river-git swaylock-effects-git swww wlopm wlr-randr-git
+  paru -S --noprovides lswt river-git swaylock-effects-git swww wlogout wlopm wlr-randr-git
 
 # Set ZSH as default shell and install plugins
 setup-shell:
@@ -82,4 +82,5 @@ stow:
   stow river
   stow swaylock
   stow waybar
+  stow wlogout
   stow zsh
diff --git a/river/.config/river/init b/river/.config/river/init
index 87e221b..2d85792 100755
--- a/river/.config/river/init
+++ b/river/.config/river/init
@@ -79,7 +79,7 @@ riverctl input $T480_POINTER tap enabled
 riverctl input $T480_POINTER tap-button-map left-right-middle
 
 # Lock screen after 5 mins idle or before sleep
-riverctl spawn "swayidle -w timeout 300 'swaylock -f' timeout 600 'wlopm --off \*' resume 'wlopm --on \*' before-sleep 'swaylock -f'"
+riverctl spawn "swayidle -w timeout 300 'swaylock -f --fade-in=1' timeout 600 'wlopm --off \*' resume 'wlopm --on \*' before-sleep 'swaylock -f'"
 
 ## Mappings
 # Applications
diff --git a/swaylock/.config/swaylock/config b/swaylock/.config/swaylock/config
index 680cb10..60166f6 100644
--- a/swaylock/.config/swaylock/config
+++ b/swaylock/.config/swaylock/config
@@ -3,7 +3,6 @@ clock
 indicator
 show-failed-attempts
 grace=30
-fade-in=1
 image=~/.wallpaper
 scaling=fill
 bs-hl-color=e0af68
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index 9b60d1b..604e27c 100644
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -96,6 +96,6 @@
     },
     "custom/exit": {
         "format": " ",
-        "on-click": "riverctl exit"
+        "on-click": "wlogout -s -b 5 -L 200 -R 200 -T 400 -B 400"
     }
 }
\ No newline at end of file
diff --git a/wlogout/.config/wlogout/icons/lock-hover.png b/wlogout/.config/wlogout/icons/lock-hover.png
new file mode 100644
index 0000000..93aa694
Binary files /dev/null and b/wlogout/.config/wlogout/icons/lock-hover.png differ
diff --git a/wlogout/.config/wlogout/icons/lock.png b/wlogout/.config/wlogout/icons/lock.png
new file mode 100644
index 0000000..ab1505f
Binary files /dev/null and b/wlogout/.config/wlogout/icons/lock.png differ
diff --git a/wlogout/.config/wlogout/icons/logout-hover.png b/wlogout/.config/wlogout/icons/logout-hover.png
new file mode 100644
index 0000000..8af8d20
Binary files /dev/null and b/wlogout/.config/wlogout/icons/logout-hover.png differ
diff --git a/wlogout/.config/wlogout/icons/logout.png b/wlogout/.config/wlogout/icons/logout.png
new file mode 100644
index 0000000..0978e26
Binary files /dev/null and b/wlogout/.config/wlogout/icons/logout.png differ
diff --git a/wlogout/.config/wlogout/icons/reboot-hover.png b/wlogout/.config/wlogout/icons/reboot-hover.png
new file mode 100644
index 0000000..878c75b
Binary files /dev/null and b/wlogout/.config/wlogout/icons/reboot-hover.png differ
diff --git a/wlogout/.config/wlogout/icons/reboot.png b/wlogout/.config/wlogout/icons/reboot.png
new file mode 100644
index 0000000..6f31d70
Binary files /dev/null and b/wlogout/.config/wlogout/icons/reboot.png differ
diff --git a/wlogout/.config/wlogout/icons/shutdown-hover.png b/wlogout/.config/wlogout/icons/shutdown-hover.png
new file mode 100644
index 0000000..5337c2c
Binary files /dev/null and b/wlogout/.config/wlogout/icons/shutdown-hover.png differ
diff --git a/wlogout/.config/wlogout/icons/shutdown.png b/wlogout/.config/wlogout/icons/shutdown.png
new file mode 100644
index 0000000..530fcde
Binary files /dev/null and b/wlogout/.config/wlogout/icons/shutdown.png differ
diff --git a/wlogout/.config/wlogout/icons/suspend-hover.png b/wlogout/.config/wlogout/icons/suspend-hover.png
new file mode 100644
index 0000000..f126722
Binary files /dev/null and b/wlogout/.config/wlogout/icons/suspend-hover.png differ
diff --git a/wlogout/.config/wlogout/icons/suspend.png b/wlogout/.config/wlogout/icons/suspend.png
new file mode 100644
index 0000000..2dbfdaf
Binary files /dev/null and b/wlogout/.config/wlogout/icons/suspend.png differ
diff --git a/wlogout/.config/wlogout/layout b/wlogout/.config/wlogout/layout
new file mode 100644
index 0000000..3a76a23
--- /dev/null
+++ b/wlogout/.config/wlogout/layout
@@ -0,0 +1,30 @@
+{
+    "label" : "lock",
+    "action" : "swaylock",
+    "text" : "Lock",
+    "keybind" : "l"
+}
+{
+    "label" : "logout",
+    "action" : "riverctl exit",
+    "text" : "Logout",
+    "keybind" : "e"
+}
+{
+    "label" : "suspend",
+    "action" : "systemctl suspend",
+    "text" : "Suspend",
+    "keybind" : "u"
+}
+{
+    "label" : "shutdown",
+    "action" : "systemctl poweroff",
+    "text" : "Shutdown",
+    "keybind" : "s"
+}
+{
+    "label" : "reboot",
+    "action" : "systemctl reboot",
+    "text" : "Reboot",
+    "keybind" : "r"
+}
\ No newline at end of file
diff --git a/wlogout/.config/wlogout/style.css b/wlogout/.config/wlogout/style.css
new file mode 100644
index 0000000..2ab715d
--- /dev/null
+++ b/wlogout/.config/wlogout/style.css
@@ -0,0 +1,87 @@
+* {
+    background-image: none;
+    box-shadow: none;
+    font-family: "Noto Sans", sans-serif;
+    font-weight: bold;
+}
+
+window {
+    background-color: rgba(26, 27, 38, 0.9);
+}
+
+button {
+    text-decoration-color: #c0caf5;
+    color: #c0caf5;
+    background-color: #414868;
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: 40%;
+}
+
+button:focus,
+button:active,
+button:hover {
+    color: rgb(26, 27, 38);
+    outline-style: none;
+}
+
+#lock {
+    background-image: image(url("icons/lock.png"));
+}
+
+#lock:focus,
+#lock:active,
+#lock:hover {
+    background-color: #bb9af7;
+    background-image: image(url("icons/lock-hover.png"));
+    background-size: 50%;
+}
+
+#logout {
+    background-image: image(url("icons/logout.png"));
+}
+
+#logout:focus,
+#logout:active,
+#logout:hover {
+    background-color: #9ece6a;
+    background-image: image(url("icons/logout-hover.png"));
+    background-size: 50%;
+}
+
+#suspend {
+    background-image: image(url("icons/suspend.png"));
+}
+
+#suspend:focus,
+#suspend:active,
+#suspend:hover {
+    background-color: #e0af68;
+    background-image: image(url("icons/suspend-hover.png"));
+    background-size: 50%;
+}
+
+#shutdown {
+    background-image: image(url("icons/shutdown.png"));
+}
+
+#shutdown:focus,
+#shutdown:active,
+#shutdown:hover {
+    background-color: #f7768e;
+    background-image: image(url("icons/shutdown-hover.png"));
+    background-size: 50%;
+}
+
+
+#reboot {
+    background-image: image(url("icons/reboot.png"));
+}
+
+#reboot:focus,
+#reboot:active,
+#reboot:hover {
+    background-color: #f7768e;
+    background-image: image(url("icons/reboot-hover.png"));
+    background-size: 50%;
+}
\ No newline at end of file