diff --git a/apps/ML4W_Welcome-x86_64.AppImage b/apps/ML4W_Welcome-x86_64.AppImage
index eb1188e..9d65b18 100755
Binary files a/apps/ML4W_Welcome-x86_64.AppImage and b/apps/ML4W_Welcome-x86_64.AppImage differ
diff --git a/apps/installer.AppImage b/apps/installer.AppImage
deleted file mode 100755
index 40e33fc..0000000
Binary files a/apps/installer.AppImage and /dev/null differ
diff --git a/eww/ml4w-sidebar/eww.yuck b/eww/ml4w-sidebar/eww.yuck
index cd2b124..afa0a3f 100644
--- a/eww/ml4w-sidebar/eww.yuck
+++ b/eww/ml4w-sidebar/eww.yuck
@@ -70,31 +70,31 @@
 ;; powermenus
 (defwidget logout [] 
     (box :class "winbox"
-        (button :tooltip "Logout" :style "background-image: url('../assets/application-exit-symbolic-rtl.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system.sh logout &")
+        (button :tooltip "Logout" :style "background-image: url('../assets/application-exit-symbolic-rtl.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../../hypr/scripts/power.sh exit &")
     )
 )
 
 (defwidget suspend [] 
     (box :class "winbox"
-        (button :tooltip "Suspend" :style "background-image: url('../assets/media-playback-pause-symbolic.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system.sh suspend &")
+        (button :tooltip "Suspend" :style "background-image: url('../assets/media-playback-pause-symbolic.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../../hypr/scripts/power.sh suspend &")
     )
 )
 
 (defwidget lock [] 
     (box :class "winbox"
-        (button :tooltip "Lock" :style "background-image: url('../assets/system-lock-screen-symbolic.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system.sh lock &")
+        (button :tooltip "Lock" :style "background-image: url('../assets/system-lock-screen-symbolic.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../../hypr/scripts/power.sh lock &")
     )
 )
 
 (defwidget reboot [] 
     (box :class "winbox"
-        (button :tooltip "Reboot" :style "background-image: url('../assets/system-reboot-symbolic.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system.sh reboot &")
+        (button :tooltip "Reboot" :style "background-image: url('../assets/system-reboot-symbolic.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../../hypr/scripts/power.sh reboot &")
     )
 )
 
 (defwidget shutdown [] 
     (box :class "winbox"
-        (button :tooltip "Shutdown" :style "background-image: url('../assets/system-shutdown-symbolic.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system.sh shutdown &")
+        (button :tooltip "Shutdown" :style "background-image: url('../assets/system-shutdown-symbolic.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../../hypr/scripts/power.sh shutdown &")
     )
 )
 
diff --git a/hypr/scripts/exit.sh b/hypr/scripts/exit.sh
deleted file mode 100755
index c3e8a7a..0000000
--- a/hypr/scripts/exit.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-sleep 0.5
-killall -9 Hyprland sleep 2
\ No newline at end of file
diff --git a/hypr/scripts/lock.sh b/hypr/scripts/lock.sh
deleted file mode 100755
index bc13b07..0000000
--- a/hypr/scripts/lock.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-sleep 0.5
-hyprlock
\ No newline at end of file
diff --git a/hypr/scripts/power.sh b/hypr/scripts/power.sh
new file mode 100755
index 0000000..7b9e6e4
--- /dev/null
+++ b/hypr/scripts/power.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+#  ____                        
+# |  _ \ _____      _____ _ __ 
+# | |_) / _ \ \ /\ / / _ \ '__|
+# |  __/ (_) \ V  V /  __/ |   
+# |_|   \___/ \_/\_/ \___|_|   
+#                              
+
+if [[ "$1" == "exit" ]]; then
+    echo ":: Exit"
+    sleep 0.5
+    killall -9 Hyprland sleep 2
+fi
+
+if [[ "$1" == "lock" ]]; then
+    echo ":: Lock"
+    sleep 0.5
+    hyprlock    
+fi
+
+if [[ "$1" == "reboot" ]]; then
+    echo ":: Reboot"
+    sleep 0.5
+    systemctl reboot
+fi
+
+if [[ "$1" == "shutdown" ]]; then
+    echo ":: Shutdown"
+    sleep 0.5
+    systemctl poweroff
+fi
+
+if [[ "$1" == "suspend" ]]; then
+    echo ":: Suspend"
+    sleep 0.5
+    systemctl suspend    
+fi
+
+if [[ "$1" == "hibernate" ]]; then
+    echo ":: Hibernate"
+    sleep 1; 
+    systemctl hibernate    
+fi
\ No newline at end of file
diff --git a/hypr/scripts/reboot.sh b/hypr/scripts/reboot.sh
deleted file mode 100755
index 2ddff75..0000000
--- a/hypr/scripts/reboot.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-sleep 0.5
-systemctl reboot
diff --git a/hypr/scripts/shutdown.sh b/hypr/scripts/shutdown.sh
deleted file mode 100755
index 48c8296..0000000
--- a/hypr/scripts/shutdown.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-sleep 0.5
-systemctl poweroff
diff --git a/hypr/scripts/suspend.sh b/hypr/scripts/suspend.sh
deleted file mode 100755
index 440d34b..0000000
--- a/hypr/scripts/suspend.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-sleep 0.5
-systemctl suspend
\ No newline at end of file
diff --git a/hypr/scripts/wallpaper.sh b/hypr/scripts/wallpaper.sh
index a6c408f..6467333 100755
--- a/hypr/scripts/wallpaper.sh
+++ b/hypr/scripts/wallpaper.sh
@@ -14,8 +14,6 @@ wallpaper_folder="$HOME/wallpaper"
 if [ -f ~/dotfiles/.settings/wallpaper-folder.sh ] ;then
     source ~/dotfiles/.settings/wallpaper-folder.sh
 fi
-echo $wallpaper_folder
-
 cache_file="$HOME/.cache/current_wallpaper"
 blurred="$HOME/.cache/blurred_wallpaper.png"
 square="$HOME/.cache/square_wallpaper.png"
diff --git a/qtile/scripts/wallpaper.sh b/qtile/scripts/wallpaper.sh
index f40b8b4..69bea1a 100755
--- a/qtile/scripts/wallpaper.sh
+++ b/qtile/scripts/wallpaper.sh
@@ -10,6 +10,10 @@
 # ----------------------------------------------------- 
 
 # Cache file for holding the current wallpaper
+wallpaper_folder="$HOME/wallpaper"
+if [ -f ~/dotfiles/.settings/wallpaper-folder.sh ] ;then
+    source ~/dotfiles/.settings/wallpaper-folder.sh
+fi
 cache_file="$HOME/.cache/current_wallpaper"
 blurred="$HOME/.cache/blurred_wallpaper.png"
 rasi_file="$HOME/.cache/current_wallpaper.rasi"
@@ -17,13 +21,13 @@ rasi_file="$HOME/.cache/current_wallpaper.rasi"
 # Create cache file if not exists
 if [ ! -f $cache_file ] ;then
     touch $cache_file
-    echo "$HOME/wallpaper/default.jpg" > "$cache_file"
+    echo "$wallpaper_folder/default.jpg" > "$cache_file"
 fi
 
 # Create rasi file if not exists
 if [ ! -f $rasi_file ] ;then
     touch $rasi_file
-    echo "* { current-image: url(\"$HOME/wallpaper/default.jpg\", height); }" > "$rasi_file"
+    echo "* { current-image: url(\"$wallpaper_folder/default.jpg\", height); }" > "$rasi_file"
 fi
 
 current_wallpaper=$(cat "$cache_file")
@@ -35,26 +39,26 @@ case $1 in
         if [ -f $cache_file ]; then
             wal -q -i $current_wallpaper
         else
-            wal -q -i ~/wallpaper/
+            wal -q -i $wallpaper_folder
         fi
     ;;
 
     # Select wallpaper with rofi
     "select")
-        selected=$( find "$HOME/wallpaper" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) -exec basename {} \; | sort -R | while read rfile
+        selected=$( find "$wallpaper_folder" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) -exec basename {} \; | sort -R | while read rfile
         do
-            echo -en "$rfile\x00icon\x1f$HOME/wallpaper/${rfile}\n"
+            echo -en "$rfile\x00icon\x1f$wallpaper_folder/${rfile}\n"
         done | rofi -dmenu -replace -l 6 -config ~/dotfiles/rofi/config-wallpaper.rasi)
         if [ ! "$selected" ]; then
             echo "No wallpaper selected"
             exit
         fi
-        wal -q -i ~/wallpaper/$selected
+        wal -q -i $wallpaper_folder/$selected
     ;;
 
     # Randomly select wallpaper 
     *)
-        wal -q -i ~/wallpaper/
+        wal -q -i $wallpaper_folder/
     ;;
 
 esac
diff --git a/wlogout/layout b/wlogout/layout
index fc3c774..35902d4 100644
--- a/wlogout/layout
+++ b/wlogout/layout
@@ -1,36 +1,36 @@
 {
     "label" : "lock",
-    "action" : "$HOME/dotfiles/hypr/scripts/lock.sh",
+    "action" : "$HOME/dotfiles/hypr/scripts/power.sh lock",
     "text" : "Lock",
     "keybind" : "l"
 }
 {
     "label" : "hibernate",
-    "action" : "sleep 1; systemctl hibernate",
+    "action" : "$HOME/dotfiles/hypr/scripts/power.sh hibernate",
     "text" : "Hibernate",
     "keybind" : "h"
 }
 {
     "label" : "logout",
-    "action" : "$HOME/dotfiles/hypr/scripts/exit.sh",
+    "action" : "$HOME/dotfiles/hypr/scripts/power.sh exit",
     "text" : "Exit",
     "keybind" : "e"
 }
 {
     "label" : "shutdown",
-    "action" : "$HOME/dotfiles/hypr/scripts/shutdown.sh",
+    "action" : "$HOME/dotfiles/hypr/scripts/power.sh shutdown",
     "text" : "Shutdown",
     "keybind" : "s"
 }
 {
     "label" : "suspend",
-    "action" : "$HOME/dotfiles/hypr/scripts/suspend.sh",
+    "action" : "$HOME/dotfiles/hypr/scripts/power.sh suspend",
     "text" : "Suspend",
     "keybind" : "u"
 }
 {
     "label" : "reboot",
-    "action" : "$HOME/dotfiles/hypr/scripts/reboot.sh",
+    "action" : "$HOME/dotfiles/hypr/scripts/power.sh reboot",
     "text" : "Reboot",
     "keybind" : "r"
 }