diff --git a/systems/x86_64-linux/LoyAdjo/default.nix b/systems/x86_64-linux/LoyAdjo/default.nix
index d748dc1..fb015bc 100644
--- a/systems/x86_64-linux/LoyAdjo/default.nix
+++ b/systems/x86_64-linux/LoyAdjo/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [
       ./hardware.nix
     ];
 
@@ -27,19 +27,14 @@
 
   networking.hostName = "LoyAdjo";
 
-  # Enable networking
+  # Wireless
   networking.networkmanager.enable = true;
-
-  # Enable Bluetooth
   hardware.bluetooth.enable = true; # enables support for Bluetooth
   hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
 
-  # Set your time zone.
+  # Locale
   time.timeZone = "Europe/Berlin";
-
-  # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
-
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "de_DE.UTF-8";
     LC_IDENTIFICATION = "de_DE.UTF-8";
@@ -52,27 +47,22 @@
     LC_TIME = "de_DE.UTF-8";
   };
 
-  # Enable the X11 windowing system.
+  # GUI
   services.xserver.enable = true;
   services.xserver.videoDrivers = [ "nvidia" ];
-
-  # Enable the KDE Plasma Desktop Environment.
   services.displayManager.sddm.enable = true;
   services.desktopManager.plasma6.enable = true;
 
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "de";
-    variant = "";
+  # Input
+  services.xserver.xkb.layout = "de";
+  services.xserver.xkb.variant = "";
+  console.keyMap = "de";
+  services.numen = {
+    enable = true;
+    autoStart = false;
   };
 
-  # Configure console keymap
-  console.keyMap = "de";
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound with pipewire.
+  # Output
   services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
@@ -81,13 +71,14 @@
     alsa.support32Bit = true;
     pulse.enable = true;
   };
+  services.printing.enable = true;
 
+  # Users
   users.users.kb = { # Managed by Homemanager
     isNormalUser = true;
     description = "kB";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = [ "networkmanager" "wheel" "input" ];
   };
-
   users.users.remotebuild = {
     isNormalUser = true;
     openssh.authorizedKeys.keys = [
@@ -96,15 +87,9 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAl0qiBLwbdSAMfnZCcpG23LgkhlV3Bko3U17oV3m18A root @ HyperC"
     ];
   };
- 
-  # Enable automatic login for the user.
-  # services.xserver.displayManager.autoLogin.enable = true;
-  # services.xserver.displayManager.autoLogin.user = "kb";
-
-  # services.gpg-agent.enable = true;
-  programs.ssh.startAgent = true;
 
   # SSH
+  programs.ssh.startAgent = true;
   services.openssh = {
     enable = true;
     settings.PasswordAuthentication = false;
@@ -113,15 +98,15 @@
     openFirewall = true;
   };
 
-  # List packages installed in system profile. To search, run: $ nix search wget
-  environment.systemPackages = with pkgs; [
+  # System Packages
+  environment.systemPackages = with pkgs; [ # To search, run: $ nix search wget
     vim
     git
     kb-one.numen
     kb-one.dotool
     kb-one.vosk-model-small-en-us
+    tree
   ];
 
   system.stateVersion = "24.05"; # NEVER Change this!
-
 }