diff --git a/.config/hypr/conf.d/20-monitors.conf##hostname.cn-arch b/.config/hypr/conf.d/20-monitors.conf##hostname.cn-arch
index 5eeb268..dc78919 100644
--- a/.config/hypr/conf.d/20-monitors.conf##hostname.cn-arch
+++ b/.config/hypr/conf.d/20-monitors.conf##hostname.cn-arch
@@ -2,5 +2,3 @@ monitor = DP-1, 2560x1440@99.95, 1920x1584, 1, bitdepth, 10, cm, auto
 monitor = DP-2, 3440x1440@100.0, 1476x144, 1, bitdepth, 10, cm, auto
 monitor = HDMI-A-1, 1920x1080@60.0, 0x1584, 1
 
-monitor = , preferred, auto, 1
-
diff --git a/.config/hypr/conf.d/40-keybinds.conf##hostname.cn-arch b/.config/hypr/conf.d/40-keybinds.conf##hostname.cn-arch
index 281e2e0..7f24248 100644
--- a/.config/hypr/conf.d/40-keybinds.conf##hostname.cn-arch
+++ b/.config/hypr/conf.d/40-keybinds.conf##hostname.cn-arch
@@ -54,6 +54,7 @@ bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, D, exec, $launcher
 bind = $mainMod SHIFT, D, exec, $uuctl
 bind = $mainMod, PERIOD, exec, $emote
+bind = $mainMod, F12, exec, pkill -SIGUSR2 waybar
 
 # swaync Binds
 bind = $mainMod, Grave, exec, $notcenter
diff --git a/.config/hypr/conf.d/50-autostart.conf##hostname.cn-arch b/.config/hypr/conf.d/50-autostart.conf##hostname.cn-arch
index 048947d..85f1233 100644
--- a/.config/hypr/conf.d/50-autostart.conf##hostname.cn-arch
+++ b/.config/hypr/conf.d/50-autostart.conf##hostname.cn-arch
@@ -1,10 +1,10 @@
 # ~/.config/hypr/conf.d/50-autostart.conf
 
 exec-once = uwsm app -- swaync
-exec-once = xsettingsd
-exec-once = ~/.config/waybar/scripts/hyprsunset_daemon.sh
 exec-once = uwsm app -- waybar
+exec-once = xsettingsd
 exec-once = hyprsunset
+exec-once = ~/.config/waybar/scripts/hyprsunset_daemon.sh
 
 exec = hyprpaper -c $HOME/.config/hyprpaper.conf
 exec = swayosd-server
diff --git a/.config/hypr/hypridle.conf##hostname.cn-arch b/.config/hypr/hypridle.conf##hostname.cn-arch
index 19b298f..475d102 100644
--- a/.config/hypr/hypridle.conf##hostname.cn-arch
+++ b/.config/hypr/hypridle.conf##hostname.cn-arch
@@ -1,46 +1,22 @@
-# ~/.config/hypr/hypridle.conf
-
-### based on the example config from hyprland.org
+# Same as cn-arch: lock at 10 min, screen off at 15 min.
 
 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.
-    ignore_dbus_inhibit = false                 # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
-    ignore_systemd_inhibit = false              # whether to ignore systemd-inhibit --what=idle inhibitors
-    on_lock_cmd = dbus-send --session --dest=org.freedesktop.secrets \
-        --type=method_call  \
-        /org/freedesktop/secrets \
-        org.freedesktop.Secret.Service.Lock \
-        array:objpath:/org/freedesktop/secrets/collection/login
+  lock_cmd = hyprlock
+  before_sleep_cmd = hyprlock
+  after_sleep_cmd = hyprctl dispatch dpms on
 }
 
-
-#listener {
-#    timeout = 150                                # 2.5min.
-#    on-timeout = brightnessctl -s set 10         # set monitor backlight to minimum, avoid 0 on OLED monitor.
-#    on-resume = brightnessctl -r                 # monitor backlight restore.
-#}
-
-# turn off keyboard backlight, comment out this section if you dont have a keyboard backlight.
-#listener {
-#    timeout = 150                                          # 2.5min.
-#    on-timeout = brightnessctl -sd rgb:kbd_backlight set 0 # turn off keyboard backlight.
-#    on-resume = brightnessctl -rd rgb:kbd_backlight        # turn on keyboard backlight.
-#}
-
+# Lock after 10 minutes
 listener {
-    timeout = 300                                 # 5min
-    on-timeout = hyprctl dispatch dpms off        # screen off when timeout has passed
-    on-resume = hyprctl dispatch dpms on          # screen on when activity is detected after timeout has fired.
+  timeout = 600
+  on-timeout = hyprlock
 }
 
+# DPMS off after 15 minutes (wakes on input)
 listener {
-    timeout = 1800                                # 30min
-    on-timeout = loginctl lock-session            # lock screen when timeout has passed
+  timeout = 900
+  on-timeout = hyprctl dispatch dpms off
+  on-resume = hyprctl dispatch dpms on
 }
 
-listener {
-    timeout = 3600                                # 60min
-    on-timeout = systemctl hibernate              # hibernate and suspend pc
-}
+
diff --git a/.config/hypr/hyprlock.conf##hostname.cn-arch b/.config/hypr/hyprlock.conf##hostname.cn-arch
index f1a485b..cacf642 100644
--- a/.config/hypr/hyprlock.conf##hostname.cn-arch
+++ b/.config/hypr/hyprlock.conf##hostname.cn-arch
@@ -1,75 +1,36 @@
-# ~/.config/hypr/hyprlock.conf
-
-general {
-  hide_cursor = true
-  ignore_empty_input = true
-}
-
-##################
-### BACKGROUND ###
-##################
+# Same minimal lock as cn-arch
 
 background {
-  monitor = eDP-1
-  path    = $HOME/.config/hypr/images/standard.jpg
+  monitor =
+  path = ~/.config/hypr/images/standard.jpg
+  blur_size = 8
+  blur_passes = 2
+  brightness = 0.7
 }
 
-#############
-### INPUT ###
-#############
-
 input-field {
-  size             = 250, 60
-  outline_thickness= 2
-  dots_size        = 0.2     # you control the look of the dots manually
-  dots_spacing     = 0.35
-  dots_center      = true
-
-  # Outer ring transparent, inner pill matches Waybar bg
-  outer_color      = rgba(11, 27, 43, 0)     # bg_main fully transparent
-  inner_color      = rgba(11, 27, 43, 0.85)  # bg_main at 85% opacity
-
-  font_color       = rgba(202, 211, 232, 0.8) # content_main at 80%
-  fade_on_empty    = false
-
-  rounding         = 20   # nice pill shape
-  check_color      = #4F84CC  # Abyss Accent
-
-  placeholder_text = 
-  hide_input       = false
-
-  position         = 0, -200
-  halign           = center
-  valign           = center
+  monitor =
+  outline_thickness = 2
+  rounding = 8
+  size = 300, 42
+  position = 0, -100
+  dots_center = true
 }
 
-############
-### DATE ###
-############
-
 label {
-  monitor   =
-  text      = cmd[update:1000] echo "$(date +"%A, %B %d")"
-  color     = rgba(202, 211, 232, 0.75)  # Sea Foam a bit lighter
-  font_size = 22
-  font_family = Inconsolata Nerd Font Mono
-  position  = 0, 300
-  halign    = center
-  valign    = center
+  monitor =
+  text = $TIME
+  font_size = 32
+  position = 0, 40
+  color = rgba(ffffffff)
 }
 
-############
-### TIME ###
-############
-
 label {
-  monitor   =
-  text      = cmd[update:1000] echo "$(date +"%-I:%M")"
-  color     = rgba(202, 211, 232, 0.75)
-  font_size = 95
-  font_family = Inconsolata Nerd Font Mono Bold
-  position  = 0, 200
-  halign    = center
-  valign    = center
+  monitor =
+  text = $USER
+  font_size = 16
+  position = 0, 80
+  color = rgba(ddddddff)
 }
 
+
diff --git a/.config/hypr/hyprpaper.conf##hostname.cn-arch b/.config/hypr/hyprpaper.conf##hostname.cn-arch
index c104ddf..879fb2e 100644
--- a/.config/hypr/hyprpaper.conf##hostname.cn-arch
+++ b/.config/hypr/hyprpaper.conf##hostname.cn-arch
@@ -1,10 +1,5 @@
 # ~/.config/hypr/hyprpaper.conf
 
-#splash = true
-splash_color = 4F84CCFF    # Abyss Accent w/ full opacity
-splash_offset = 2.0
-ipc = true
-
 # Preload your ultrawide as a quick fallback
 preload = $HOME/.config/hypr/images/standard.jpg
 preload = $HOME/.config/hypr/images/ultrawide.jpg