diff --git a/fschl/systems/tower-guix.scm b/fschl/systems/tower-guix.scm
index 25f2f18..0f6eaaa 100644
--- a/fschl/systems/tower-guix.scm
+++ b/fschl/systems/tower-guix.scm
@@ -2,11 +2,15 @@
   #:use-module (fschl utils)
   #:use-module (fschl systems base)
   #:use-module (fschl systems common)
-;  #:use-module (fschl home-services pipewire)
+  ;; #:use-module (fschl home-services pipewire)
   #:use-module (fschl home-services xsettingsd)
+  #:use-module (gnu)
   #:use-module (gnu home)
+  #:use-module (gnu home services xdg)
+  #:use-module (gnu home services sound)
   #:use-module (gnu packages file-systems)
   #:use-module (gnu services)
+  #:use-module (gnu services docker)
   #:use-module (gnu system)
   #:use-module (gnu system uuid)
   #:use-module (gnu system file-systems)
@@ -19,7 +23,19 @@
               (service home-xsettingsd-service-type
                        (home-xsettingsd-configuration
                         (dpi 180)))
-;              (service home-pipewire-service-type)
+              ;; (service home-pipewire-service-type)
+              (simple-service
+               'xdg-user-directories-config-service
+               home-xdg-user-directories-service-type
+               (home-xdg-user-directories-configuration
+                (desktop     "$HOME/desktop")
+                (documents   "/media/store/Documents")
+                (download    "/media/store/Downloads")
+                (music       "/media/store/Music")
+                (pictures    "/media/store/Pictures")
+                (publicshare "/media/store/Public")
+                (templates   "/media/store/Templates")
+                (videos      "/media/store/Videos")))
               common-home-services))))
 
 (define system
@@ -27,18 +43,30 @@
    (inherit base-operating-system)
    (host-name "tower-guix")
 
-   ;; Add sof-firmware drivers for audio on ThinkPad x230
- ;;  (firmware (list linux-firmware sof-firmware))
-
-;;           (source (uuid "ad42a856-8e7c-4844-a55a-23ba4bd03dcc"))
-;;           (target "system-root")
-;;           (type luks-device-mapping))))
+   (keyboard-layout (keyboard-layout "de" "altgr-intl" #:options '("ctrl:nocaps")))
+   (bootloader (bootloader-configuration
+                (bootloader grub-efi-bootloader)
+                (targets '("/boot/efi"))
+                (keyboard-layout keyboard-layout)))
 
    (file-systems (cons*
                   (file-system
                    (device "/dev/nvme0n1p3")
                    (mount-point "/")
                    (type "ext4"))
+                  (file-system
+                   (device "/dev/sdd1")
+                   (mount-point "/media/store")
+                   (type "ext4"))
+                  (file-system
+                   (device "/dev/sda1")
+                   (mount-point "/media/docs")
+                   (type "ext4"))
+                  (file-system
+                   ;; (device "/dev/nvme0n1p1")
+                   (device (uuid "7241-D6CA" 'fat))
+                   (mount-point "/boot/efi")
+                   (type "vfat"))
                   %base-file-systems))))
 
 ;; Return home or system config based on environment variable