diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix
index 3e82137..93c2fb2 100644
--- a/hosts/desktops/common/packages.nix
+++ b/hosts/desktops/common/packages.nix
@@ -19,55 +19,29 @@ in
       aspellDicts.pt_BR
       bat
       clonehero
-      creality-print
       deploy-rs
       distrobox
-      exhibit
       fd
-      filelight
-      firefox
       fzf
-      gimp
-      heroic
-      itch
-      inkscape
-      junction
-      kde-rounded-corners
-      krita
+      ghostty
+      gnome-tweaks
       libfido2
-      libreoffice-qt
       # lilipod BROKEN
       mangohud
-      microsoft-edge
       mission-center
-      mpv
-      nextcloud-client
       nixfmt-rfc-style
       nix-init
       nix-output-monitor
-      obsidian
-      obs-studio
       ocs-url
-      orca-slicer
-      openscad
+      # orca-slicer BROKEN
       p7zip
       plasticity
-      prismlauncher
       protonup
-      # quickgui
-      qbittorrent
-      qview
+      # quickgui BROKEN
       ripgrep
-      rnote
-      solvespace
-      space-cadet-pinball
       sparrow
-      steam-run
-      tor-browser
-      ungoogled-chromium
       unrar
       ventoy
-      vesktop
       wezterm
     ]
     ++ kdepkgs;
@@ -75,9 +49,29 @@ in
   services.flatpak = {
     enable = true;
     packages = [
+      "com.github.flxzt.rnote"
+      "com.github.k4zmu2a.spacecadetpinball"
+      "com.heroicgameslauncher.hgl"
+      "com.mattjakeman.ExtensionManager"
+      "com.microsoft.Edge"
+      "com.modrinth.ModrinthApp"
+      "com.nextcloud.desktopclient.nextcloud"
+      "com.obsproject.Studio"
       "com.steamgriddb.SGDBoop"
+      "dev.vencord.Vesktop"
+      "io.github.giantpinkrobots.varia"
+      "io.github.ungoogled_software.ungoogled_chromium"
       "io.github.zen_browser.zen"
-      "org.gtk.Gtk3theme.adw-gtk3-dark"
+      "io.itch.itch"
+      "md.obsidian.Obsidian"
+      "org.gimp.GIMP"
+      "org.gnome.Showtime"
+      "org.inkscape.Inkscape"
+      "org.kde.krita"
+      "org.libreoffice.LibreOffice"
+      "org.mozilla.firefox"
+      "org.torproject.torbrowser-launcher"
+      "re.sonny.Junction"
     ];
     uninstallUnmanaged = true;
     update.auto.enable = true;
@@ -117,7 +111,6 @@ in
       elisa
       gwenview
       khelpcenter
-      konsole
       oxygen
     ]
   );
diff --git a/hosts/desktops/common/services.nix b/hosts/desktops/common/services.nix
index 12a64e9..4e7181c 100644
--- a/hosts/desktops/common/services.nix
+++ b/hosts/desktops/common/services.nix
@@ -9,7 +9,11 @@
   services = {
     printing.enable = true;
     udev.packages = with pkgs; [ yubikey-personalization ];
-    desktopManager.plasma6.enable = true;
+    xserver = {
+      enable = true;
+      displayManager.gdm.enable = true;
+      desktopManager.gnome.enable = true;
+    };
     tailscale.useRoutingFeatures = "client";
     nginx = {
       enable = true;
@@ -23,30 +27,30 @@
       jack.enable = true;
       wireplumber.enable = true;
     };
-    greetd = {
-      enable = true;
-      settings = {
-        default_session.command =
-          let
-            xSessions = "${config.services.displayManager.sessionData.desktops}/share/xsessions";
-            wlSessions = "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions";
-          in
-          ''
-            ${pkgs.greetd.tuigreet}/bin/tuigreet \
-            --remember \
-            --asterisks \
-            --time \
-            --greeting "NixOS" \
-            --sessions ${xSessions}:${wlSessions}
-          '';
-        initial_session = {
-          command = ''
-            ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland &> /dev/null
-          '';
-          user = "user";
-        };
-      };
-    };
+    # greetd = {
+    #   enable = true;
+    #   settings = {
+    #     default_session.command =
+    #       let
+    #         xSessions = "${config.services.displayManager.sessionData.desktops}/share/xsessions";
+    #         wlSessions = "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions";
+    #       in
+    #       ''
+    #         ${pkgs.greetd.tuigreet}/bin/tuigreet \
+    #         --remember \
+    #         --asterisks \
+    #         --time \
+    #         --greeting "NixOS" \
+    #         --sessions ${xSessions}:${wlSessions}
+    #       '';
+    #     initial_session = {
+    #       command = ''
+    #         ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland &> /dev/null
+    #       '';
+    #       user = "user";
+    #     };
+    #   };
+    # };
   };
 
   xdg.portal = {
diff --git a/hosts/desktops/common/stylix.nix b/hosts/desktops/common/stylix.nix
index 0d94a29..7cf4c09 100644
--- a/hosts/desktops/common/stylix.nix
+++ b/hosts/desktops/common/stylix.nix
@@ -10,7 +10,7 @@
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
     cursor = {
       package = pkgs.kdePackages.breeze-icons;
-      name = "Breeze_Light";
+      name = "Breeze_Snow";
       size = 24;
     };
     opacity = {
diff --git a/hosts/desktops/rotterdam.nix b/hosts/desktops/rotterdam.nix
index c0697d2..87f51fe 100644
--- a/hosts/desktops/rotterdam.nix
+++ b/hosts/desktops/rotterdam.nix
@@ -56,7 +56,7 @@ in
 
   environment.systemPackages = with pkgs; [ reboot-into-qubes ];
 
-  hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd ];
+  # hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd ];
 
   systemd.targets.hibernate.enable = false; # disable non-functional hibernate
 
diff --git a/users/desktops/user.nix b/users/desktops/user.nix
index 80e1f3a..692c7f9 100644
--- a/users/desktops/user.nix
+++ b/users/desktops/user.nix
@@ -7,4 +7,6 @@
     # Desktop-common imports
     ./common
   ];
+
+  stylix.targets.gtk.flatpakSupport.enable = false;
 }