diff --git a/2-install-hyprland.sh b/2-install-hyprland.sh
index c944fc9..7ff7d79 100755
--- a/2-install-hyprland.sh
+++ b/2-install-hyprland.sh
@@ -48,7 +48,7 @@ echo ""
 echo "-> Install main packages"
 packagesPacman=("hyprland" "xdg-desktop-portal-hyprland" "waybar" "grim" "slurp");
 
-packagesYay=("swww" "swaylock");
+packagesYay=("swww" "swaylock-effects" "wlogout");
 
 # ------------------------------------------------------
 # Install required packages
@@ -82,6 +82,9 @@ done
 # ------------------------------------------------------
 echo "-> Create symbolic links"
 _installSymLink ~/.config/waybar ~/dotfiles/waybar/ ~/.config
+_installSymLink ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config
+_installSymLink ~/.config/wlogout ~/dotfiles/wlogout/ ~/.config
+
 
 swww init
 
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index f0242bf..5bd6233 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -147,7 +147,7 @@ bind = $mainMod, up, movefocus, u
 bind = $mainMod, down, movefocus, d
 
 bind = $mainMod, PRINT, exec, ~/dotfiles/scripts/grim.sh
-bind = $mainMod CTRL, Q, exec, ~/dotfiles/scripts/powermenu-hypr.sh
+bind = $mainMod CTRL, Q, exec, wlogout
 bind = $mainMod SHIFT, W, exec, ~/dotfiles/scripts/updatewal-swww.sh
 bind = $mainMod CTRL, W, exec, ~/dotfiles/scripts/wallpaper-swww.sh
 bind = $mainMod CTRL, RETURN, exec, ~/dotfiles/scripts/applauncher.sh
diff --git a/swaylock/config b/swaylock/config
new file mode 100644
index 0000000..e2b190d
--- /dev/null
+++ b/swaylock/config
@@ -0,0 +1,51 @@
+ignore-empty-password
+font="Fira Sans Semibold"
+
+clock
+timestr=%R
+datestr=%a, %e of %B
+
+screenshots
+
+fade-in=1
+
+effect-blur=20x6
+effect-greyscale
+effect-scale=0.9
+
+indicator
+indicator-radius=240
+indicator-thickness=20
+indicator-caps-lock
+
+key-hl-color=FFFFFF
+
+separator-color=00000000
+
+inside-color=00000033
+inside-clear-color=ffffff00
+inside-caps-lock-color=ffffff00
+inside-ver-color=ffffff00
+inside-wrong-color=ffffff00
+
+ring-color=000000
+ring-clear-color=ffffff
+ring-caps-lock-color=ffffff
+ring-ver-color=ffffff
+ring-wrong-color=ffffff
+
+line-color=00000000
+line-clear-color=ffffffFF
+line-caps-lock-color=ffffffFF
+line-ver-color=ffffffFF
+line-wrong-color=ffffffFF
+
+text-clear-color=ffffff
+text-ver-color=ffffff
+text-wrong-color=ffffff
+
+bs-hl-color=ffffff
+caps-lock-key-hl-color=ffffffFF
+caps-lock-bs-hl-color=ffffffFF
+disable-caps-lock-text
+text-caps-lock-color=ffffff
diff --git a/waybar/colors-waybar.css b/waybar/colors-waybar.css
index 69c717b..9b8fdb4 100644
--- a/waybar/colors-waybar.css
+++ b/waybar/colors-waybar.css
@@ -1,20 +1,20 @@
-@define-color foreground #bfc0bf;
-@define-color background #020302;
-@define-color cursor #bfc0bf;
+@define-color foreground #f09faa;
+@define-color background #08121B;
+@define-color cursor #f09faa;
 
-@define-color color0 #020302;
-@define-color color1 #AF847C;
-@define-color color2 #2E638C;
-@define-color color3 #60738D;
-@define-color color4 #71879A;
-@define-color color5 #A0979B;
-@define-color color6 #D0ADA1;
-@define-color color7 #bfc0bf;
-@define-color color8 #414241;
-@define-color color9 #AF847C;
-@define-color color10 #2E638C;
-@define-color color11 #60738D;
-@define-color color12 #71879A;
-@define-color color13 #A0979B;
-@define-color color14 #D0ADA1;
-@define-color color15 #bfc0bf;
+@define-color color0 #08121B;
+@define-color color1 #5B3A4B;
+@define-color color2 #374250;
+@define-color color3 #634656;
+@define-color color4 #9A3C59;
+@define-color color5 #DF3D63;
+@define-color color6 #955364;
+@define-color color7 #f09faa;
+@define-color color8 #a86f76;
+@define-color color9 #5B3A4B;
+@define-color color10 #374250;
+@define-color color11 #634656;
+@define-color color12 #9A3C59;
+@define-color color13 #DF3D63;
+@define-color color14 #955364;
+@define-color color15 #f09faa;
diff --git a/waybar/modules.json b/waybar/modules.json
index 1ad2e34..3dc8774 100644
--- a/waybar/modules.json
+++ b/waybar/modules.json
@@ -124,7 +124,7 @@
     // Rofi Power Menu
     "custom/exit": {
         "format": "",
-        "on-click": "~/dotfiles/scripts/powermenu-hypr.sh",
+        "on-click": "wlogout",
         "tooltip": false
     },
 
@@ -176,10 +176,10 @@
             "warning": 30,
             "critical": 15
         },
-        "format": "{icon} {capacity}%",
+        "format": "{icon}   {capacity}%",
         "format-charging": "  {capacity}%",
         "format-plugged": "  {capacity}%",
-        "format-alt": "{icon} {time}",
+        "format-alt": "{icon}  {time}",
         // "format-good": "", // An empty format will hide the module
         // "format-full": "",
         "format-icons": [" ", " ", " ", " ", " "]
diff --git a/wlogout/layout b/wlogout/layout
new file mode 100644
index 0000000..75c8f18
--- /dev/null
+++ b/wlogout/layout
@@ -0,0 +1,35 @@
+{
+    "label" : "lock",
+    "action" : "swaylock",
+    "text" : "Lock"
+}
+
+{
+    "label" : "hibernate",
+    "action" : "systemctl hibernate",
+    "text" : "Hibernate"
+}
+
+{
+    "label" : "logout",
+    "action" : "hyprctl dispatch exit 0",
+    "text" : "Logout"
+}
+
+{
+    "label" : "shutdown",
+    "action" : "systemctl poweroff",
+    "text" : "Shutdown"
+}
+
+{
+    "label" : "suspend",
+    "action" : "systemctl suspend",
+    "text" : "Suspend"
+}
+
+{
+    "label" : "reboot",
+    "action" : "systemctl reboot",
+    "text" : "Reboot"
+}
\ No newline at end of file