diff --git a/hosts/ds9/backup.nix b/hosts/ds9/backup.nix
index 9301294f..4ab9355a 100644
--- a/hosts/ds9/backup.nix
+++ b/hosts/ds9/backup.nix
@@ -26,7 +26,7 @@
       #upload_rate_limit = "4000";
       encryption_passcommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.borgmaticEncryptionKey.path}";
       compression = "auto,zstd,10";
-      ssh_command = "ssh -o GlobalKnownHostsFile=${config.age.secrets.gatebridgeHostKeys.path} -i ${config.age.secrets.ds9OffsiteBackupSSH.path}";
+      ssh_command = "ssh -o ClientAliveInterval=10 -o ClientAliveCountMax=30 -o GlobalKnownHostsFile=${config.age.secrets.gatebridgeHostKeys.path} -i ${config.age.secrets.ds9OffsiteBackupSSH.path}";
       before_actions = [ "${pkgs.curl}/bin/curl -fss -m 10 --retry 5 -o /dev/null $(${pkgs.coreutils}/bin/cat ${config.age.secrets.ds9SyncoidHealthCheckUrl.path})/start" ];
       after_actions = [ "${pkgs.curl}/bin/curl -fss -m 10 --retry 5 -o /dev/null $(${pkgs.coreutils}/bin/cat ${config.age.secrets.ds9SyncoidHealthCheckUrl.path})" ];
       on_error = [ "${pkgs.curl}/bin/curl -fss -m 10 --retry 5 -o /dev/null $(${pkgs.coreutils}/bin/cat ${config.age.secrets.ds9SyncoidHealthCheckUrl.path})/fail" ];
diff --git a/hosts/theseus/default.nix b/hosts/theseus/default.nix
index 8bbb42a3..c6c26e05 100644
--- a/hosts/theseus/default.nix
+++ b/hosts/theseus/default.nix
@@ -86,8 +86,11 @@
 
   # end printing
   programs.light.enable = true;
-  networking.networkmanager.enable = true;
-  networking.networkmanager.wifi.backend = "iwd";
+  # networking.networkmanager.enable = true;
+  # networking.networkmanager.wifi.backend = "iwd";
+  networking.wireless.iwd.enable = true;
+  networking.useDHCP = lib.mkDefault true;
+
   services.xserver.displayManager.gdm.enable = true;
   services.xserver.enable = true;
   services.xserver.displayManager.gdm.wayland = true;
@@ -98,7 +101,7 @@
   services.displayManager.defaultSession = "river";
   programs.river.enable = true;
   services.upower.enable = true;
-  users.users.ragon.extraGroups = [ "networkmanager" "video" ];
+  users.users.ragon.extraGroups = [ "networkmanager" "video" "netdev" ];
   fonts.packages = with pkgs; [
     nerdfonts
     cantarell-fonts
@@ -211,6 +214,7 @@
       dune3d
       ptyxis
 
+filezilla
 
       broot
     ];
@@ -283,6 +287,7 @@
     persist.extraDirectories = [
       "/var/lib/bluetooth"
       "/var/lib/flatpak"
+      "/var/lib/iwd"
     ];
     services = {
       ssh.enable = true;
diff --git a/hosts/theseus/hardware-configuration.nix b/hosts/theseus/hardware-configuration.nix
index 927ff33c..584adf0c 100644
--- a/hosts/theseus/hardware-configuration.nix
+++ b/hosts/theseus/hardware-configuration.nix
@@ -46,7 +46,6 @@
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp195s0f3u1u3.useDHCP = lib.mkDefault true;
   # networking.interfaces.eth0.useDHCP = lib.mkDefault true;
 
diff --git a/hosts/theseus/river.nix b/hosts/theseus/river.nix
index 36f81212..1cf2e7f6 100644
--- a/hosts/theseus/river.nix
+++ b/hosts/theseus/river.nix
@@ -18,7 +18,8 @@ in
     dconf
     playerctl
     pwvucontrol
-    networkmanagerapplet
+    # networkmanagerapplet
+    iwgtk
     libnotify
   ];
 
@@ -559,7 +560,7 @@ label:focus {
       swaybg -i ${backgroundImage} &
       shikane &
       ${pkgs.mako}/bin/mako &
-      nm-applet &
+      iwgtk -i &
     '';
   };
   # services.wired = {