diff --git a/configurations/host/materusPC/default.nix b/configurations/host/materusPC/default.nix
index 9521de8..23d59eb 100644
--- a/configurations/host/materusPC/default.nix
+++ b/configurations/host/materusPC/default.nix
@@ -13,8 +13,6 @@
       ./tmp.nix
       ./network.nix
 
-      ./kde.nix
-
       ./audio.nix
     ];
 
diff --git a/configurations/host/materusPC/home/materus/default.nix b/configurations/host/materusPC/home/materus/default.nix
index 77cc7f9..323cdfa 100644
--- a/configurations/host/materusPC/home/materus/default.nix
+++ b/configurations/host/materusPC/home/materus/default.nix
@@ -6,10 +6,6 @@
   programs.git.signing.signByDefault = true;
 
   xdg.userDirs.enable = true;
-  xdg.portal.enable = true;
-  xdg.portal.xdgOpenUsePortal = true;
-  xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
-  xdg.portal.configPackages = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
   materus.profile = {
     fonts.enable = lib.mkDefault true;
     nixpkgs.enable = lib.mkDefault false;
diff --git a/configurations/host/materusPC/other/default.nix b/configurations/host/materusPC/other/default.nix
index a1ad7ea..5dd5df9 100644
--- a/configurations/host/materusPC/other/default.nix
+++ b/configurations/host/materusPC/other/default.nix
@@ -3,6 +3,7 @@
  imports = [
   ./apps.nix
   ./java.nix
+  ./desktop
  ];
 
 }
\ No newline at end of file
diff --git a/configurations/host/materusPC/other/desktop/default.nix b/configurations/host/materusPC/other/desktop/default.nix
new file mode 100644
index 0000000..cdd7afa
--- /dev/null
+++ b/configurations/host/materusPC/other/desktop/default.nix
@@ -0,0 +1,9 @@
+{ ... }:
+{
+ imports = [
+  ./kde.nix
+  ./sddm.nix
+
+ ];
+
+}
\ No newline at end of file
diff --git a/configurations/host/materusPC/gnome.nix b/configurations/host/materusPC/other/desktop/gnome.nix
similarity index 90%
rename from configurations/host/materusPC/gnome.nix
rename to configurations/host/materusPC/other/desktop/gnome.nix
index ba6a6f3..198703c 100644
--- a/configurations/host/materusPC/gnome.nix
+++ b/configurations/host/materusPC/other/desktop/gnome.nix
@@ -1,13 +1,7 @@
 { config, pkgs, lib, ... }:
 {
-
-
-
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.displayManager.gdm.wayland = true;
-
-
-
+  services.displayManager.defaultSession = "gnome";
+  
   services.xserver.desktopManager.gnome.enable = true;
   services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ];
 
diff --git a/configurations/host/materusPC/other/desktop/kde.nix b/configurations/host/materusPC/other/desktop/kde.nix
new file mode 100644
index 0000000..248177a
--- /dev/null
+++ b/configurations/host/materusPC/other/desktop/kde.nix
@@ -0,0 +1,32 @@
+{ config, pkgs, lib, ... }:
+{
+  services.displayManager.defaultSession = "plasma";
+
+  xdg.portal.enable = true;
+  xdg.portal.wlr.enable = true;
+  xdg.portal.xdgOpenUsePortal = true;
+  xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
+
+  services.desktopManager.plasma6.enable = true;
+  services.desktopManager.plasma6.enableQt5Integration = true;
+  programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
+  environment.variables = {
+    # Old fix for black cursor on amdgpu, seems to work fine now
+    #KWIN_DRM_NO_AMS = "1";
+
+    #Fix for amdgpu crashes
+    KWIN_DRM_USE_MODIFIERS = "0";
+    KWIN_DRM_NO_DIRECT_SCANOUT = "1";
+    QT_PLUGIN_PATH = [ 
+      "${pkgs.qt6.qtimageformats}/${pkgs.qt6.qtbase.qtPluginPrefix}"
+      "${pkgs.kdePackages.ffmpegthumbs}/${pkgs.qt6.qtbase.qtPluginPrefix}"
+     ];
+    XCURSOR_THEME = "breeze_cursors";
+  };
+  environment.systemPackages = with pkgs; [
+    kdePackages.ark
+  ];
+  programs.kdeconnect.enable = true;
+  materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin pkgs.vlc pkgs.vkbasalt-cli ];
+}
diff --git a/configurations/host/materusPC/kde.nix b/configurations/host/materusPC/other/desktop/sddm.nix
similarity index 55%
rename from configurations/host/materusPC/kde.nix
rename to configurations/host/materusPC/other/desktop/sddm.nix
index a1fb7cb..2b05310 100644
--- a/configurations/host/materusPC/kde.nix
+++ b/configurations/host/materusPC/other/desktop/sddm.nix
@@ -31,7 +31,6 @@ let
     '';
 in
 {
-  services.displayManager.defaultSession = "plasma";
   services.displayManager.sddm.enable = true;
   services.displayManager.sddm.wayland.enable = true;
   services.displayManager.sddm.wayland.compositor = lib.mkForce "weston";
@@ -50,27 +49,4 @@ in
       CursorSize = "24";
     };
   };
-  services.desktopManager.plasma6.enable = true;
-  services.desktopManager.plasma6.enableQt5Integration = true;
-  programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
-
-  environment.variables = {
-    # Old fix for black cursor on amdgpu, seems to work fine now
-    #KWIN_DRM_NO_AMS = "1";
-
-    #Fix for amdgpu crashes
-    KWIN_DRM_USE_MODIFIERS = "0";
-    KWIN_DRM_NO_DIRECT_SCANOUT = "1";
-    QT_PLUGIN_PATH = [ 
-      "${pkgs.qt6.qtimageformats}/${pkgs.qt6.qtbase.qtPluginPrefix}"
-      "${pkgs.kdePackages.ffmpegthumbs}/${pkgs.qt6.qtbase.qtPluginPrefix}"
-     ];
-    XCURSOR_THEME = "breeze_cursors";
-  };
-  environment.systemPackages = with pkgs; [
-    kdePackages.ark
-  ];
-  programs.kdeconnect.enable = true;
-  materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin pkgs.vlc pkgs.vkbasalt-cli ];
-}
+}
\ No newline at end of file
diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix
index 9019b80..be7dbe2 100644
--- a/configurations/host/materusPC/tmp.nix
+++ b/configurations/host/materusPC/tmp.nix
@@ -30,10 +30,6 @@
 
   services.xserver.displayManager.startx.enable = false;
 
-  xdg.portal.enable = true;
-  xdg.portal.wlr.enable = true;
-  xdg.portal.xdgOpenUsePortal = true;
-
   services.xserver.exportConfiguration = true;
   services.xserver.extraConfig = pkgs.lib.mkDefault ''
     Section "OutputClass"