diff --git a/gui/hypr/hypridle.conf b/gui/hypr/hypridle.conf
new file mode 100644
index 00000000..ab686f3d
--- /dev/null
+++ b/gui/hypr/hypridle.conf
@@ -0,0 +1,19 @@
+# This section was stolen from https://wiki.hyprland.org/Hypr-Ecosystem/hypridle/
+general {
+ lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
+ before_sleep_cmd = loginctl lock-session    # lock before suspend.
+ after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
+}
+
+# Lock screen
+listener {
+    timeout = 600
+    on-timeout = loginctl lock-session
+}
+
+# Turn on/off monitor
+listener {
+    timeout = 600
+    on-timeout = hyprctl dispatch dpms off
+    on-resume = hyprctl dispatch dpms on
+}
diff --git a/gui/hypr/hyprland.conf b/gui/hypr/hyprland.conf
index 3d0305d5..e36a21b1 100644
--- a/gui/hypr/hyprland.conf
+++ b/gui/hypr/hyprland.conf
@@ -5,7 +5,6 @@
 ###############################
 # User directory
 $dirHome = /home/jeremystartm/
-$dirHypr = $dirHome/.config/hypr/
 
 # Settings
 # -> Keyboard
@@ -42,6 +41,10 @@ $programsNotiDaemon = fnott
 $programsAuthAgent = /usr/lib/polkit-kde-authentication-agent-1
 $programsBar = waybar
 
+# Internal variables, do not change
+$dirHypr = $dirHome/.config/hypr/
+$programsJobrunner = $dirHome/.local/bin/jobrunner-runjob
+
 # Application startup
 # -> Jobrunner
 exec=exec env JOBRUNNER_DISABLEOUTPUT=y $dirHome/.local/bin/jobrunner
@@ -56,11 +59,13 @@ exec=wl-paste --type image --watch cliphist store
 # -> Screen sharing
 exec=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 # -> Autostart
-exec-once=cd $dirHypr;exec $dirHypr/scripts.d/autostart.sh
+exec-once=$programsJobrunner "exec $dirHypr/scripts.d/commands-startup.sh"
+exec=$programsJobrunner "exec $dirHypr/scripts.d/commands-reload.sh"
 
 # Env
 # -> Cursor
 env = XCURSOR_SIZE,$settingsCursorSize
+env = HYPRCURSOR_THEME,Posy_Cursor
 env = HYPRCURSOR_SIZE,$settingsCursorSize
 # -> XDG
 env = XDG_CURRENT_DESKTOP,Hyprland
@@ -79,11 +84,11 @@ env = ELECTRON_OZONE_PLATFORM_HINT=wayland
 # HYPRLAND CONFIGURATION OPTIONS
 # -> Bindings
 # --> Programs
-bind = SUPER, SUPER_L, exec, pkill -9 $programsMenuKill || $dirHome/.local/bin/jobrunner-runjob $programsMenu
-bind = SUPER, V, exec, exec $dirHome/.local/bin/jobrunner-runjob "$programsClipboard"
-bind = SUPER, A, exec, $programsTerminal
-bind = SUPER, S, exec, $programsFM
-bind = SUPER, D, exec, $programsBrowser
+bind = SUPER, SUPER_L, exec, pkill -9 $programsMenuKill || $programsJobrunner $programsMenu
+bind = SUPER, V, exec, exec $programsJobrunner $programsClipboard"
+bind = SUPER, A, exec, exec $programsJobrunner $programsTerminal
+bind = SUPER, S, exec, exec $programsJobrunner $programsFM
+bind = SUPER, D, exec, exec $programsJobrunner $programsBrowser
 
 # --> Window size/position manipulation
 bindm = SUPER, mouse:272, movewindow  
@@ -101,7 +106,8 @@ bind = SUPER, Y, movetoworkspace, special:magic
 bind = SUPER_SHIFT, Y, movetoworkspace, 0
 
 # --> Session management
-bindt = SUPER_SHIFT, M, exec, hyprctl reload
+bindt = SUPER_SHIFT, M, exec, $programsJobrunner hyprctl reload
+bindt = SUPER_SHIFT, L, exec, hyprlock
 bindt = SUPER_SHIFT, Q, exit
 bindt = SUPER_SHIFT, W, exec, poweroff
 bindt = SUPER_SHIFT, E, exec, reboot
@@ -174,6 +180,7 @@ decoration {
   ignore_opacity = 1
   xray = 1
   
+  size = 6
   noise = 0.03  # increased noise value for a slightly more "rough" look
  }
 }
diff --git a/gui/hypr/hyprlock.conf b/gui/hypr/hyprlock.conf
new file mode 100644
index 00000000..0f9829ec
--- /dev/null
+++ b/gui/hypr/hyprlock.conf
@@ -0,0 +1,47 @@
+# old hyprland anime wallpaper
+$wallpaper = old-hyprland-anime.png
+$blur = 1
+
+general {
+ disable_loading_bar=0
+ hide_cursor=1
+ ignore_empty_input=1
+}
+
+# Wallpaper
+background {
+ path = wallpapers.d/$wallpaper
+ color = 0x1b1b1b
+ 
+ blur_passes = $blur
+ blur_size = 4
+ noise = 0.03  # increased noise value for a slightly more "rough" look
+}
+
+# Title
+#label {
+# text = Enter your password
+# text_align = center
+# color = 0xffffffff
+# 
+# font_size = 36
+# font_family = Jost
+# 
+# position = 0, -10
+# halign = center
+# valign = top
+#}
+
+# Failure info
+label {
+ text = $FAIL
+ text_align = center
+ color = 0xffffffff
+ 
+ font_size = 24
+ font_family = Jost
+ 
+ position = 0, 10
+ halign = center
+ valign = bottom
+}
diff --git a/gui/hypr/scripts.d/commands-reload.sh b/gui/hypr/scripts.d/commands-reload.sh
new file mode 100755
index 00000000..82145fb5
--- /dev/null
+++ b/gui/hypr/scripts.d/commands-reload.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+cd ${HOME}/.config/hypr
+# This script will be executed on every Hyprland configuration reload & startup
+
+# Programs here
+# Append ' &' to all of them or this script won't work
+
+# hyprpaper
+pkill -9 hyprpaper
+hyprpaper &
+
+# hypridle
+pkill -9 hypridle
+hypridle &
+
+# Wait for all tasks to finish
+# Do not remove this.
+wait
diff --git a/gui/hypr/scripts.d/autostart.sh b/gui/hypr/scripts.d/commands-startup.sh
similarity index 54%
rename from gui/hypr/scripts.d/autostart.sh
rename to gui/hypr/scripts.d/commands-startup.sh
index efd1059c..34f8c964 100755
--- a/gui/hypr/scripts.d/autostart.sh
+++ b/gui/hypr/scripts.d/commands-startup.sh
@@ -1,11 +1,9 @@
 #!/bin/bash
-# Autostart script
+cd ${HOME}/.config/hypr
+# This script will be executed on every Hyprland startup
 
 # Programs here
-# Append ' &' to all of them
-
-# Hyprpaper
-hyprpaper &
+# Append ' &' to all of them or this script won't work
 
 # Bitfocus Companion
 # Useful if you have an Elgato Streamdeck
diff --git a/gui/hypr/wallpapers.d/logonui.png b/gui/hypr/wallpapers.d/logonui.png
new file mode 100644
index 00000000..9910adb5
Binary files /dev/null and b/gui/hypr/wallpapers.d/logonui.png differ