diff --git a/systems/i686-linux/Rubtrm/default.nix b/systems/i686-linux/Rubtrm/default.nix
index 2aa3497..fa927b5 100644
--- a/systems/i686-linux/Rubtrm/default.nix
+++ b/systems/i686-linux/Rubtrm/default.nix
@@ -5,10 +5,10 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports =
-    [ 
-      ./hardware.nix
-    ];
+  imports = [ 
+    ./hardware.nix
+    #./plasma.nix
+  ];
 
   # Configure Nix
   nix.settings = {
@@ -19,9 +19,18 @@
     trusted-public-keys = [
       "cache.game01.kb-one.de:XcqI+uobV7EoTKuRmnzYup/+oSfn8uLwnsiQFp8dk/g="
     ];
+    trusted-users = [ "kb" ];
   };
-  # nixpkgs.config.allowUnsupportedSystem = true;
+  nixpkgs.config.allowUnsupportedSystem = true;
   nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.packageOverrides = pkgs: {
+    xorg.xorgserver = pkgs.xorg.xorgserver.override (old: {
+      configureFlags = pkgs.lib.remove "--enable-glamor" old.configureFlags ++ [ "--disable-glamor" ];
+    });
+    #w3m = pkgs.w3m.overrideAttrs (old: {
+    #  libX11 = old.libx11;
+    #});
+  };
 
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
@@ -46,10 +55,13 @@
   services.xserver.enable = true;
   services.xserver.videoDrivers = [ "modesetting" "fbdev" "vesa" "intel_drv" "intel-media-sdk" ];
   # Enable Desktop Environment.
+  #services.displayManager.sddm = {
+  #  #package = pkgs.kdePackages.sddm;
+  #  theme = "${pkgs.where-is-my-sddm-theme}/share/sddm/themes/where_is_my_sddm_theme";
+  #};
   #services.displayManager.sddm.enable = true;
   # services.displayManager.sddm.wayland.enable = true;
   # services.xserver.displayManager.lightdm.enable = true;
-  # services.desktopManager.plasma6.enable = true;
   # services.xserver.desktopManager.plasma5.enable = true;
   #services.xserver.desktopManager.xfce.enable = true;
   # services.xserver.desktopManager.lxqt.enable = true;
@@ -95,6 +107,9 @@
     git
     btop
     fastfetch
+    #kdePackages.plasma-nano
+    #catppuccin-sddm
+    pkgs.where-is-my-sddm-theme
   ];
 
   # SSH and Mosh
diff --git a/systems/i686-linux/Rubtrm/hardware.nix b/systems/i686-linux/Rubtrm/hardware.nix
index 31c278b..ad0eaef 100644
--- a/systems/i686-linux/Rubtrm/hardware.nix
+++ b/systems/i686-linux/Rubtrm/hardware.nix
@@ -37,8 +37,8 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "i686-linux";
   # networking.enableIntel3945ABGFirmware = true;
-  hardware.graphics.extraPackages = [ pkgs.intel-vaapi-driver ];
-  hardware.graphics.extraPackages32 = [ pkgs.intel-vaapi-driver ];
+  #hardware.graphics.package = pkgs.intel-media-driver;
+  hardware.graphics.extraPackages = [ pkgs.intel-media-driver pkgs.intel-vaapi-driver ];
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   hardware.enableAllFirmware = true;
 }