diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf
index 7651c98..25718c3 100644
--- a/hypr/hypridle.conf
+++ b/hypr/hypridle.conf
@@ -1,7 +1,13 @@
 general {
-    inhibit_sleep = 3
-    lock_cmd = pidof hyprlock || ~/.config/hypr/scripts/lock.sh
-    before_sleep_cmd = loginctl lock-session
+    # Define the lock command for hypridle
+    # This is used whenever hypridle or listeners need to lock the screen
+    lock_cmd = pidof hyprlock || hyprlock
+
+    # Runs before system suspend (safety net if you manually suspend)
+    # On a desktop, you can remove this if you never suspend manually
+    before_sleep_cmd = ~/.config/hypr/scripts/lock.sh
+
+    # Restore screen after sleep
     after_sleep_cmd = hyprctl dispatch dpms on
 }
 
diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf
index acce3e6..89f95fe 100644
--- a/hypr/hyprlock.conf
+++ b/hypr/hyprlock.conf
@@ -1,15 +1,3 @@
-auth {
-    fingerprint {
-        enabled = true
-        ready_message = Scan fingerprint to unlock
-        present_message = Scanning...
-    }
-}
-
-animations {
-    animation = fadeOut, 0
-}
-
 background {
     path = ~/.config/hypr/wallpapers/Purple.jpg
     blur_passes = 2
diff --git a/hypr/scripts/lid-close.sh b/hypr/scripts/lid-close.sh
deleted file mode 100755
index c27238b..0000000
--- a/hypr/scripts/lid-close.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-pkill -x dim
-hyprctl switchxkblayout all 0
-wpctl set-mute @DEFAULT_AUDIO_SINK@ 1
-hyprlock --no-fade-in &
-hyprctl dispatch dpms off
-wait
-wpctl set-mute @DEFAULT_AUDIO_SINK@ 0
diff --git a/hypr/scripts/lock.sh b/hypr/scripts/lock.sh
index af3fe06..a89c03e 100755
--- a/hypr/scripts/lock.sh
+++ b/hypr/scripts/lock.sh
@@ -2,4 +2,4 @@
 hyprctl switchxkblayout all 0
 fcitx5-remote -s keyboard-us-dvorak
 wpctl set-mute @DEFAULT_AUDIO_SINK@ 1
-hyprlock --no-fade-in && wpctl set-mute @DEFAULT_AUDIO_SINK@ 0
+hyprlock && wpctl set-mute @DEFAULT_AUDIO_SINK@ 0
diff --git a/waybar/config b/waybar/config
index c8c8c04..6fdc45f 100644
--- a/waybar/config
+++ b/waybar/config
@@ -16,7 +16,6 @@
         "hyprland/language",
         "custom/notifications",
         "custom/idle-inhibit",
-        "battery",
         "custom/power"
     ],
 
@@ -115,22 +114,6 @@
         "format": " ⏻ ",
         "tooltip": false,
         "on-click": "wlogout --protocol layer-shell"
-    },
-
-    "battery": {
-    	"interval": 60,
-    	"states": {
-    		"warning": 30,
-    		"critical": 15
-    	},
-    	"events": {
-    		"on-discharging-warning": "notify-send -u normal 'Low Battery'",
-    		"on-discharging-critical": "notify-send -u critical 'Very Low Battery'",
-    		"on-charging-100": "notify-send -u normal 'Battery Full!'"
-    	},
-    	"format": "{capacity}% {icon}",
-    	"format-icons": ["", "", "", "", ""],
-    	"max-length": 25
     }
 }