diff --git a/core/home/config/nomarchy/default/hypr/autostart.conf b/core/home/config/nomarchy/default/hypr/autostart.conf
index 095da93..4135091 100644
--- a/core/home/config/nomarchy/default/hypr/autostart.conf
+++ b/core/home/config/nomarchy/default/hypr/autostart.conf
@@ -11,3 +11,6 @@ exec-once = nomarchy-on-boot
 # Slow app launch fix -- set systemd vars
 exec-once = systemctl --user import-environment $(env | cut -d'=' -f 1)
 exec-once = dbus-update-activation-environment --systemd --all
+
+# Network Manager
+exec-once = uwsm-app 'nm-applet --indicator'
diff --git a/core/home/config/nomarchy/default/hypr/bindings/tiling.conf b/core/home/config/nomarchy/default/hypr/bindings/tiling.conf
index c3360e9..03c217c 100644
--- a/core/home/config/nomarchy/default/hypr/bindings/tiling.conf
+++ b/core/home/config/nomarchy/default/hypr/bindings/tiling.conf
@@ -2,7 +2,7 @@
 # Do not make changes here, but bring them to tiling-v2.conf instead.
 
 # Close windows
-bindd = SUPER, W, Close window, killactive,
+bindd = SUPER, Q, Close window, killactive,
 bindd = CTRL ALT, DELETE, Close all windows, exec, nomarchy-hyprland-window-close-all
 
 # Control tiling
diff --git a/core/system/network.nix b/core/system/network.nix
index 1a8d25a..9d7cb77 100644
--- a/core/system/network.nix
+++ b/core/system/network.nix
@@ -25,4 +25,8 @@ in
       DNSOverTLS=opportunistic
     '';
   };
+
+  environment.systemPackages = [
+   pkgs.networkmanagerapplet
+  ];
 }
diff --git a/features/desktop/hyprland/config/bindings.conf b/features/desktop/hyprland/config/bindings.conf
index 8211760..6f066a7 100644
--- a/features/desktop/hyprland/config/bindings.conf
+++ b/features/desktop/hyprland/config/bindings.conf
@@ -2,8 +2,8 @@
 bindd = SUPER, RETURN, Terminal, exec, uwsm-app -- xdg-terminal-exec || uwsm-app -- alacritty
 bindd = SUPER ALT, RETURN, Tmux, exec, uwsm-app -- xdg-terminal-exec bash -c "tmux attach || tmux new -s Work"
 bindd = SUPER SHIFT, RETURN, Browser, exec, nomarchy-launch-browser
-bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window
-bindd = SUPER ALT SHIFT, F, File manager (cwd), exec, uwsm-app -- nautilus --new-window "$(nomarchy-cmd-terminal-cwd)"
+bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- thunar --new-window
+bindd = SUPER ALT SHIFT, F, File manager (cwd), exec, uwsm-app -- thunar --new-window "$(nomarchy-cmd-terminal-cwd)"
 bindd = SUPER SHIFT, B, Browser, exec, nomarchy-launch-browser
 bindd = SUPER SHIFT ALT, B, Browser (private), exec, nomarchy-launch-browser --private
 bindd = SUPER SHIFT, M, Music, exec, nomarchy-launch-or-focus spotify
diff --git a/features/desktop/hyprland/config/monitors.conf b/features/desktop/hyprland/config/monitors.conf
index 557c7ff..5506311 100644
--- a/features/desktop/hyprland/config/monitors.conf
+++ b/features/desktop/hyprland/config/monitors.conf
@@ -3,8 +3,8 @@
 # Format: monitor = [port], resolution, position, scale
 
 # Optimized for retina-class 2x displays, like 13" 2.8K, 27" 5K, 32" 6K.
-env = GDK_SCALE,2
-monitor=,preferred,auto,auto
+#env = GDK_SCALE,2
+#monitor=,preferred,auto,auto
 
 # Good compromise for 27" or 32" 4K monitors (but fractional!)
 # env = GDK_SCALE,1.75
@@ -12,8 +12,8 @@ monitor=,preferred,auto,auto
 
 # Straight 1x setup for low-resolution displays like 1080p or 1440p
 # Or for ultrawide monitors like 34" 3440x1440 or 49" 5120x1440
-# env = GDK_SCALE,1
-# monitor=,preferred,auto,1
+ env = GDK_SCALE,1
+ monitor=,preferred,auto,1
 
 # Portrait/rotated secondary monitor (transform: 1 = 90°, 3 = 270°)
 # monitor = DP-2, preferred, auto, 1, transform, 1
diff --git a/features/desktop/waybar/themes/summer-night/config.jsonc b/features/desktop/waybar/themes/summer-night/config.jsonc
index df78992..137274a 100644
--- a/features/desktop/waybar/themes/summer-night/config.jsonc
+++ b/features/desktop/waybar/themes/summer-night/config.jsonc
@@ -9,7 +9,7 @@
   "spacing": 15,
   "modules-left": ["custom/nomarchy", "clock", "clock#date"],
   "modules-center": ["hyprland/workspaces"],
-  "modules-right": [ "idle_inhibitor", "pulseaudio", "custom/battery", "backlight", "tray", "custom/powermenu"],
+  "modules-right": [ "idle_inhibitor", "pulseaudio", "tray", "custom/powermenu"],
 
   "hyprland/workspaces": {
       "disable-scroll": true,