diff --git a/configurations/host/materusPC/kde.nix b/configurations/host/materusPC/kde.nix
index 7d1943d..460f7e1 100644
--- a/configurations/host/materusPC/kde.nix
+++ b/configurations/host/materusPC/kde.nix
@@ -1,13 +1,20 @@
 { config, pkgs, lib, ... }:
 let
-  westonSddm = pkgs.writeText "weston.ini"
+  westonSddm = let xcfg = config.services.xserver; in  pkgs.writeText "weston.ini"
     ''
       [core]
-      xwayland=true
+      xwayland=false
       shell=fullscreen-shell.so
 
       [keyboard]
-      keymap_layout=pl
+      keymap_model = ${builtins.toString xcfg.xkb.model};
+      keymap_layout = ${builtins.toString xcfg.xkb.layout};
+      keymap_variant = ${builtins.toString xcfg.xkb.variant};
+      keymap_options = ${builtins.toString xcfg.xkb.options};
+
+      [libinput]
+      enable-tap = ${builtins.toString xcfg.libinput.mouse.tapping};
+      left-handed = ${builtins.toString xcfg.libinput.mouse.leftHanded};
 
       [output]
       name=DP-3
@@ -20,25 +27,28 @@ let
       [output]
       name=HDMI-A-3
       mode=off
-    ''
-  ;
+
+    '';
 in
 {
   services.xserver.displayManager.defaultSession = "plasma";
   services.xserver.displayManager.sddm.enable = true;
+  services.xserver.displayManager.sddm.wayland.enable = true;
+  services.xserver.displayManager.sddm.wayland.compositor = lib.mkForce "weston";
+  services.xserver.displayManager.sddm.wayland.compositorCommand = lib.concatStringsSep " " [
+    "${lib.getExe pkgs.weston}"
+    "--shell=kiosk"
+    "-c ${westonSddm}"
+  ];
+
   services.xserver.displayManager.sddm.settings = {
     General = {
-      #DisplayServer = "wayland";
       InputMethod = "";
     };
     Theme = {
       CursorTheme = "breeze_cursors";
       CursorSize = "24";
     };
-    Wayland = {
-      #CompositorCommand = "${pkgs.weston}/bin/weston  -c ${westonSddm}";
-
-    };
   };
   services.desktopManager.plasma6.enable = true;
   services.desktopManager.plasma6.enableQt5Integration = true;
diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix
index e7d2c48..42faa55 100644
--- a/configurations/host/materusPC/tmp.nix
+++ b/configurations/host/materusPC/tmp.nix
@@ -27,6 +27,7 @@
 
   time.timeZone = "Europe/Warsaw";
   i18n.defaultLocale = "pl_PL.UTF-8";
+  services.xserver.xkb.layout = "pl";
   console = {
     font = "lat2-16";
     #     keyMap = "pl";
diff --git a/configurations/profile/home/xdg.nix b/configurations/profile/home/xdg.nix
index 6925355..4689fa8 100644
--- a/configurations/profile/home/xdg.nix
+++ b/configurations/profile/home/xdg.nix
@@ -10,25 +10,31 @@
     let
       cfg = config.materus.profile.xdg;
     in
-    lib.mkIf cfg.enable { 
+    lib.mkIf cfg.enable {
       xdg.enable = true;
       xdg.portal.enable = lib.mkDefault false;
       xdg.portal.xdgOpenUsePortal = lib.mkDefault config.xdg.portal.enable;
-      
+
       xdg.userDirs.enable = lib.mkDefault true;
       xdg.userDirs.createDirectories = lib.mkDefault config.xdg.userDirs.enable;
 
       xdg.userDirs.desktop = lib.mkDefault "${config.home.homeDirectory}/Pulpit";
       xdg.userDirs.documents = lib.mkDefault "${config.home.homeDirectory}/Dokumenty";
       xdg.userDirs.download = lib.mkDefault "${config.home.homeDirectory}/Pobrane";
-      xdg.userDirs.music = lib.mkDefault "${config.home.homeDirectory}/Muzyka";
+      xdg.userDirs.music = lib.mkDefault "${config.xdg.userDirs.extraConfig.XDG_AUDIO_DIR}/Muzyka";
       xdg.userDirs.pictures = lib.mkDefault "${config.home.homeDirectory}/Obrazy";
       xdg.userDirs.publicShare = lib.mkDefault "${config.home.homeDirectory}/Publiczny";
       xdg.userDirs.templates = lib.mkDefault "${config.home.homeDirectory}/Szablony";
       xdg.userDirs.videos = lib.mkDefault "${config.home.homeDirectory}/Wideo";
       xdg.userDirs.extraConfig = {
         XDG_MISC_DIR = lib.mkDefault "${config.home.homeDirectory}/Inne";
-        XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Zrzuty ekranu";
+        XDG_PIC_SCREENSHOTS_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Zrzuty ekranu";
+        XDG_PIC_MEMES_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Memy";
+        XDG_PIC_MISC_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Inne";
+        XDG_PIC_PHOTOS_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Zdjęcia";
+        XDG_PIC_AVATARS_DIR = "${config.xdg.userDirs.pictures}/Avatar";
+        XDG_AUDIO_DIR = lib.mkDefault "${config.home.homeDirectory}/Audio";
+        XDG_KEYS_DIR = lib.mkDefault "${config.xdg.userDirs.documents}/Klucze";
       };
     };