diff --git a/boot.nix b/boot.nix
index 55573fe..df55d45 100644
--- a/boot.nix
+++ b/boot.nix
@@ -282,8 +282,10 @@ in {
           optionalAttrs config.aviallon.optimizations.enable (
             myLib.attrsets.mergeAttrsRecursive
               {
-                KCFLAGS = kCflags;
-                KRUSTFLAGS = kRustflags;
+                env = {
+                  KCFLAGS = kCflags;
+                  KRUSTFLAGS = kRustflags;
+                };
               }
               (traceValWithPrefix "aviallon.boot.kernel.addOptimizationAttributes" cfg.kernel.addOptimizationAttributes)
           )
@@ -317,7 +319,7 @@ in {
         #    moddedKernel
         #  ;
            
-      in mkOverride 2 (pkgs.linuxPackagesFor moddedKernel);
+      in mkOverride 2 (pkgs.linuxPackagesFor noDRMKernel);
 
       kernelPatches = []
         ++ optional cfg.x32abi.enable customKernelPatches.enableX32ABI
diff --git a/desktop/developer.nix b/desktop/developer.nix
index 9ed5329..8bba922 100644
--- a/desktop/developer.nix
+++ b/desktop/developer.nix
@@ -76,8 +76,7 @@ in {
       virt-viewer
       qtemu
 
-      libsForQt5.kdevelop
-      unstable.adbfs-rootless
+      adbfs-rootless
 
       amdctl
     ];
diff --git a/desktop/games.nix b/desktop/games.nix
index 4c799e5..e67e765 100644
--- a/desktop/games.nix
+++ b/desktop/games.nix
@@ -19,8 +19,8 @@ in {
       ryujinx.package = mkOption {
         description = "Ryujinx Switch emulator package";
         type = myLib.types.package';
-        default = pkgs.unstable.ryujinx;
-        example = literalExpression "pkgs.unstable.ryujinx";
+        default = pkgs.ryubing;
+        example = literalExpression "pkgs.ryujinx";
       };
     };
   };
diff --git a/desktop/multimedia.nix b/desktop/multimedia.nix
index bfce41f..caa0875 100644
--- a/desktop/multimedia.nix
+++ b/desktop/multimedia.nix
@@ -30,7 +30,8 @@ in {
       
       scribus
       yt-dlp
-      jellyfin-media-player
+      #jellyfin-media-player # https://github.com/NixOS/nixpkgs/issues/437865 https://github.com/jellyfin/jellyfin-media-player/issues/282
+      jellyfin-mpv-shim
 
       #jamesdsp # Audio post-processing
     ];
diff --git a/desktop/plasma/default.nix b/desktop/plasma/default.nix
index 0670f02..eae9279 100644
--- a/desktop/plasma/default.nix
+++ b/desktop/plasma/default.nix
@@ -6,7 +6,6 @@ let
 in {
 
   imports = [
-    ./plasma5.nix
     ./plasma6.nix
   ];
 
diff --git a/desktop/plasma/plasma5.nix b/desktop/plasma/plasma5.nix
deleted file mode 100644
index f0e2e88..0000000
--- a/desktop/plasma/plasma5.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib;
-let
-  cfg = config.aviallon.desktop;
-  generic = import ./generic.nix {
-    kdePackages = pkgs.libsForQt5;
-  };
-in {
-  config = mkIf (cfg.enable && (cfg.environment == "plasma")) {
-    # Enable the Plasma 5 Desktop Environment.
-    services.xserver.desktopManager.plasma5 = {
-      enable = true;
-      runUsingSystemd = true;
-      useQtScaling = true;
-
-      # Removed in: https://github.com/NixOS/nixpkgs/pull/172078
-      # and: https://github.com/NixOS/nixpkgs/pull/221721
-      # Once this (https://invent.kde.org/plasma/powerdevil/-/issues/19) is solved, make PR to add it back (prehaps by default?)
-      # supportDDC = true;
-    };
-
-    environment.systemPackages = generic.commonPackages ++ [
-      pkgs.kio-fuse
-    ];
-
-    # We prefer Plasma Wayland
-    services.displayManager.defaultSession = "plasmawayland";
-  };
-}
diff --git a/hardware/amd/rocm.nix b/hardware/amd/rocm.nix
index 4086010..ca4eebb 100644
--- a/hardware/amd/rocm.nix
+++ b/hardware/amd/rocm.nix
@@ -65,7 +65,7 @@ in {
                 "1101"
                 "1102" ];
       example = [ "900" "1031" ];
-      type = with types; nullOr (listOf string);
+      type = with types; nullOr (listOf str);
     };
   };
 
diff --git a/hardware/nvidia/proprietary.nix b/hardware/nvidia/proprietary.nix
index db49079..62d79b1 100644
--- a/hardware/nvidia/proprietary.nix
+++ b/hardware/nvidia/proprietary.nix
@@ -178,13 +178,7 @@ in {
     nix.settings.substituters = [ "https://cuda-maintainers.cachix.org" ];
     nix.settings.trusted-public-keys = [ "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" ];
 
-    nixpkgs.overlays =
-      [(final: prev: {
-        jellyfin-media-player = prev.runCommand "jellyfinmediaplayer" { nativeBuildInputs = [ prev.makeBinaryWrapper ]; } ''
-          mkdir -p $out/bin
-          makeWrapper ${getBin prev.jellyfin-media-player}/bin/jellyfinmediaplayer $out/bin/jellyfinmediaplayer --inherit-argv0 --add-flags "--platform=xcb"
-        '';
-      })]
+    nixpkgs.overlays = []
       ++ optional (cfg.proprietary.version == "unstable_beta") (final: prev: {
         cudaPackages_11 = final.unstable.cudaPackages_11;
         cudaPackages_12 = final.unstable.cudaPackages_12;