diff --git a/hosts/steamdeck/default.nix b/hosts/steamdeck/default.nix
index 67bcb63..faaefae 100644
--- a/hosts/steamdeck/default.nix
+++ b/hosts/steamdeck/default.nix
@@ -23,7 +23,7 @@
   imports =                                                         # For now, if applying to other system, swap files
     [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
     [(import ../../modules/desktop/steam/default.nix)] ++        # Window Manager
-    [(import ../../modules/desktop/gnome/default.nix)] ++        # Window Manager
+    [(import ../../modules/desktop/kde/default.nix)] ++        # Window Manager
     [(import ../../modules/desktop/virtualisation/docker.nix)] ++   # Docker
     (import ../../modules/hardware);                                # Hardware devices
 
diff --git a/hosts/steamdeck/home.nix b/hosts/steamdeck/home.nix
index 9920be8..99d401f 100644
--- a/hosts/steamdeck/home.nix
+++ b/hosts/steamdeck/home.nix
@@ -17,7 +17,7 @@
   imports =
     [
       ../../modules/desktop/steam/home.nix # Window Manager
-      ../../modules/desktop/gnome/home.nix # Window Manager
+      ../../modules/desktop/kde/home.nix # Window Manager
       ../../modules/home.nix # Window Manager
     ];
 
@@ -47,8 +47,6 @@
   };
 
   services = {                            # Applets
-   blueman-applet.enable = true;         # Bluetooth
-   network-manager-applet.enable = true; # Network
   };
 
   xsession.preferStatusNotifierItems = true;
diff --git a/modules/desktop/gnome/default.nix b/modules/desktop/gnome/default.nix
index 5dbeab6..ed9113f 100644
--- a/modules/desktop/gnome/default.nix
+++ b/modules/desktop/gnome/default.nix
@@ -18,6 +18,8 @@
     environment.systemPackages = with pkgs; [
       gnome.gnome-terminal
       gnomeExtensions.dash-to-dock
+      gnomeExtensions.appindicator
+      flatpak
       rocm-opencl-icd
       rocm-opencl-runtime
       clinfo
@@ -41,5 +43,7 @@
           autoLogin.user = "kabbone";
         };
       };
+      flatpak.enable = true;
+      udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
     };
 }
diff --git a/modules/desktop/gnome/home.nix b/modules/desktop/gnome/home.nix
index c81feca..ec52e42 100644
--- a/modules/desktop/gnome/home.nix
+++ b/modules/desktop/gnome/home.nix
@@ -25,9 +25,10 @@
       favorite-apps = [
         "firefox.desktop"
         "thunderbird.desktop"
-        "element.desktop"
-        "keepassxc.desktop"
-        "yubioath-flutter"
+        "element-desktop.desktop"
+        "keepassxc"
+        "yubioath-flutter.desktop"
+        "alacritty.desktop"
       ];
     };
   # Dash to Dock settings for a better touch screen experience
diff --git a/modules/desktop/kde/default.nix b/modules/desktop/kde/default.nix
new file mode 100644
index 0000000..2ebca76
--- /dev/null
+++ b/modules/desktop/kde/default.nix
@@ -0,0 +1,50 @@
+#
+#  Gnome configuration
+#
+#  flake.nix
+#   ├─ ./hosts
+#   │   └─ ./laptop
+#   │       └─ default.nix
+#   └─ ./modules
+#       └─ ./desktop
+#           └─ ./gnome
+#               └─ default.nix *
+#
+{ config, lib, user, pkgs, ... }:
+
+{
+
+    environment.systemPackages = with pkgs; [
+      flatpak
+      rocm-opencl-icd
+      rocm-opencl-runtime
+      clinfo
+      libsForQt5.discover
+      maliit-keyboard
+      gnome.zenity
+      appimage-run
+    ];
+
+    services = {
+      packagekit.enable = true;
+      xserver = {
+        enable = true;
+        desktopManager.plasma5.enable = true;
+        displayManager = {
+          gdm.wayland = true;
+          gdm.enable = true;
+          gdm.autoLogin.delay = 5;
+          gdm.settings = {
+              security = {
+                  DisallowTCP=true;
+              };
+          };
+          defaultSession = "steam-wayland";
+          autoLogin.enable = true;
+          autoLogin.user = "kabbone";
+        };
+      };
+      flatpak.enable = true;
+      udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
+    };
+}
diff --git a/modules/desktop/kde/home.nix b/modules/desktop/kde/home.nix
new file mode 100644
index 0000000..e716ccf
--- /dev/null
+++ b/modules/desktop/kde/home.nix
@@ -0,0 +1,16 @@
+#
+#  Gnome NixOS & Home manager configuration
+#
+#  flake.nix
+#   ├─ ./hosts
+#   │   └─ ./steamdeck
+#   │       └─ home.nix
+#   └─ ./modules
+#       └─ ./desktop
+#           └─ ./gnome
+#               └─ home.nix *
+#
+
+{ config, lib, pkgs, ... }:
+{
+}
diff --git a/modules/desktop/steam/default.nix b/modules/desktop/steam/default.nix
index 1ab29fe..31bb7cc 100644
--- a/modules/desktop/steam/default.nix
+++ b/modules/desktop/steam/default.nix
@@ -34,7 +34,4 @@
       steamdeck-firmware
     ];
 
-#    services = {
-#    };
-
 }
diff --git a/modules/desktop/steam/home.nix b/modules/desktop/steam/home.nix
index 7b56292..704c4ab 100644
--- a/modules/desktop/steam/home.nix
+++ b/modules/desktop/steam/home.nix
@@ -16,7 +16,6 @@
   home = {
     packages = with pkgs; [
       steam
-      microsoft-edge-beta
     ];
   };
 }