diff --git a/com.xargon.retrodeck.desktop b/com.xargon.retrodeck.desktop
new file mode 100644
index 00000000..d03aa5ee
--- /dev/null
+++ b/com.xargon.retrodeck.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=RetroDECK
+GenericName=Emulation bundle for Steam Deck
+Type=Application
+Comment=All you need for emulation on Steam Deck
+Icon=com.xargon.retrodeck
+Exec=
+Terminal=false
+StartupNotify=false
+Keywords=multi;engine;emulator;standalone;steam;deck
+Categories=Game;Emulator;
\ No newline at end of file
diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index 47b6e5f4..605fa3f9 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -16,7 +16,7 @@ finish-args:
    - --share=network
    - --device=all
    - --filesystem=~/retrodeck:create
-   - --filesystem=/run/media/mmcblk0p1
+   - --filesystem=/run/media
    - --allow=multiarch
    - --talk-name=org.freedesktop.ScreenSaver
    - --talk-name=org.freedesktop.PowerManagement.Inhibit
@@ -25,14 +25,14 @@ finish-args:
    - --filesystem=xdg-run/app/com.discordapp.Discord:create
   # Yuzu
    - --filesystem=home:ro
-   - --filesystem=/run/media:ro
+  # - --filesystem=/run/media:ro
 
 cleanup:
   # ES-DE
   - /include
   - /share/ffmpeg
   - /lib/cmake
-  - /lib/debug
+  #- /lib/debug
   - /lib/pkgconfig
   - /lib/libfreeimage.a
   - /lib/libogg.a
@@ -65,14 +65,14 @@ modules:
         sha256: 15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca
       - type: shell
         commands:
-          - cp -p /usr/share/automake-*/config.{sub,guess} .;
-          - autoreconf -vfi;
+          - cp -p /usr/share/automake-*/config.{sub,guess} .
+          - autoreconf -vfi
     post-install:
-      - ln -s "xml" "${FLATPAK_DEST}/bin/xmlstarlet" ||:;
+      - ln -s "xml" "${FLATPAK_DEST}/bin/xmlstarlet" ||:
     cleanup: ["*"]
 
   - name: kdialog
-    buildsystem: cmake
+    buildsystem: cmake-ninja
     sources:
     - type: git
       url: https://github.com/KDE/kdialog.git
@@ -80,52 +80,6 @@ modules:
 
   # ES-DE
 
-  - name: fdk-aac
-    buildsystem: cmake
-    sources:
-    - type: git
-      url: https://git.code.sf.net/p/opencore-amr/fdk-aac.git
-      tag: v2.0.2
-
-  - name: libvpx
-    config-opts:
-    - --disable-examples
-    - --disable-docs
-    - --enable-pic
-    - --enable-vp9-highbitdepth
-    sources:
-    - type: git
-      url: https://github.com/webmproject/libvpx.git
-      tag: v1.11.0
-
-  - name: ogg
-    buildsystem: cmake
-    config-opts:
-    - -DCMAKE_POSITION_INDEPENDENT_CODE=on
-    - -DINSTALL_DOCS=off
-    sources:
-    - type: git
-      url: https://github.com/xiph/ogg.git
-      tag: v1.3.5
-
-  - name: vorbis
-    buildsystem: cmake
-    config-opts:
-    - -DBUILD_SHARED_LIBS=on
-    sources:
-    - type: git
-      url: https://gitlab.xiph.org/xiph/vorbis.git
-      tag: v1.3.7
-
-  - name: opus
-    buildsystem: cmake
-    config-opts:
-    - -DBUILD_SHARED_LIBS=on
-    sources:
-    - type: git
-      url: https://gitlab.xiph.org/xiph/opus.git
-      tag: v1.3.1
-
   - name: ffmpeg
     config-opts:
     - --disable-static
@@ -160,7 +114,7 @@ modules:
       - sed -i 's|/usr|/app|' ./Makefile.gnu
 
   - name: pugixml
-    buildsystem: cmake
+    buildsystem: cmake-ninja
     config-opts:
     - -DBUILD_SHARED_LIBS=on .
     sources:
@@ -169,16 +123,14 @@ modules:
       sha256: 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716
 
   - name: emulationstation-de
-    buildsystem: cmake
-    config-opts:
-      - -DCMAKE_INSTALL_PREFIX=/app
+    buildsystem: cmake-ninja
     cleanup:
       - es-app
       - es-core
     sources:
     - type: git
       url: https://gitlab.com/leonstyhre/emulationstation-de.git
-      branch: stable-1.2.3
+      branch: c3fc30cfd5c26195024e0da328349d83af067b9e
 
   # ES-DE - END
 
@@ -223,17 +175,17 @@ modules:
       - mkdir -p ${FLATPAK_DEST}/share/appdata
       - cp org.libretro.RetroArch.appdata.xml ${FLATPAK_DEST}/share/appdata
     modules:
-      - libpng/libpng-1.6.35.json
+      #- libpng/libpng-1.6.35.json
       - nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json
       - shared-modules/SDL/SDL-1.2.15.json
       - shared-modules/SDL/SDL_image-1.2.12.json
       - shared-modules/SDL/SDL_mixer-1.2.12.json
       - shared-modules/SDL/SDL_net-1.2.8.json
-      - shared-modules/SDL/SDL_ttf-2.0.11.json
+      #- shared-modules/SDL/SDL_ttf-2.0.11.json
       - shared-modules/libusb/libusb.json
       - shared-modules/gudev/gudev.json
       - libbz2/libbz2-1.0.8.json
-      - xrandr/xrandr-1.5.1.json
+      #- xrandr/xrandr-1.5.1.json
       - libaio/libaio-0.3.112.json
       - shared-modules/glu/glu-9.json
       - libdecor/libdecor-0.1.0.json
@@ -673,7 +625,7 @@ modules:
         - chmod +x /app/bin/retrodeck.sh
 
         # Desktop entry
-        - cp desktop_entry /app/share/applications/com.xargon.retrodeck.desktop
+        - cp com.xargon.retrodeck.desktop /app/share/applications/com.xargon.retrodeck.desktop
 
     #cleanup: ['*']
     sources:
@@ -694,4 +646,4 @@ modules:
       - type: dir
         path: tools
       - type: file
-        path: desktop_entry
\ No newline at end of file
+        path: com.xargon.retrodeck.desktop
\ No newline at end of file