diff --git a/modules/collections/desktop.nix b/modules/collections/desktop.nix
index 6d0705a..c0564de 100644
--- a/modules/collections/desktop.nix
+++ b/modules/collections/desktop.nix
@@ -14,6 +14,7 @@
     ../graphical/games.nix
     ../graphical/ime.nix
     ../graphical/obs.nix
+    #../graphical/lxqt.nix
     ../graphical/plasma.nix
     ../graphical/shared.nix
     ../hardware/firmware.nix
diff --git a/modules/graphical/gnome.nix b/modules/graphical/gnome.nix
index ca59c8d..6db3e6c 100644
--- a/modules/graphical/gnome.nix
+++ b/modules/graphical/gnome.nix
@@ -1,9 +1,9 @@
-{ config, pkgs, ... }:
+{ config, pkgs, mainUser, ... }:
 
 {
   services.xserver = {
-    layout = "at";
-    xkbVariant = "";
+    layout = mainUser.layout;
+    xkbVariant = mainUser.variant;
     enable = true;
     displayManager.gdm.enable = true;
     desktopManager.gnome.enable = true;
diff --git a/modules/graphical/lxqt.nix b/modules/graphical/lxqt.nix
new file mode 100644
index 0000000..f054fd3
--- /dev/null
+++ b/modules/graphical/lxqt.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ...}: 
+{
+  services.xserver = {
+    xkb.layout = config.mainUser.layout; 
+    xkb.variant = config.mainUser.variant;
+    enable = true;
+    displayManager.sddm.enable = true;
+    desktopManager.lxqt.enable = true;
+  };
+}
diff --git a/modules/graphical/plasma.nix b/modules/graphical/plasma.nix
index 73c18ab..39c8a08 100644
--- a/modules/graphical/plasma.nix
+++ b/modules/graphical/plasma.nix
@@ -2,8 +2,8 @@
 
 {
   services.xserver = {
-    xkb.layout = "at";
-    xkb.variant = "";
+    xkb.layout = config.mainUser.layout; 
+    xkb.variant = config.mainUser.variant;
     enable = true;
     displayManager.sddm.enable = true;
     #displayManager.sddm.wayland.enable = true;
diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix
index 1a0a61c..9d1bfad 100644
--- a/systems/pc/configuration.nix
+++ b/systems/pc/configuration.nix
@@ -54,12 +54,6 @@
   # Enable the X11 windowing system.
   services.xserver.enable = true;
 
-  # Configure keymap in X11
-  services.xserver = {
-    xkb.layout = lib.mkForce "de";
-    xkb.variant = lib.mkForce "us";
-  };
-
   # Configure console keymap
   console.keyMap = "de";