diff --git a/.config/autorandr/postswitch b/.config/autorandr/postswitch
index d0ec0e7..490e070 100755
--- a/.config/autorandr/postswitch
+++ b/.config/autorandr/postswitch
@@ -1,5 +1,4 @@
 #!/bin/bash
-/home/sravan/.scripts/session.sh --restart &                                     # Restart dwm
-/usr/bin/nvidia-force-comp-pipeline &                                            # NVIDIA Force Composition Pipeline
-/usr/bin/nitrogen --restore &                                                    # Restore wallpaper
-/usr/bin/betterlockscreen -u /home/sravan/Pictures/Wallpapers/Solar_System.png & # Update lock screen wallpaper
+/home/sravan/.scripts/session.sh --restart & # Restart dwm
+/usr/bin/nvidia-force-comp-pipeline &        # NVIDIA Force Composition Pipeline
+/usr/bin/nitrogen --restore &                # Restore wallpaper
diff --git a/.config/doom-emacs b/.config/doom-emacs
index 4e105a9..042fe0c 160000
--- a/.config/doom-emacs
+++ b/.config/doom-emacs
@@ -1 +1 @@
-Subproject commit 4e105a95af9c4c7e86471e5566eb7a5ff776ec92
+Subproject commit 042fe0c43831c8575abfdec4196ebd7305fa16ac
diff --git a/.config/dwm-flexipatch b/.config/dwm-flexipatch
index 11e7bd9..206cef0 160000
--- a/.config/dwm-flexipatch
+++ b/.config/dwm-flexipatch
@@ -1 +1 @@
-Subproject commit 11e7bd9e902ec848412a2c1214da42abfdacdfff
+Subproject commit 206cef01e4f5af7872cfc489438af77e2bac861f
diff --git a/.scripts/startup.sh b/.scripts/startup.sh
index 6116011..c542f1d 100755
--- a/.scripts/startup.sh
+++ b/.scripts/startup.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 declare -a startup_array=(\
     # Background Processes
-    "bash /home/sravan/.scripts/deadd.sh --on" \                   # Deadd Notification Center
-    "bash /home/sravan/.scripts/picom.sh --on" \                   # Picom Compositor
-    "/usr/bin/greenclip daemon" \                                  # Greenclip Clipboard Manager
-    "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1" \  # GNOME Polkit Authentication Agent
-    "/usr/bin/xss-lock -l -- betterlockscreen --lock" \            # Session Lock Utility
-    "/usr/lib/kdeconnectd --replace" \                             # KDE Connect Daemon
-    "/usr/bin/redshift -x" \                                       # Redshift Blue Light Filter
-    "/usr/bin/unclutter" \                                         # Hide Mouse Cursor
+    "/usr/bin/light-locker --lock-on-suspend --lock-on-lid --idle-hint" \  # Light Locker
+    "bash /home/sravan/.scripts/deadd.sh --on" \                           # Deadd Notification Center
+    "bash /home/sravan/.scripts/picom.sh --on" \                           # Picom Compositor
+    "/usr/bin/greenclip daemon" \                                          # Greenclip Clipboard Manager
+    "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1" \          # GNOME Polkit Authentication Agent
+    "/usr/lib/kdeconnectd --replace" \                                     # KDE Connect Daemon
+    "/usr/bin/redshift -x" \                                               # Redshift Blue Light Filter
+    "/usr/bin/unclutter" \                                                 # Hide Mouse Cursor
 )
 
 declare -a kill_startup_array=(\
@@ -17,7 +17,6 @@ declare -a kill_startup_array=(\
     "pkill picom" \            # Picom Compositor
     "pkill greenclip" \        # Greenclip Clipboard Manager
     "pkill polkit" \           # GNOME Polkit Authentication Agent
-    "pkill xss-lock" \         # Session Lock Utility
     "pkill kdeconnectd" \      # KDE Connect Daemon
     "pkill redshift" \         # Redshift Blue Light Filter
     "pkill unclutter" \        # Hide Mouse Cursor
diff --git a/README.org b/README.org
index 11854b2..3cc3477 100644
--- a/README.org
+++ b/README.org
@@ -2467,10 +2467,9 @@ See [[https://github.com/phillipberndt/autorandr#hook-scripts][autorandr hook sc
 *** Post Switch
 
 #+BEGIN_SRC shell :shebang #!/bin/bash :tangle .config/autorandr/postswitch
-/home/sravan/.scripts/session.sh --restart &                                     # Restart dwm
-/usr/bin/nvidia-force-comp-pipeline &                                            # NVIDIA Force Composition Pipeline
-/usr/bin/nitrogen --restore &                                                    # Restore wallpaper
-/usr/bin/betterlockscreen -u /home/sravan/Pictures/Wallpapers/Solar_System.png & # Update lock screen wallpaper
+/home/sravan/.scripts/session.sh --restart & # Restart dwm
+/usr/bin/nvidia-force-comp-pipeline &        # NVIDIA Force Composition Pipeline
+/usr/bin/nitrogen --restore &                # Restore wallpaper
 #+END_SRC
 
 ** Compositor
@@ -8299,14 +8298,14 @@ Xcursor.size: CURSOR_SIZE
 #+BEGIN_SRC shell :shebang #!/bin/bash :tangle .scripts/startup.sh
 declare -a startup_array=(\
     # Background Processes
-    "bash /home/sravan/.scripts/deadd.sh --on" \                   # Deadd Notification Center
-    "bash /home/sravan/.scripts/picom.sh --on" \                   # Picom Compositor
-    "/usr/bin/greenclip daemon" \                                  # Greenclip Clipboard Manager
-    "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1" \  # GNOME Polkit Authentication Agent
-    "/usr/bin/xss-lock -l -- betterlockscreen --lock" \            # Session Lock Utility
-    "/usr/lib/kdeconnectd --replace" \                             # KDE Connect Daemon
-    "/usr/bin/redshift -x" \                                       # Redshift Blue Light Filter
-    "/usr/bin/unclutter" \                                         # Hide Mouse Cursor
+    "/usr/bin/light-locker --lock-on-suspend --lock-on-lid --idle-hint" \  # Light Locker
+    "bash /home/sravan/.scripts/deadd.sh --on" \                           # Deadd Notification Center
+    "bash /home/sravan/.scripts/picom.sh --on" \                           # Picom Compositor
+    "/usr/bin/greenclip daemon" \                                          # Greenclip Clipboard Manager
+    "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1" \          # GNOME Polkit Authentication Agent
+    "/usr/lib/kdeconnectd --replace" \                                     # KDE Connect Daemon
+    "/usr/bin/redshift -x" \                                               # Redshift Blue Light Filter
+    "/usr/bin/unclutter" \                                                 # Hide Mouse Cursor
 )
 
 declare -a kill_startup_array=(\
@@ -8315,7 +8314,6 @@ declare -a kill_startup_array=(\
     "pkill picom" \            # Picom Compositor
     "pkill greenclip" \        # Greenclip Clipboard Manager
     "pkill polkit" \           # GNOME Polkit Authentication Agent
-    "pkill xss-lock" \         # Session Lock Utility
     "pkill kdeconnectd" \      # KDE Connect Daemon
     "pkill redshift" \         # Redshift Blue Light Filter
     "pkill unclutter" \        # Hide Mouse Cursor