diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 45b1782c..5ec8f858 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -214,19 +214,10 @@
         "size 800 600, pavucontrol|.blueman-manager-wrapped|nm-connection-editor"
         "move onscreen 100%-820 60,pavucontrol|.blueman-manager-wrapped|nm-connection-editor"
 
-        # LibreOffice
-        "suppressevent fullscreen maximize, (libreoffice|soffice)(.*)"
-
         # PrismLauncher / Minecraft
         "float, org.prismlauncher.PrismLauncher"
         "center, org.prismlauncher.PrismLauncher"
         "size 800 600, org.prismlauncher.PrismLauncher"
-
-        # X2Go / NoMachine
-        "suppressevent fullscreen maximize, x2goclient|Nxplayer.bin"
-        "float, x2goclient|Nxplayer.bin"
-        "center, x2goclient|Nxplayer.bin"
-        "size 800 600, x2goclient|Nxplayer.bin"
       ];
       windowrulev2 = [
         # Firefox PIP
@@ -238,6 +229,7 @@
         "pin, title:Picture-in-Picture,class:firefox"
 
         # LibreOffice
+        "suppressevent fullscreen maximize, class:(libreoffice|soffice)(.*)"
         "float, title:Open,class:(libreoffice|soffice)(.*)"
 
         # Steam
@@ -247,6 +239,12 @@
         "size 800 600, title:(.*)(Chat),class:steam"
         "float, title:Steam Settings,class:steam"
         "size 800 600, title:Steam Settings,class:steam"
+
+        # X2Go
+        "suppressevent fullscreen maximize, class:x2goclient"
+        "float, title:X2Go Client, class:x2goclient"
+        "center, title:X2Go Client, class:x2goclient"
+        "size 800 600, title:X2Go Client, class:x2goclient"
       ];
       bind = let
         withTerm = {
diff --git a/system/desktop.nix b/system/desktop.nix
index b6e7fb83..7081f7e8 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -17,7 +17,6 @@
     signal-desktop
     whatsapp-for-linux
     teams-for-linux
-    nomachine-client
     x2goclient
   ];
   security = {