diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index 77387a7..8092860 100644
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -64,11 +64,10 @@ bspc rule -a mpv desktop='^5' state=floating
 
 # Automatically start up programs.
 picom &
-#feh --bg-fill ~/wallpapers/default-wallpaper.jpg &
 nitrogen --restore &
-#pulseaudio --kill &
-#sleep 3
-#pulseaudio --start &
-xscreensaver -nosplash &
-#sleep 2
+
 $HOME/.config/polybar/run-polybar.sh &
+
+# lock computer automatically after X time of minutes.
+xautolock -time 15 -locker "xsecurelock" -detectsleep -secure &
+#xscreensaver -nosplash &
\ No newline at end of file
diff --git a/config/bspwm/bspwmrc-vm b/config/bspwm/bspwmrc-vm
index 7df2e37..96fb602 100644
--- a/config/bspwm/bspwmrc-vm
+++ b/config/bspwm/bspwmrc-vm
@@ -61,13 +61,10 @@ bspc rule -a mpv desktop='^5' state=floating
 
 # Automatically start up programs.
 picom &
-#feh --bg-fill ~/wallpapers/default-wallpaper.jpg &
 nitrogen --restore &
-#pulseaudio --kill &
-#sleep 3
-#pulseaudio --start &
-#xscreensaver -nosplash &
-#sleep 2
+
 $HOME/.config/polybar/run-polybar.sh &
 
-xautolock -time 2 -locker "i3lock-fancy -gp -- scrot" -detectsleep &
\ No newline at end of file
+# lock computer automatically after X time of minutes.
+xautolock -time 15 -locker "xsecurelock" -detectsleep -secure &
+#xscreensaver -nosplash &
\ No newline at end of file
diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index 8489063..23736b7 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -40,7 +40,7 @@ super + ctrl + alt + w
 
 #######   lock computer  #######
 super + l
-	i3lock-fancy -gp -- scrot -z
+	xsecurelock
 
 
 
diff --git a/config/sxhkd/sxhkdrc-vm b/config/sxhkd/sxhkdrc-vm
index 0ef71c2..4504dec 100644
--- a/config/sxhkd/sxhkdrc-vm
+++ b/config/sxhkd/sxhkdrc-vm
@@ -37,6 +37,10 @@ alt + ctrl + m
 shift + ctrl + alt + w
 	. ~/.config/rofi/rofi-wifi-menu.sh
 
+#######   lock computer  #######
+super + l
+	xsecurelock
+
 #
 # BSPwm Hotkeys
 #
diff --git a/install-scripts/apt-install-packages.sh b/install-scripts/apt-install-packages.sh
index ac84ac6..c76c2bc 100644
--- a/install-scripts/apt-install-packages.sh
+++ b/install-scripts/apt-install-packages.sh
@@ -16,7 +16,7 @@ sleep 3
 sudo apt update && sudo apt upgrade -y
 
 # Core packages to be installed
-sudo apt install -y xorg x11-xserver-utils arandr autorandr dialog bspwm sxhkd sddm picom polybar xautolock i3lock-fancy network-manager kitty psmisc rofi pcmanfm tlp font-manager gvfs-backends nitrogen dunst cups smbclient lxpolkit xbacklight lxappearance htop mc xarchiver mpv feh sxiv pulseaudio pulsemixer npm curl tmux imagemagick scrot firefox-esr
+sudo apt install -y xorg x11-xserver-utils arandr autorandr dialog bspwm sxhkd sddm picom polybar xautolock xsecurelock network-manager kitty psmisc rofi pcmanfm tlp font-manager gvfs-backends nitrogen dunst cups smbclient lxpolkit xbacklight lxappearance htop mc xarchiver mpv feh sxiv pulseaudio pulsemixer npm curl tmux imagemagick scrot firefox-esr
 
 # Software & Packages
 sudo apt install -y ranger neovim flameshot moc notify-osd neofetch flatpak cava obs-studio freerdp2-x11
@@ -32,6 +32,6 @@ sudo apt install -y papirus-icon-theme breeze-cursor-theme gnome-themes-extra
 
 
 # Other packages not included or removed 
-# virt-manager xscreensaver thunar thunar-archive-plugin thunar-font-manager cmus ncmpcpp
+# virt-manager xscreensaver thunar thunar-archive-plugin thunar-font-manager cmus ncmpcpp xidle i3lock-fancy
 # qt5ct .profile add export QT_QPA_PLATFORMTHEME="qt5ct"