diff --git a/configuration/base/default.nix b/configuration/base/default.nix
index a86057f..77869b9 100644
--- a/configuration/base/default.nix
+++ b/configuration/base/default.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ./fonts.nix
-    ./kde.nix
     ./location-time.nix
     ./networking.nix
     ./nix-settings.nix
diff --git a/configuration/base/kde.nix b/configuration/base/kde.nix
deleted file mode 100644
index 6d1e1ce..0000000
--- a/configuration/base/kde.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ pkgs, lib, ... }:
-
-let
-  kwin = lib.concatStringsSep " " [
-    "${lib.getBin pkgs.kdePackages.kwin}/bin/kwin_wayland"
-    "--no-global-shortcuts"
-    "--no-kactivities"
-    "--no-lockscreen"
-    "--locale1"
-    "--inputmethod maliit-keyboard"
-  ];
-in
-{
-  services.xserver.enable = true; # optional
-
-  # Configure keymap in X11
-  # services.xserver.xkb.layout = "us";
-  # services.xserver.xkb.options = "eurosign:e,caps:escape";
-
-  services.displayManager.sddm = {
-    enable = true;
-    wayland.enable = true;
-    settings = {
-      Wayland = {
-        CompositorCommand = kwin;
-      };
-    };
-  };
-  services.desktopManager.plasma6.enable = true;
-  environment.plasma6.excludePackages = [ pkgs.kdePackages.discover ];
-
-  # For cursor in steam?
-  xdg.icons.fallbackCursorThemes = [ "breeze_cursors" ];
-
-  programs.partition-manager.enable = true;
-
-  environment.systemPackages = with pkgs;
-    [
-      maliit-keyboard
-      exfatprogs
-    ] ++ (with kdePackages; [
-      sddm-kcm
-      plasma-disks
-      filelight
-      ffmpegthumbs
-      kcalc
-    ]);
-}
diff --git a/configuration/modules/gnome.nix b/configuration/modules/gnome.nix
index ed86e42..2806153 100644
--- a/configuration/modules/gnome.nix
+++ b/configuration/modules/gnome.nix
@@ -1,7 +1,8 @@
 { pkgs, ... }:
 {
-  services.displayManager.gdm.enable = true;
-  services.desktopManager.gnome.enable = true;
+  services.xserver.enable = true;
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
 
   # To disable installing GNOME's suite of applications
   # and only be left with GNOME shell.
@@ -9,4 +10,8 @@
   services.gnome.core-developer-tools.enable = false;
   services.gnome.games.enable = false;
   environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-user-docs ];
+
+  environment.systemPackages = with pkgs.gnomeExtensions; [
+    tray-icons-reloaded
+  ];
 }
diff --git a/devices/starlite/configuration.nix b/devices/starlite/configuration.nix
index e3deaa3..d478c32 100644
--- a/devices/starlite/configuration.nix
+++ b/devices/starlite/configuration.nix
@@ -2,7 +2,7 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ inputs, ... }:
+{ inputs, pkgs, ... }:
 
 {
   imports =
@@ -14,10 +14,15 @@
       ./disk-config.nix
       inputs.home-manager.nixosModules.default
       ../../configuration/modules/laptop.nix
+      ../../configuration/modules/gnome.nix
     ];
 
   networking.hostName = "starlite"; # Define your hostname.
 
+  environment.systemPackages = with pkgs.gnomeExtensions; [
+    touchup
+  ];
+
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.worble = {
     initialPassword = "password";
diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix
index 5093a0f..a464ef4 100644
--- a/devices/tuxedo/configuration.nix
+++ b/devices/tuxedo/configuration.nix
@@ -16,6 +16,7 @@
       ../../configuration/modules/laptop.nix
       ../../configuration/modules/virtualisation.nix
       ../../configuration/modules/gaming.nix
+      ../../configuration/modules/kde.nix
     ];
 
   networking.hostName = "tuxedo"; # Define your hostname.
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 36b79e8..552e4e6 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -24,7 +24,7 @@
 
   # set breeze as default cursor 
   # For cursor in steam?
-  home.file.".icons/default".source = "${pkgs.kdePackages.breeze}/share/icons/breeze_cursors";
+  # home.file.".icons/default".source = "${pkgs.kdePackages.breeze}/share/icons/breeze_cursors";
 
   home.file.".npmrc".text = lib.generators.toINIWithGlobalSection { } {
     globalSection = {
diff --git a/home-manager/firefox/firefox-profile.nix b/home-manager/firefox/firefox-profile.nix
index 1b91e66..f98e84c 100644
--- a/home-manager/firefox/firefox-profile.nix
+++ b/home-manager/firefox/firefox-profile.nix
@@ -28,7 +28,7 @@
     "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
     # menu bar
     "ui.key.menuAccessKeyFocuses" = false;
-    # use kde file picker
+    # use desktop file picker
     "widget.use-xdg-desktop-portal.file-picker" = 1;
     # sidebar at right
     "sidebar.position_start" = false;