diff --git a/config/hypr/config/display.conf b/config/hypr/config/display.conf
index 0928956..79a0398 100644
--- a/config/hypr/config/display.conf
+++ b/config/hypr/config/display.conf
@@ -1,28 +1,38 @@
-# Monitor ( https://wiki.hyprland.org/Configuring/Monitors )
+#############################################
+# MONITORS
+#############################################
+
 monitor=,1920x1080@240,auto,1
 # monitor=Unknown-1,disabled
 
-# General Configuration
-general { 
+
+#############################################
+# GENERAL
+#############################################
+
+general {
 	gaps_in = 5
 	gaps_out = 20
 	border_size = 2
 
 	col.active_border = rgb(89b4fa)
-	# rgba(088f72ee) rgba(2ccfabee) rgba(088f72ee) rgba(ffffffee) rgba(7bade2ee) rgba(5049ccee) rgba(3e1a78ee) 90deg
 	col.inactive_border = rgb(585b70)
-	resize_on_border = false 
+
+	resize_on_border = false
 	allow_tearing = true
 	layout = dwindle
 }
 
-# Window Decorations
+
+#############################################
+# DECORATION
+#############################################
+
 decoration {
 	rounding = 12
 
-	# Change transparency of focused and unfocused windows
 	active_opacity = 1.0
-	inactive_opacity = 1
+	inactive_opacity = 1.0
 	fullscreen_opacity = 1.0
 
 	shadow {
@@ -40,67 +50,110 @@ decoration {
 		size = 3
 		passes = 1
 		xray = false
-
 		vibrancy = 0.1696
 	}
 }
 
-# Animations
+
+#############################################
+# ANIMATIONS
+#############################################
+
 animations {
 	enabled = true
 
 	bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-	bezier = main, 0.445, 0.05, 0.55, 0.95
+	bezier = main,     0.445, 0.05, 0.55, 0.95
 	bezier = monitorBez, 0, 1, 1, 1
 
-	animation = windows, 1, 7, myBezier
-	animation = windowsOut, 1, 7, default
-	animation = border, 1, 10, default
-	animation = borderangle, 1, 8, default
-	animation = fade, 1, 7, default
-	animation = workspaces, 1, 6, default, slide
-
+	animation = windows,          1, 7, myBezier
+	animation = windowsOut,       1, 7, default
+	animation = border,           1, 10, default
+	animation = borderangle,      1, 8, default
+	animation = fade,             1, 7, default
+	animation = workspaces,       1, 6, default, slide
 	animation = specialWorkspace, 1, 6, myBezier, slide
-
-	# animation = specialWorkspaceIn, 1, 6, myBezier, slidevert bottom
-	# animation = specialWorkspaceOut, 1, 6, myBezier, slidevert top
-
-	animation = monitorAdded, 1, 30, monitorBez
-
+	animation = monitorAdded,     1, 30, monitorBez
 }
 
+
+#############################################
+# RENDER
+#############################################
+
 render {
 	# new_render_scheduling = true
 }
 
+
+#############################################
+# CURSOR
+#############################################
+
 cursor {
 	use_cpu_buffer = 2
 	enable_hyprcursor = true
 	invisible = false
 }
 
-windowrule = tag +game, class:org.vinegarhq.Sober
-windowrule = tag +game, class:com.mojang.minecraft.java-edition
-windowrule = tag +discord, class:equibop
 
-windowrule = tag +code, class:code
-windowrule = tag +music, class:cider
-windowrule = tag +music, class:spotify
+#############################################
+# WINDOW RULES (TAGGING)
+#############################################
 
-# windowrule = opacity 0.7, tag:music
-
-windowrulev2 = renderunfocused, tag:music
-windowrulev2 = renderunfocused, tag:game
-windowrulev2 = renderunfocused, tag:discord
-
-# Dwindle layout
-dwindle {
-	pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-	preserve_split = true # You probably want this
+windowrule {
+	name = games
+	match:class = org.vinegarhq.Sober|com.mojang.minecraft.java-edition|deltarune.exe|steam_app_1671210
+	tag = +game
 }
 
-# Misc Config
-misc { 
+windowrule {
+	name = discord
+	match:class = equibop
+	tag = +discord
+}
+
+windowrule {
+	name = deltarune
+	match:class = deltarune.exe|steam_app_1671210
+	tag = +deltarune
+}
+
+windowrule {
+	name = code
+	match:class = code|windsurf
+	tag = +code
+}
+
+windowrule {
+	name = music
+	match:class = cider|spotify
+	tag = +music
+}
+
+# Tag behavior rules
+windowrule {
+	name = render unfocused
+	match:tag = music|game|discord
+	render_unfocused = on
+}
+
+
+#############################################
+# LAYOUTS
+#############################################
+
+dwindle {
+	pseudotile = true
+	preserve_split = true
+}
+
+
+#############################################
+# MISC
+#############################################
+
+misc {
 	force_default_wallpaper = 2
 	disable_hyprland_logo = false
 	initial_workspace_tracking = 0
@@ -111,47 +164,65 @@ misc {
 	allow_session_lock_restore = 1
 }
 
-# Layer Rules
-layerrule = animation slide top, waybar
-layerrule = abovelock true, waybar
-layerrule = abovelock true, notifications
 
-# layerrule = noscreenshare, notifications
+#############################################
+# LAYER RULES
+#############################################
 
-layerrule = animation fade, selection
-layerrule = animation popin 70%, wofi
-layerrule = animation slide right, notifications
-layerrule = dimaround, wofi
+layerrule {
+	name = waybar
+	match:namespace = waybar
+	animation = slide top
+	above_lock = 2
+	order = -20
+}
 
-layerrule = order -999, wl_shimeji
-layerrule = order -10, wofi
-layerrule = order -20, waybar
-layerrule = order -25, gtk-layer-shell
-layerrule = blur, swww-daemon
+layerrule {
+	name = notifications
+	match:namespace = notifications
+	animation = slide right
+	above_lock = 2
+}
 
-# Window Rules
-windowrulev2 = float,class:^(blueman-manager-wrapped)$
-windowrulev2 = size 900 500,class:^(blueman-manager-wrapped)$
-windowrulev2 = center,class:^(blueman-manager-wrapped)$
+layerrule {
+	name = wofi
+	match:namespace = wofi
+	animation = popin 70%
+	dim_around = on
+	order = -10
+}
 
-windowrulev2 = float,class:^(org.pulseaudio.pavucontrol)$
-windowrulev2 = size 900 500,class:^(org.pulseaudio.pavucontrol)$
-windowrulev2 = center,class:^(org.pulseaudio.pavucontrol)$
+layerrule {
+	name = shimeji
+	match:namespace = wl_shimeji
+	order = -9999
+	above_lock = 2
+}
 
-windowrulev2 = float,class:^(nm-connection-editor)$
-windowrulev2 = size 900 500,class:^(nm-connection-editor)$
-windowrulev2 = center,class:^(nm-connection-editor)$
+layerrule {
+	name = gtk layer shell
+	match:namespace = gtk-layer-shell
+	order = -25
+}
 
-windowrulev2 = allowsinput,class:^(steam_proton)$
 
-windowrulev2 = renderunfocused, class:^(equibop)$
-windowrulev2 = renderunfocused, class:^(discord)$
+#############################################
+# FLOATING UTILITY WINDOWS
+#############################################
 
-# dotfille settings
-windowrulev2 = float,class:io.Astal.ocbwoy3-settings
-windowrulev2 = size 900 500,class:io.Astal.ocbwoy3-settings
-windowrulev2 = center,class:io.Astal.ocbwoy3-settings
+windowrule {
+	name = blueman music internet
+	match:class = blueman-manager|blueman-manager-wrapped|org.pulseaudio.pavucontrol|nm-connection-editor|nm-connection-editor-wrapped
+	float = true
+	size = 900 500
+	center = true
+}
 
+#############################################
+# OTHER
+#############################################
+
+windowrule = match:class steam_proton|org.vinegarhq.Sober, allows_input on
 
 # windowrulev2 = immediate, class:^(sober)$
 # windowrulev2 = fullscreen,title:^(Sober)$
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index 689370a..33d57b2 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -5,15 +5,14 @@ general {
   disable_loading_bar = false
   hide_cursor = false
   ignore_empty_input = true
-  immediate_render = true
+  immediate_render = false
   text_trim = true
 }
 
 #BACKGROUND
 background {
     monitor = 
-    path = ~/Pictures/Wallpapers/wall_anime2_4k.png
-    blur_passes = 1
+    path = ~/Pictures/Wallpapers/kris_ralsei_kissing.png # definetly not a picture of kris and ralsei kissing!!
 }
 
 input-field {
@@ -32,9 +31,9 @@ input-field {
     placeholder_text = Session locked, enter password to unlock!
     hide_input = false
     fail_text = Password hint: Favorite Character - Deltarune, not Regretevator!
-    position = 0, -470
+    position = 0, -30
     halign = center
-    valign = center
+    valign = top
     zindex = 10
 }