diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 9570905e..89fec225 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -441,15 +441,17 @@ modules:
     config-opts:
       - '--enable-dbus'
     make-args:
-      - 'GLOBAL_CONFIG_DIR=${FLATPAK_DEST}/etc'
+      - GLOBAL_CONFIG_DIR=${FLATPAK_DEST}/etc
       - HAVE_TRANSLATE=1
       - HAVE_ACCESSIBILITY=1
     sources:
       - type: git
-        url: 'https://github.com/libretro/RetroArch.git'
-        commit: 712b9350a5c2b1b9129d939a2ae622093dfabd04
+        url: https://github.com/libretro/RetroArch.git
+        commit: ad8975cb5a0fe45be43438bdbd6c3d745653dd02
       - type: file
         path: rd-submodules/retroarch/retroarch.cfg
+      - type: file
+        path: rd-submodules/retroarch/VkLayer_FROG_gamescope_wsi.x86_64.json
     post-install:
       - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/
       - >-
@@ -460,6 +462,10 @@ modules:
       - >-
         sed s:@prefix@:${FLATPAK_DEST}:g retroarch.cfg >
         ${FLATPAK_DEST}/etc/retroarch.cfg
+      - mkdir -p ${FLATPAK_DEST}/share/vulkan/implicit_layer.d
+      - >-
+        install VkLayer_FROG_gamescope_wsi.x86_64.json
+        /app/share/vulkan/implicit_layer.d/VkLayer_FROG_gamescope_wsi.x86_64.json
     modules:
       - rd-submodules/retroarch/modules/libpng/libpng-1.6.35.json
       - rd-submodules/retroarch/modules/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json
@@ -477,50 +483,51 @@ modules:
       # certificate issue, check glu module for more info
       #- rd-submodules/shared-modules/glu/glu-9.json
       - rd-submodules/shared-modules/libdecor/libdecor-0.1.1.json
+      - rd-submodules/retroarch/modules/gamemode/gamemode-1.8.json
   - name: retroarch-filers-video
     subdir: gfx/video_filters
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
-        url: 'https://github.com/libretro/RetroArch.git'
-        commit: 712b9350a5c2b1b9129d939a2ae622093dfabd04
+        url: https://github.com/libretro/RetroArch.git
+        commit: ad8975cb5a0fe45be43438bdbd6c3d745653dd02
   - name: retroarch-filers-audio
     subdir: libretro-common/audio/dsp_filters
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
-        url: 'https://github.com/libretro/RetroArch.git'
-        commit: 712b9350a5c2b1b9129d939a2ae622093dfabd04
+        url: https://github.com/libretro/RetroArch.git
+        commit: ad8975cb5a0fe45be43438bdbd6c3d745653dd02
   - name: retroarch-assets
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
-        url: 'https://github.com/libretro/retroarch-assets.git'
-        commit: 7b735ef18bcc6508b1c9a626eb237779ff787179
+        url: https://github.com/libretro/retroarch-assets.git
+        commit: 923b711dc6772a168d83dc8915e9260730fcf3a1
   - name: libretro-database
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
-        url: 'https://github.com/libretro/libretro-database.git'
-        commit: e3b5cb00da4f3ab99491bf67c19630ffa7ee19f2
+        url: https://github.com/libretro/libretro-database.git
+        commit: 2c121df3a1c661e7a686f159ec5500a2837eefb3
   - name: libretro-core-info
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
-        url: 'https://github.com/libretro/libretro-core-info.git'
-        commit: dacae85b406131feb12395a415fdf57fc4745201
+        url: https://github.com/libretro/libretro-core-info.git
+        commit: ef6815722bfd4cc7d0cf14640b7111ecb5709cdd
   - name: retroarch-joypad-autoconfig
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
-        url: 'https://github.com/libretro/retroarch-joypad-autoconfig.git'
-        commit: 5666e46bb89caf4e9af358fdb97a2b384cb62f36
+        url: https://github.com/libretro/retroarch-joypad-autoconfig.git
+        commit: 9999374439b6526cfec78dd1fc51ed889e51ec6d
   - name: common-shaders
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
@@ -533,21 +540,21 @@ modules:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
-        url: 'https://github.com/libretro/slang-shaders.git'
-        commit: 9266fa24b64b274fd429b73469ded3561de7b8f4
+        url: https://github.com/libretro/slang-shaders.git
+        commit: 5b4c9b2a75aba5f57fcb5b68662a06f0ed7c929f
   - name: glsl-shaders
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
-        url: 'https://github.com/libretro/glsl-shaders.git'
-        commit: c26b9e1913eda8c25d6cd218818745a3b451f982
+        url: https://github.com/libretro/glsl-shaders.git
+        commit: bc8df92f013a128c3a735a57d3d98c6f087cc291
   - name: common-overlays
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
-        url: 'https://github.com/libretro/common-overlays.git'
+        url: https://github.com/libretro/common-overlays.git
         commit: 115d8670c2e032e4a41ba45f766f5cfd9dae28b8
 
   # RetroArch - END
@@ -575,8 +582,8 @@ modules:
       - mv -f ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/* /app/share/libretro/cores/
     sources:
       - type: archive
-        url: https://buildbot.libretro.com/stable/1.16.0/linux/x86_64/RetroArch_cores.7z
-        sha256: a149d34662516d791e8f90507d1107949cb158196d6bbf75105c649fb26504b6
+        url: https://buildbot.libretro.com/stable/1.17.0/linux/x86_64/RetroArch_cores.7z
+        sha256: 1c1d61f86b196e9f89c1a93d0756fba95b60ef3ba57a7cd1d1e86dfd419c766b
     
   - name: retroarch-sameduck-core
     buildsystem: simple
diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch
index 51d4821a..c2aad986 160000
--- a/rd-submodules/retroarch
+++ b/rd-submodules/retroarch
@@ -1 +1 @@
-Subproject commit 51d4821a45ac5fe13b2baa69aaaea864ead407ce
+Subproject commit c2aad98600a47ab250f1b133328d0ccc1310f65e
diff --git a/rd-submodules/ryujinx b/rd-submodules/ryujinx
index ebcd7d1c..35d4fce1 160000
--- a/rd-submodules/ryujinx
+++ b/rd-submodules/ryujinx
@@ -1 +1 @@
-Subproject commit ebcd7d1c9bbb2d4857555238727a81e89f6600f1
+Subproject commit 35d4fce1b9959b8568838659ea7e8c239139d3c8
diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules
index 6ba63f38..f63cb3f5 160000
--- a/rd-submodules/shared-modules
+++ b/rd-submodules/shared-modules
@@ -1 +1 @@
-Subproject commit 6ba63f383ad54e7ebe2b0cda64c15602cf9a9153
+Subproject commit f63cb3f5fff835c141769d35cd54ce0ae042fcbf