diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 093aa29b..1ca40b37 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -44,11 +44,11 @@ jobs:
       # for main remember to change ${HOME} into ${GITHUB_WORKSPACE}
       - name: Build flatpak
         run: |
-          flatpak-builder --build-only --user --force-clean --repo=${HOME}/local ${HOME}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
+          flatpak-builder --build-only --user --force-clean --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
 
       - name: Create Bundle
         run: |
-          flatpak-builder --user --force-clean --repo=${HOME}/local ${HOME}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
+          flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
           flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck
 
       - name: Read version from version file
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 3b5d5651..470236b3 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -229,7 +229,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/libretro/RetroArch.git
-        branch: de4e56ecf28a09057734f8624af6d62f3088734f
+        branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38
       - type: file
         path: rd-submodules/retroarch/retroarch.cfg
     post-install:
@@ -243,15 +243,18 @@ modules:
         sed s:@prefix@:${FLATPAK_DEST}:g retroarch.cfg >
         ${FLATPAK_DEST}/etc/retroarch.cfg
     modules:
-      - rd-submodules/retroarch/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json
+      - libpng/libpng-1.6.35.json
+      #- rd-submodules/retroarch/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/libusb/libusb.json
       # certificate glu issue
       #- shared-modules/gudev/gudev.json
       - rd-submodules/retroarch/libbz2/libbz2-1.0.8.json
+      - rd-submodules/retroarch/xrandr/xrandr-1.5.1.json
       - rd-submodules/retroarch/libaio/libaio-0.3.112.json
       # certificate issue, check libglu module for more info
       #- shared-modules/glu/glu-9.json
@@ -263,7 +266,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/libretro/RetroArch.git
-        branch: de4e56ecf28a09057734f8624af6d62f3088734f
+        branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38
   - name: retroarch-filers-audio
     subdir: libretro-common/audio/dsp_filters
     make-install-args:
@@ -271,7 +274,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/libretro/RetroArch.git
-        branch: de4e56ecf28a09057734f8624af6d62f3088734f
+        branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38
   - name: retroarch-assets
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
@@ -285,21 +288,21 @@ modules:
     sources:
       - type: git
         url: https://github.com/libretro/libretro-database.git
-        commit: 1754130f72d8c00a512797bf85442576258279e8
+        commit: f3b10ec262fcbd78da3473f46d244270d12a327e
   - name: libretro-core-info
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
         url: https://github.com/libretro/libretro-core-info.git
-        commit: 1b2472eca14a5a187ff298ace1b614fd3d47bc7c
+        commit: 06dac6318c067a6a40e2ea1e1260e74681ada844
   - name: retroarch-joypad-autoconfig
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
         url: https://github.com/libretro/retroarch-joypad-autoconfig.git
-        commit: 0eb3ad2666e6bdc2de2cde4c5d4af29b8c7f2c67
+        commit: 760b057f1865a827762a54a8a32afda2cdd9e170
   - name: common-shaders
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
@@ -313,14 +316,14 @@ modules:
     sources:
       - type: git
         url: https://github.com/libretro/slang-shaders.git
-        commit: 77558d5f2ac807b27201fb888cbf2caee8e289fa
+        commit: 148c57d9747f5db124135501ac280b5ca129a83f
   - name: glsl-shaders
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
         url: https://github.com/libretro/glsl-shaders.git
-        commit: 20801b38aa2c89a2beb9f57ffbbbcea7256e2523
+        commit: 8f6b2649489760caea8f36ec6099998854059569
   - name: common-overlays
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
@@ -339,14 +342,15 @@ modules:
         - mv ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/* /app/share/libretro/cores/
     sources:
       - type: archive
-        url: https://buildbot.libretro.com/stable/1.10.2/linux/x86_64/RetroArch_cores.7z
-        sha256: 0c59f99534a1ae3a2d34b1747c40398325e53db69acfab35b99c8fa8d76430e5
+        url: https://buildbot.libretro.com/stable/1.10.3/linux/x86_64/RetroArch_cores.7z
+        sha256: 33abf39839687f8faba202ed5dcf3a54c06266a49fad35f0521fa445523d009f
 
   # Yuzu - https://github.com/flathub/org.yuzu_emu.yuzu
 
   - name: libzip
     buildsystem: cmake-ninja
     config-opts:
+      - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON'
       - '-DCMAKE_BUILD_TYPE=RelWithDebInfo'
     sources:
       - type: archive
@@ -374,6 +378,7 @@ modules:
   - name: fmt
     buildsystem: cmake-ninja
     config-opts:
+      - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON'
       - '-DFMT_TEST=OFF'
     sources:
       - type: archive
@@ -390,8 +395,8 @@ modules:
       - '-DCMAKE_BUILD_TYPE=Release'
     sources:
       - type: archive
-        url: https://github.com/KhronosGroup/glslang/archive/11.8.0.tar.gz
-        sha256: 9e5fbe5b844d203da5e61bcd84eda76326e0ff5dc696cb862147bbe01d2febb0
+        url: https://github.com/KhronosGroup/glslang/archive/11.9.0.tar.gz
+        sha256: d5744adba19eef9ad3d73f524226b39fec559d94cb582cd442e3c5de930004b2
         x-checker-data:
           type: anitya
           stable-only: true
@@ -401,12 +406,13 @@ modules:
     buildsystem: cmake-ninja
     config-opts:
       - '-DCMAKE_BUILD_TYPE=Release'
+      - '-DCATCH_INSTALL_EXTRAS=ON'
       - '-DCATCH_BUILD_TESTING=OFF'
     builddir: true
     sources:
       - type: archive
-        url: https://github.com/catchorg/Catch2/archive/v2.13.8.tar.gz
-        sha256: b9b592bd743c09f13ee4bf35fc30eeee2748963184f6bea836b146e6cc2a585a
+        url: https://github.com/catchorg/Catch2/archive/v2.13.9.tar.gz
+        sha256: 06dbc7620e3b96c2b69d57bf337028bf245a211b3cddb843835bfe258f427a52
         x-checker-data:
           type: anitya
           stable-only: true
@@ -416,6 +422,7 @@ modules:
     buildsystem: cmake-ninja
     config-opts:
       - '-DCMAKE_BUILD_TYPE=Release'
+      - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON'
       - '-DJSON_BuildTests=OFF'
     sources:
       - type: archive
@@ -423,7 +430,7 @@ modules:
         sha256: 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4
         x-checker-data:
           type: anitya
-          project-id: 141453
+          project-id: 11152
           url-template: https://github.com/nlohmann/json/archive/v$version.tar.gz
   - name: boost
     buildsystem: simple
@@ -433,13 +440,13 @@ modules:
     sources:
       - type: archive
         url: >-
-          https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2
-        sha256: 8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc
+          https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2
+        sha256: 475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
         x-checker-data:
           type: anitya
           project-id: 6845
           url-template: >-
-            https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_1_78_0.tar.bz2
+            https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_1_79_0.tar.bz2
   - name: nv-codec-headers
     make-install-args:
       - PREFIX=/app
@@ -465,8 +472,8 @@ modules:
       - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON'
       - '-DYUZU_USE_QT_WEB_ENGINE=ON'
       - '-DYUZU_USE_BUNDLED_FFMPEG=ON'
-      - '-DDISPLAY_VERSION=969'
-      - '-DBUILD_TAG=mainline-969'
+      - '-DDISPLAY_VERSION=1039'
+      - '-DBUILD_TAG=mainline-1039'
       - '-DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline'
     build-options:
       env:
@@ -478,24 +485,14 @@ modules:
       - /share/pixmaps
     post-install:
       - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher
-      - desktop-file-install --dir=/app/share/applications ../dist/yuzu.desktop
-      - >-
-        desktop-file-edit --set-key StartupWMClass --set-value yuzu --set-key
-        Exec --set-value yuzu-launcher /app/share/applications/yuzu.desktop
       - >-
         install -Dm644 ../dist/yuzu.svg
         /app/share/icons/hicolor/scalable/apps/yuzu.svg
-      - >-
-        mv /app/share/mime/packages/yuzu.xml
-        /app/share/mime/packages/org.yuzu_emu.yuzu.xml
-      - >-
-        sed 's/yuzu/org.yuzu_emu.yuzu/g' -i
-        /app/share/mime/packages/org.yuzu_emu.yuzu.xml
     sources:
       - type: git
         url: https://github.com/yuzu-emu/yuzu-mainline.git
-        tag: mainline-0-969
-        commit: d179e12137cd8ff88b0eade7d13de801661f869b
+        tag: mainline-0-1039
+        commit: 983afc5328725109a1cf13c61103b8a553c005d0
         disable-shallow-clone: true
         x-checker-data:
           type: git
@@ -520,8 +517,8 @@ modules:
     sources:
       - type: git
         url: https://github.com/wxWidgets/wxWidgets.git
-        tag: v3.1.5
-        commit: 9c0a8be1dc32063d91ed1901fd5fcd54f4f955a1
+        tag: v3.1.6
+        commit: 19907924842a9152b8ee5f03f117aed65193b964
         x-checker-data:
           type: git
           tag-pattern: ^v([\d.]+)$
@@ -533,8 +530,8 @@ modules:
     sources:
       - type: git
         url: https://pagure.io/libaio.git
-        tag: libaio-0.3.112
-        commit: d025927efa75a0d1b46ca3a5ef331caa2f46ee0e
+        tag: libaio-0.3.113
+        commit: 1b18bfafc6a2f7b9fa2c6be77a95afed8b7be448
         x-checker-data:
           type: git
           tag-pattern: ^libaio-([\d.]+)$
@@ -628,8 +625,8 @@ modules:
     sources:
       - type: git
         url: https://github.com/PCSX2/pcsx2.git
-        tag: v1.7.2554
-        commit: 0d1675fbaa0d40874df98eed6270efc55620271b
+        tag: v1.7.2889
+        commit: a6649b2d6b558806fbe7cbaf6296014e3c5c192e
       - type: file
         path: rd-submodules/pcsx2/AppIcon128.png
 
@@ -701,14 +698,11 @@ modules:
       - /share/man
     post-install:
       - install -D dolphin-emu-wrapper /app/bin/dolphin-emu-wrapper
-      - install -Dm644 appdata.xml /app/share/appdata/dolphin-emu.appdata.xml
       - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
-      - desktop-file-edit --set-key=Exec --set-value='/app/bin/dolphin-emu-wrapper'
-        /app/share/applications/dolphin-emu.desktop
     sources:
       - type: git
         url: https://github.com/dolphin-emu/dolphin.git
-        commit: 8ecfa537a242de74d2e372e30d9d79b14584b2fb
+        commit: 8335ec70e5fe253eb21509408ca6b5736ed57dfc
       # detects whether dolphin is running in a flatpak sandbox
       # and makes it use xdg directories if it is.
       # prevents dolphin from attempting to write conf files
@@ -719,19 +713,25 @@ modules:
       # version strings must match exactly for online multiplayer
       - type: patch
         path: rd-submodules/dolphin/nodirtyversion.patch
-      - type: file
-        path: rd-submodules/dolphin/appdata.xml
       - type: script
         commands:
           - for i in {0..9}; do
           - test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i;
           - done
-          - dolphin-emu "$@"
+          # use gtk3 filechooser on steamdeck
+          - bv=`cat /sys/devices/virtual/dmi/id/board_vendor`
+          - bv=$bv`cat /sys/devices/virtual/dmi/id/board_name`
+          - if [[ $bv == "ValveJupiter" ]]; then
+          -   QT_QPA_PLATFORMTHEME=gtk3 dolphin-emu "$@"
+          - else
+          -   dolphin-emu "$@"
+          - fi
         dest-filename: dolphin-emu-wrapper
 
   # Dolphin - END
 
   # XEMU - START
+  # https://github.com/flathub/app.xemu.xemu
 
   # certificate issue, check libglu module for more info
   # - name: libglu
@@ -751,6 +751,15 @@ modules:
   #         stable-only: true
   #         url-template: http://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz
 
+  - name: PyYAML
+    buildsystem: simple
+    build-commands:
+      - python3 setup.py install --prefix=/app --root=/
+    sources:
+      - type: archive
+        url: https://github.com/yaml/pyyaml/archive/refs/tags/6.0.tar.gz
+        sha256: f33eaba25d8e0c1a959bbf00655198c287dfc5868f5b7b01e401eaa1796cc778
+
   - name: xemu
     buildsystem: autotools
     builddir: true
@@ -769,21 +778,18 @@ modules:
           install -Dm644 ../ui/icons/xemu_${px}x${px}.png /app/share/icons/hicolor/${px}x${px}/apps/app.xemu.xemu.png
         done
       - install -Dm644 ../ui/icons/xemu.svg /app/share/icons/hicolor/scalable/apps/app.xemu.xemu.svg
-      - desktop-file-install ../ui/xemu.desktop --dir /app/share/applications
-      - sed -i 's/^Icon=xemu/Icon=app.xemu.xemu/' /app/share/applications/xemu.desktop
       - mv qemu-system-i386 /app/bin/xemu
       - mkdir -p /app/share/licenses/xemu
       - cd .. && python3 scripts/gen-license.py > /app/share/licenses/xemu/LICENSE.txt
     sources:
       - type: git
         url: https://github.com/mborgerson/xemu.git
-        tag: gh-release/0.6.2-90-g6f507c80af
-        commit: 6f507c80af546e0f5d316622d20f78820423ce6e
+        tag: v0.7.29
+        commit: 69dcbe9b3081ee51d1468b1b7777b8b930bfba6c
         x-checker-data:
           type: json
           url: https://api.github.com/repos/mborgerson/xemu/releases/latest
           tag-query: .tag_name
-          version-query: $tag | sub("^gh-release/"; "")
           timestamp-query: .published_at
           is-main-source: true
 
@@ -841,8 +847,8 @@ modules:
     sources:
       - type: git
         url: https://github.com/citra-emu/citra-nightly.git
-        tag: nightly-1762
-        commit: 1382035d4de5ada310c7f4fd00f1836b16ab74fb
+        tag: nightly-1767
+        commit: 6f6a9357c26eccf09bf0c993f159d69bbe472f49
         disable-shallow-clone: true
         x-checker-data:
           type: git
@@ -876,8 +882,8 @@ modules:
         CXX: clang++
         RANLIB: llvm-ranlib
       ldflags: -fuse-ld=lld
-      prepend-ld-library-path: /usr/lib/sdk/llvm13/lib
-      prepend-path: /usr/lib/sdk/llvm13/bin
+      prepend-ld-library-path: /usr/lib/sdk/llvm14/lib
+      prepend-path: /usr/lib/sdk/llvm14/bin
     config-opts:
       - -DCMAKE_BUILD_TYPE=Release
       - -DBUILD_SHARED_LIBS=OFF
@@ -901,7 +907,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/RPCS3/llvm-mirror.git
-        commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60
+        commit: c725f494c91611018f5d830eca22c0a1662c0f31
       - type: git
         url: https://github.com/intel/ittapi.git
         dest: ittapi/ittapi
@@ -911,8 +917,8 @@ modules:
     buildsystem: cmake-ninja
     builddir: true
     build-options:
-      append-ld-library-path: /usr/lib/sdk/llvm13/lib
-      append-path: /usr/lib/sdk/llvm13/bin
+      append-ld-library-path: /usr/lib/sdk/llvm14/lib
+      append-path: /usr/lib/sdk/llvm14/bin
       cflags: *optflags
       cflags-override: true
       cxxflags: *optflags
@@ -944,7 +950,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/RPCS3/rpcs3.git
-        commit: e9570d1a0045926f63ec8ea9af68f81743d4f365
+        commit: 8d46840e091fa8e330d505f91be45a527f529efd
 
   # RPCS3 - END
   
@@ -1102,4 +1108,5 @@ modules:
       - type: file
         path: net.retrodeck.retrodeck.desktop
       - type: file
-        path: net.retrodeck.retrodeck.appdata.xml
\ No newline at end of file
+        path: net.retrodeck.retrodeck.appdata.xml
+        
\ No newline at end of file