diff --git a/recipes/components/dnf-module.yml b/recipes/components/dnf-module.yml
index 9ba8ec2..5dc570a 100644
--- a/recipes/components/dnf-module.yml
+++ b/recipes/components/dnf-module.yml
@@ -1,4 +1,38 @@
 modules:
+  - type: dnf
+    repos:
+      nonfree: negativo17
+    install:
+      packages:
+        - steam
+        - gamescope
+        - mangohud
+
+        # xpadneo
+        - dkms-xpadneo
+
+        - libheif
+
+    remove:
+      packages:
+        # remove firefox
+        - firefox
+        - firefox-langpacks
+    
+    replace:
+      - from-repo: fedora-multimedia
+        packages:
+          - libva
+          - libva-intel-media-driver
+          - mesa-dri-drivers
+          - mesa-filesystem
+          - mesa-libEGL
+          - mesa-libGL
+          - mesa-libgbm
+          - mesa-va-drivers
+          - mesa-vulkan-drivers
+          - gstreamer1-plugin-libav
+
   - type: rpm-ostree
     repos:
       - https://copr.fedorainfracloud.org/coprs/ublue-os/packages/repo/fedora-%OS_VERSION%/ublue-os-packages-fedora-%OS_VERSION%.repo
@@ -15,7 +49,7 @@ modules:
 
     # password keeper
       - kf6-kwallet
-      - kwalletmanager
+      - kwalletmanager5
       - pam-kwallet
     
     # hyprland
@@ -29,8 +63,6 @@ modules:
       - ublue-os-signing
     
     # environment
-      # xwayland
-      - xorg-x11-server-Xwayland
       # headset control
       - headsetcontrol
       # media related
@@ -106,23 +138,6 @@ modules:
       # zoxide for z stuff
       - zoxide
 
-    # steam
-      - steam
-      # for game mode and big picture mode
-      - gamescope
-      # for performance view
-      - mangohud
-      # xpadneo
-      - dkms-xpadneo
-
-    # multimedia
-      - gstreamer1-plugin-libav
-
-    remove:
-      # remove firefox
-      - firefox
-      - firefox-langpacks
-
   - type: script
     scripts:
       - install-xpadneo.sh
\ No newline at end of file