diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index 6d047dc..ee387d8 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -34,15 +34,11 @@ exec-once = wl-paste --type image --watch cliphist store
# Rainbow borders
exec-once = $UserScripts/RainbowBorders.sh
-# sway-idle with lock only
-exec-once = swayidle -w timeout 900 '$lock'
-# sway-idle with lock and sleep
-#exec-once = swayidle -w timeout 900 '$lock' timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock'
-# sway idle without lock
-#exec-once = swayidle -w timeout 900 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'
+# Starting hypridle to start hyprlock
+exec-once = hypridle -q
# Here are list of features available but disabled by default
-#exec-once = swww query || swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png # persistent wallpaper
+# exec-once = swww query || swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png # persistent wallpaper
#gnome polkit for nixos
#exec-once = $scriptsDir/Polkit-NixOS.sh
diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf
new file mode 100644
index 0000000..7b8ce81
--- /dev/null
+++ b/config/hypr/hypridle.conf
@@ -0,0 +1,33 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ #
+# Hypridle
+# Original config submitted by https://github.com/SherLock707
+
+
+general {
+ # lock_cmd = notify-send "lock!" # dbus/sysd lock command (loginctl lock-session)
+ # unlock_cmd = notify-send "unlock!" # same as above, but unlock
+ # before_sleep_cmd = notify-send "Zzz" # command ran before sleep
+ # after_sleep_cmd = notify-send "Awake!" # command ran after sleep
+ ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
+}
+
+# Warn
+listener {
+ timeout = 540 # 9 min
+ on-timeout = notify-send "You are idle!" # command to run when timeout has passed
+ on-resume = notify-send "Welcome back!" # command to run when activity is detected after timeout has fired.
+}
+
+# Screenlock
+listener {
+ timeout = 600 # 10 min
+ on-timeout = hyprlock # command to run when timeout has passed
+ # on-resume = notify-send "Welcome back to your desktop!" # command to run when activity is detected after timeout has fired.
+}
+
+# Suspend # disabled by default
+# listener {
+ # timeout = 1200 # 20 min
+ # on-timeout = systemctl suspend # command to run when timeout has passed
+ # on-resume = notify-send "Welcome back to your desktop!" # command to run when activity is detected after timeout has fired.
+# }
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
new file mode 100644
index 0000000..6af5d7b
--- /dev/null
+++ b/config/hypr/hyprlock.conf
@@ -0,0 +1,118 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ #
+# Hyprlock
+# Original config submitted by https://github.com/SherLock707
+
+source = $HOME/.cache/wal/colors-hyprland
+
+general {
+ grace = 1
+}
+
+background {
+ monitor =
+ path = screenshot # screenshot of your desktop
+ # path = $HOME/.config/rofi/.current_wallpaper # NOTE only png supported for now
+ color = $color7
+
+ # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
+ blur_size = 4
+ blur_passes = 2 # 0 disables blurring
+ noise = 0.0117
+ contrast = 1.3000 # Vibrant!!!
+ brightness = 0.8000
+ vibrancy = 0.2100
+ vibrancy_darkness = 0.0
+}
+
+input-field {
+ monitor =
+ size = 250, 50
+ outline_thickness = 3
+ dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
+ dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
+ dots_center = true
+ outer_color = $color1
+ inner_color = $color0
+ font_color = $color7
+ fade_on_empty = true
+ placeholder_text = Password... # Text rendered in the input box when it's empty.
+ hide_input = false
+
+ position = 0, 100
+ halign = center
+ valign = bottom
+}
+
+# Date
+label {
+ monitor =
+ text = cmd[update:18000000] echo " "$(date +'%A, %-d %B %Y')" "
+ color = $color5
+ font_size = 34
+ font_family = JetBrains Mono Nerd Font 10
+
+ position = 0, -100
+ halign = center
+ valign = top
+}
+
+# Week
+label {
+ monitor =
+ text = cmd[update:18000000] echo " "$(date +'Week %U')" "
+ color = $color7
+ font_size = 24
+ font_family = JetBrains Mono Nerd Font 10
+
+ position = 0, -150
+ halign = center
+ valign = top
+}
+
+# Time
+label {
+ monitor =
+ text = cmd[update:1000] echo " $(date +"%H:%M:%S") " # 24H
+ #text = cmd[update:1000] echo " $(date +"%I:%M:%S %p") " # AM/PM
+ color = $color7
+ font_size = 94
+ font_family = JetBrains Mono Nerd Font 10
+
+ position = 0, 0
+ halign = center
+ valign = center
+}
+
+label {
+ monitor =
+ text =  $USER
+ color = $color7
+ font_size = 18
+ font_family = Inter Display Medium
+
+ position = 0, 200
+ halign = center
+ valign = bottom
+}
+
+label {
+ monitor =
+ text = cmd[update:60000] echo " "$(uptime -p)" "
+ color = $color12
+ font_size = 24
+ font_family = JetBrains Mono Nerd Font 10
+ position = 0, 0
+ halign = right
+ valign = bottom
+}
+
+label {
+ monitor =
+ text = cmd[update:3600000] curl -s 'wttr.in?format=2' # For specific location : wttr.in/busan?format=2
+ color = $color10
+ font_size = 24
+ font_family = JetBrains Mono Nerd Font 10
+ position = 50, 0
+ halign = left
+ valign = bottom
+}
diff --git a/config/hypr/scripts/LockScreen.sh b/config/hypr/scripts/LockScreen.sh
index bf9fcf5..56d496a 100755
--- a/config/hypr/scripts/LockScreen.sh
+++ b/config/hypr/scripts/LockScreen.sh
@@ -1,7 +1,5 @@
#!/bin/bash
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ##
-# For Swaylock
-CONFIG="$HOME/.config/swaylock/config"
-
-sleep 0.5s; swaylock --config ${CONFIG} & disown
+# For Hyprlock
+hyprlock -q
\ No newline at end of file
diff --git a/config/hypr/v2.2.7 b/config/hypr/v2.2.8
similarity index 100%
rename from config/hypr/v2.2.7
rename to config/hypr/v2.2.8