diff --git a/hypr/lid_monitor.conf b/hypr/lid_monitor.conf
new file mode 100644
index 0000000..e8e4907
--- /dev/null
+++ b/hypr/lid_monitor.conf
@@ -0,0 +1 @@
+monitor=eDP-1, disable
diff --git a/hypr/lid_state.conf b/hypr/lid_state.conf
new file mode 100644
index 0000000..e8e4907
--- /dev/null
+++ b/hypr/lid_state.conf
@@ -0,0 +1 @@
+monitor=eDP-1, disable
diff --git a/hypr/modules/autostart.conf b/hypr/modules/autostart.conf
index babbe8f..5721066 100644
--- a/hypr/modules/autostart.conf
+++ b/hypr/modules/autostart.conf
@@ -14,4 +14,4 @@ exec-once = uwsm app -- hyprpaper
 # exec-once = uwsm app -- /usr/lib/xdg-desktop-portal-hyprland
 exec-once = wl-paste --type text --watch cliphist store # Stores only text data
 exec-once = wl-paste --type image --watch cliphist store # Stores only image data
-exec-once = uwsm app -- ~/.config/waybar/fluxo-rs/target/release/fluxo-rs daemon
+exec-once = uwsm app -- ~/.cargo/bin/fluxo-rs daemon
diff --git a/hypr/modules/monitors.conf b/hypr/modules/monitors.conf
index db9613e..185dfe7 100644
--- a/hypr/modules/monitors.conf
+++ b/hypr/modules/monitors.conf
@@ -1,7 +1,9 @@
 
-# monitor = desc:Samsung Electric Company LC27G7xT H4ZRA00734, 2560x1440@240, 0x-1440, 1
-# monitor = desc:Samsung Electric Company LC27G7xT H4ZRA00734, 2560x1440@90, 0x-1440, 1, bitdepth, 10
-monitor = desc:Samsung Electric Company LC27G7xT H4ZRA00734, 1920x1080@240, 0x-1080, 1
-# monitor = desc:Samsung Electric Company LC27G7xT H4ZRA00734, 1920x1080@60, 0x-1080, 1
-# monitor = desc:Samsung Electric Company LC27G7xT H4ZRA00734, 1280x720@240, 0x-720, 1
+# laptop screen
 monitor = eDP-1, 1920x1080@60, 0x0, 1
+# samsung home monitor
+monitor = desc:Samsung Electric Company LC27G7xT H4ZRA00734, 2560x1440@90, 0x-1440, 1
+
+
+# lid_state fallback
+source = ~/.config/hypr/lid_state.conf
diff --git a/hypr/modules/window_rules.conf b/hypr/modules/window_rules.conf
index eeb120e..84fba41 100644
--- a/hypr/modules/window_rules.conf
+++ b/hypr/modules/window_rules.conf
@@ -1,6 +1,21 @@
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
 
+# ==========================================
+# VARIABLES
+# ==========================================
+# Dialogs and utility apps that should float in the center
+$dialog_titles = ^(Open Form|Open File|Select a File|Choose a file|Open Workspace|Choose Directory|Save As|Save File|branchdialog|pinentry-gtk-2|Confirm to replace files|File Operation Progress)$
+$dialog_classes = ^(pavucontrol|blueman-manager|nm-connection-editor|org.pulseaudio.pavucontrol)$
+
+# App classes
+$steam = ^(steam)$
+$gamescope = ^(gamescope)$
+
+
+# ==========================================
+# GENERAL & FIXES
+# ==========================================
 # Ignore maximize requests from apps. You'll probably like this.
 # windowrule = suppress_event maximize, match:class .*
 
@@ -9,45 +24,54 @@
 windowrule = no_blur 1, match:class ^$, match:title ^$
 
 
-# games for tearing add the immediate rule
+# ==========================================
+# FLOATING & CENTERED DIALOGS
+# ==========================================
+# Make them float
+windowrule = float 1, match:title $dialog_titles
+windowrule = float 1, match:class $dialog_classes
 
-# Float Windows
-windowrule = float 1, match:title ^(Open File|Select a File|Select Folder|Choose a file|Open Form|Open Workspace|Choose Directory|Save As|Save File|branchdialog|pinentry-gtk-2|Confirm to replace files|File Operation Progress)$
-windowrule = float 1, match:class ^(pavucontrol|blueman-manager|nm-connection-editor)$
+# Set to 800x600
+windowrule = size 800 600, match:title $dialog_titles
+windowrule = size 800 600, match:class $dialog_classes
 
-# Center and Resize Windows
-windowrule = size 800 600, match:title ^(Open Form|Open File|Select a File|Choose a file|Open Workspace|Choose Directory|Save As|Save File|branchdialog|pinentry-gtk-2|Confirm to replace files|File Operation Progress)$
-windowrule = size 800 600, match:class ^(pavucontrol|blueman-manager|nm-connection-editor)$
+# Center them on the screen
+windowrule = center 1, match:title $dialog_titles
+windowrule = center 1, match:class $dialog_classes
 
-windowrule = center 1, match:title ^(Open Form|Open File|Select a File|Choose a file|Open Workspace|Choose Directory|Save As|Save File|branchdialog|pinentry-gtk-2|Confirm to replace files|File Operation Progress)$
-windowrule = center 1, match:class ^(pavucontrol|blueman-manager|nm-connection-editor)$
+# Disable blur
+windowrule = no_blur 1, match:title $dialog_titles
+windowrule = no_blur 1, match:class $dialog_classes
 
-windowrule = no_blur 1, match:title ^(Open Form|Open File|Select a File|Choose a file|Open Workspace|Choose Directory|Save As|Save File|branchdialog|pinentry-gtk-2|Confirm to replace files|File Operation Progress)$
-windowrule = no_blur 1, match:class ^(pavucontrol|blueman-manager|nm-connection-editor)$
 
-# Workspace Rules
+# ==========================================
+# WORKSPACE ASSIGNMENTS
+# ==========================================
+# Normal Workspaces
 # windowrule = workspace 1, match:class ^(firefox)$
 # windowrule = workspace 2, match:class ^(kitty)$
 # windowrule = workspace 3, match:class ^(Code)$
+windowrule = workspace 1, match:class $gamescope
 
-
+# Special Workspaces
 windowrule = workspace special:virtual, match:class ^(Spotify|spotify)$
 windowrule = workspace special:discord, match:class ^(discord|vesktop)$
 
-# steam rules
 
-windowrule = workspace 3 silent, match:class ^(steam)$, match:title ^(Steam)$
-windowrule = workspace 4, match:class ^(gamescope)$
+# ==========================================
+# APP-SPECIFIC RULES: STEAM & GAMING
+# ==========================================
+# windowrule = workspace 3 silent, match:class $steam, match:title ^(Steam)$
 
-# fixed sizes for different windows
-windowrule = size 400 800, match:title ^(Friends List)$, match:class ^(steam)$
-windowrule = size 1000 800, match:title ^(Steam Settings)$, match:class ^(steam)$
-windowrule = size 1000 800, match:title ^(Add Non-Steam Game)$, match:class ^(steam)$
+# Fixed sizes for specific Steam windows
+windowrule = size 400 800, match:title ^(Friends List)$, match:class $steam
+windowrule = size 1000 800, match:title ^(Steam Settings)$, match:class $steam
+windowrule = size 1000 800, match:title ^(Add Non-Steam Game)$, match:class $steam
 
-# float windows that arent the main steam window
-windowrule = float 1, match:class ^(steam)$, match:title negative:^(Steam)$
-windowrule = no_blur 1, match:class ^(steam)$, match:title negative:^(Steam)$
-# windowrule = center 1, match:class ^(steam)$, match:title negative:^(Steam)$
+# Float and disable blur for Steam windows that aren't the main window
+windowrule = float 1, match:class $steam, match:title negative:^(Steam)$
+windowrule = no_blur 1, match:class $steam, match:title negative:^(Steam)$
+# windowrule = center 1, match:class $steam, match:title negative:^(Steam)$
 
-# allow tearing for games started with gamescope
-windowrule = immediate 1, match:class ^(gamescope)$
+# Allow tearing for games started with Gamescope
+windowrule = immediate 1, match:class $gamescope
diff --git a/hypr/scripts/lid_handler.sh b/hypr/scripts/lid_handler.sh
index d0084e5..37ad882 100755
--- a/hypr/scripts/lid_handler.sh
+++ b/hypr/scripts/lid_handler.sh
@@ -1,19 +1,53 @@
 #!/bin/bash
 # ~/.config/hypr/scripts/lid_handler.sh
 
+# The file that tells Hyprland to keep the lid off during reloads
+LID_STATE_FILE="$HOME/.config/hypr/lid_state.conf"
+
+restart_ui() {
+    # Spawn in background and detach
+	systemctl restart --user waybar hyprpaper
+}
+
 if [[ "$1" == "close" ]]; then
-    # Lid closed: disable laptop screen if any DP-* monitor is present
-    # Using 'all' to detect monitors even if they are currently disabled
-    if hyprctl monitors all | grep -q "Monitor DP-"; then
-        hyprctl keyword monitor "eDP-1, disable" # Disable laptop display
+    # Check if ANY external monitor is connected and active
+    if hyprctl monitors all | grep -qE "Monitor (DP|HDMI|Type-C)-"; then
         
-        # Enable all detected DP-* monitors
-        for monitor in $(hyprctl monitors all | grep "Monitor DP-" | awk '{print $2}'); do
-            hyprctl keyword monitor "$monitor, enable"
+        # Prevent laptop screen from turning on during manual config reloads
+        echo "monitor=eDP-1, disable" > "$LID_STATE_FILE"
+        
+        # Extract the CURRENT live settings of all external monitors using jq
+        # This grabs the active resolution, refresh rate, position, and scale.
+        LIVE_MONITORS=$(hyprctl -j monitors | jq -c '.[] | select(.name != "eDP-1")')
+        
+        # 3. Disable the laptop screen
+        hyprctl keyword monitor "eDP-1, disable"
+        
+        # 4. Re-apply the live settings to external monitors so they don't reset
+        echo "$LIVE_MONITORS" | while read -r mon_json; do
+            NAME=$(echo "$mon_json" | jq -r '.name')
+            WIDTH=$(echo "$mon_json" | jq -r '.width')
+            HEIGHT=$(echo "$mon_json" | jq -r '.height')
+            REFRESH=$(echo "$mon_json" | jq -r '.refreshRate')
+            X=$(echo "$mon_json" | jq -r '.x')
+            Y=$(echo "$mon_json" | jq -r '.y')
+            SCALE=$(echo "$mon_json" | jq -r '.scale')
+            
+            # Formats it exactly as Hyprland expects: DP-1, 1920x1080@240, 0x0, 1
+            hyprctl keyword monitor "$NAME, ${WIDTH}x${HEIGHT}@${REFRESH}, ${X}x${Y}, $SCALE"
         done
-		systemd-run --user --on-active=5s systemctl --user restart waybar.service hyprpaper.service
+        
+		# restart ui
+        restart_ui
     fi
+
 elif [[ "$1" == "open" ]]; then
-    # Lid opened: re-enable laptop screen
-    hyprctl keyword monitor "eDP-1, enable"
+    # Clear the override file so the laptop screen is allowed to turn on again
+    echo "" > "$LID_STATE_FILE"
+    
+    # Let Hyprland reload itself. 
+    # This automatically re-enables eDP-1 based on your hardcoded hyprland.conf!
+    hyprctl reload
+    
+    restart_ui
 fi