diff --git a/homes/x86_64-linux/kb@HyperC/default.nix b/homes/x86_64-linux/kb@HyperC/default.nix
index 7a49b4f..1d858b9 100644
--- a/homes/x86_64-linux/kb@HyperC/default.nix
+++ b/homes/x86_64-linux/kb@HyperC/default.nix
@@ -28,7 +28,6 @@ in {
     libreoffice-qt
     logseq
     xournalpp
-    xournal
     rnote
     # Security
     gnupg
diff --git a/modules/nixos/services/minecraft/velocity.nix b/modules/nixos/services/minecraft/velocity.nix
index 6b69356..9b211b0 100644
--- a/modules/nixos/services/minecraft/velocity.nix
+++ b/modules/nixos/services/minecraft/velocity.nix
@@ -59,13 +59,15 @@ in
     networking.firewall.allowedTCPPorts = [ 25565 ];
 
     # Configure Plugin Luckperms
-    services.minecraft-servers.servers."velocity".files."plugins/luckperms/config.yml".value = {
-      storage-method = "mariadb";
-      data.address = "localhost:${toString config.services.mysql.settings.mysqld.port}";
-      data.database = "luckperms";
-      data.username = "luckperms";
-      data.password = builtins.readFile /run/secrets/minecraft/database/luckperms_password; # Secret created in ./database.nix
-    };
+    sops.templates."minecraft/velocity/plugin/luckperms/config.yml".path = "/srv/minecraft/velocity/plugins/luckperms/config.yml";
+    sops.templates."minecraft/velocity/plugin/luckperms/config.yml".content = ''
+      storage-method: mariadb
+      data:
+        address: localhost:${toString config.services.mysql.settings.mysqld.port}
+        database: luckperms
+        username: luckperms
+        password: ${config.sops.placeholder."minecraft/database/luckperms_password"}
+    '';
 
     
   };
diff --git a/systems/i686-linux/Rubtrm/default.nix b/systems/i686-linux/Rubtrm/default.nix
index 05515b4..d1f6e41 100644
--- a/systems/i686-linux/Rubtrm/default.nix
+++ b/systems/i686-linux/Rubtrm/default.nix
@@ -44,7 +44,7 @@
 
   # Enable the X11 windowing system.
   services.xserver.enable = true;
-  services.xserver.videoDrivers = [ "intel" "modesetting" "fbdev" "vesa" "intel_drv" "intel-media-sdk" ];
+  services.xserver.videoDrivers = [ "modesetting" "fbdev" "vesa" "intel_drv" "intel-media-sdk" ];
   # Enable Desktop Environment.
   services.displayManager.sddm.enable = true;
   # services.displayManager.sddm.wayland.enable = true;
diff --git a/systems/i686-linux/Rubtrm/hardware.nix b/systems/i686-linux/Rubtrm/hardware.nix
index 23d04fb..afa99ec 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 pkgs.internal.intel-media-sdk pkgs.xorg.xf86videointel ];
-  hardware.graphics.extraPackages32 = [ pkgs.intel-vaapi-driver pkgs.internal.intel-media-sdk pkgs.xorg.xf86videointel ];
+  hardware.graphics.extraPackages = [ pkgs.intel-vaapi-driver pkgs.internal.intel-media-sdk ];
+  hardware.graphics.extraPackages32 = [ pkgs.intel-vaapi-driver pkgs.internal.intel-media-sdk ];
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   hardware.enableAllFirmware = true;
 }
diff --git a/systems/x86_64-linux/LoyAdjo/default.nix b/systems/x86_64-linux/LoyAdjo/default.nix
index b714caa..da41e62 100644
--- a/systems/x86_64-linux/LoyAdjo/default.nix
+++ b/systems/x86_64-linux/LoyAdjo/default.nix
@@ -92,6 +92,7 @@
     isNormalUser = true;
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIuvGIdO1nwuzq3YrjpxH84rpGhquNvRKz1SSPwKUsth kb @ Rubtrm"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGRlk8FEIN7P81SRVEkP1wjlBjsiUGcBcqzSbHVGB0sF root @ Ohybke"
     ];
   };
  
diff --git a/systems/x86_64-linux/U3ncSovm/default.nix b/systems/x86_64-linux/U3ncSovm/default.nix
index fd7cf90..edcb219 100644
--- a/systems/x86_64-linux/U3ncSovm/default.nix
+++ b/systems/x86_64-linux/U3ncSovm/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [ # Include the results of the hardware scan.
-    ./vm.nix
+    ./hardware.nix
   ];
 
   # Configure Nix
diff --git a/systems/x86_64-linux/U3ncSovm/hardware.nix b/systems/x86_64-linux/U3ncSovm/hardware.nix
new file mode 100644
index 0000000..8dfb9e5
--- /dev/null
+++ b/systems/x86_64-linux/U3ncSovm/hardware.nix
@@ -0,0 +1,49 @@
+{ config, lib, pkgs, modulesPath, inputs, ... }:
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  # Configure NixOS
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  # Boot Parameters
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" "wl" ];
+  boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
+
+  # Filesystems
+  fileSystems."/" = { 
+    device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000";
+    fsType = "ext4";
+  };
+  boot.initrd.luks.devices."luks-00000000-0000-0000-0000-000000000000".device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000";
+  fileSystems."/boot" = { 
+    device = "/dev/disk/by-uuid/0000-0000";
+    fsType = "vfat";
+    options = [ "fmask=0077" "dmask=0077" ];
+  };
+  swapDevices = [ 
+    {
+      device = "/swapfile";
+      size = 4*1024;
+    }
+  ];
+
+  # Network
+  networking.useDHCP = lib.mkDefault true;
+
+  # Hardware
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  # Virtual Machine Configuration
+  virtualisation.vmVariant = {
+    # following configuration is added only when building VM with build-vm
+    virtualisation = {
+      memorySize = 4*1024;
+      cores = 3;         
+    };
+  };
+
+}
diff --git a/systems/x86_64-linux/U3ncSovm/vm.nix b/systems/x86_64-linux/U3ncSovm/vm.nix
deleted file mode 100644
index f12b0be..0000000
--- a/systems/x86_64-linux/U3ncSovm/vm.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-{
-  virtualisation.vmVariant = {
-    # following configuration is added only when building VM with build-vm
-    virtualisation = {
-      memorySize = 4*1024;
-      cores = 3;         
-    };
-  };
-}
diff --git a/systems/x86_64-linux/voloxo/default.nix b/systems/x86_64-linux/voloxo/default.nix
index 4f7263d..da8ceea 100644
--- a/systems/x86_64-linux/voloxo/default.nix
+++ b/systems/x86_64-linux/voloxo/default.nix
@@ -139,7 +139,6 @@
       tidal-hifi
       iamb # Matrix with Vim-Binds
       yazi
-      nerdfonts
       scrcpy
       ryujinx
       razergenie