diff --git a/systems/kibbeh/configuration.nix b/systems/kibbeh/configuration.nix
index c44efd8..c313358 100644
--- a/systems/kibbeh/configuration.nix
+++ b/systems/kibbeh/configuration.nix
@@ -49,10 +49,12 @@
 
   services.xserver.enable = true;
   services.xserver.displayManager.lightdm.enable = true;
-  services.xserver.desktopManager.pantheon.enable = true;
+  services.desktopManager.pantheon.enable = true;
   # services.displayManager.autoLogin.enable = true;
   # services.displayManager.autoLogin.user = config.users.users.me.name;
 
+  home-manager.users.me.home.stateVersion = "24.11";
+
   age.secrets = {
     di-fm-key.file = ../../secrets/di-fm-key.age;
   };
@@ -68,13 +70,12 @@
       firefox
       thunderbird
       alacritty
-      tor-browser-bundle-bin
+      tor-browser
       zathura
-      okular
+      kdePackages.okular
       anki-bin
       libreoffice
       xournalpp
-      jellyfin-media-player
       mpv-tv
       telegram-desktop
       (mpv-radio.override { di-fm-key-file = config.age.secrets.di-fm-key.path; })
diff --git a/systems/tabula/configuration.nix b/systems/tabula/configuration.nix
index eea86a3..546012f 100644
--- a/systems/tabula/configuration.nix
+++ b/systems/tabula/configuration.nix
@@ -3,7 +3,8 @@
   lib,
   pkgs,
   ...
-}: {
+}:
+{
   imports = [
     ./hardware-configuration.nix
     ../../configs/spacetime.nix
@@ -28,26 +29,25 @@
     };
   };
 
-  services.xserver = {
-    libinput.enable = true;
-  };
+  services.libinput.enable = true;
 
   users.users.xenos = {
     name = "xenos";
     password = "xenos";
     isNormalUser = true;
-    extraGroups = ["networkmanager"];
+    extraGroups = [ "networkmanager" ];
+  };
+
+  services.displayManager = {
+    autoLogin = {
+      enable = true;
+      user = "xenos";
+    };
   };
 
   services.xserver = {
     enable = true;
     desktopManager.lxqt.enable = true;
-    displayManager = {
-      autoLogin = {
-        enable = true;
-        user = "xenos";
-      };
-    };
   };
 
   environment.systemPackages = [
@@ -70,7 +70,6 @@
     hostName = "tabula";
   };
 
-  hardware.pulseaudio.enable = true;
   networking.networkmanager.enable = true;
 
   system.stateVersion = "21.11";
diff --git a/systems/tabula/hardware-configuration.nix b/systems/tabula/hardware-configuration.nix
index 888e378..c68d58a 100644
--- a/systems/tabula/hardware-configuration.nix
+++ b/systems/tabula/hardware-configuration.nix
@@ -12,7 +12,6 @@
   boot = {
     loader.grub = {
       enable = true;
-      version = 2;
       device = "/dev/sda";
     };
     initrd = {
diff --git a/systems/tahina/configuration.nix b/systems/tahina/configuration.nix
index 607d826..49fa2d4 100644
--- a/systems/tahina/configuration.nix
+++ b/systems/tahina/configuration.nix
@@ -30,10 +30,8 @@
 
   console.keyMap = "de";
   i18n.defaultLocale = "de_DE.UTF-8";
-  services.xserver = {
-    layout = "de";
-    libinput.enable = true;
-  };
+  services.libinput.enable = true;
+  services.xserver.xkb.layout = "de";
 
   users.users.xenos = {
     name = "xenos";
@@ -42,18 +40,18 @@
     extraGroups = ["networkmanager"];
   };
 
+  services.desktopManager.pantheon.enable = true;
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "xenos";
+  };
   services.xserver = {
     enable = true;
-    desktopManager.pantheon.enable = true;
     displayManager = {
       lightdm = {
         enable = true;
         greeters.pantheon.enable = true;
       };
-      autoLogin = {
-        enable = true;
-        user = "xenos";
-      };
     };
   };
   boot.plymouth.enable = true;