diff --git a/emu-configs/citra/qt-config.ini b/emu-configs/citra/qt-config.ini
index 6a74fd56..180bce30 100644
--- a/emu-configs/citra/qt-config.ini
+++ b/emu-configs/citra/qt-config.ini
@@ -395,7 +395,7 @@ Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq=Ctrl+1
 Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq\default=false
 Shortcuts\Main%20Window\Load%20Amiibo\Context=3
 Shortcuts\Main%20Window\Load%20Amiibo\Context\default=true
-Shortcuts\Main%20Window\Load%20Amiibo\KeySeq=Ctrl+M
+Shortcuts\Main%20Window\Load%20Amiibo\KeySeq=Alt+M
 Shortcuts\Main%20Window\Load%20Amiibo\KeySeq\default=false
 Shortcuts\Main%20Window\Load%20File\Context=1
 Shortcuts\Main%20Window\Load%20File\Context\default=false
@@ -451,7 +451,7 @@ Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq=
 Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context=1
 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context\default=true
-Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=Alt+0
+Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=Ctrl+L
 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=1
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true
diff --git a/emu-configs/yuzu/qt-config.ini b/emu-configs/yuzu/qt-config.ini
index aca503df..4221f0c1 100644
--- a/emu-configs/yuzu/qt-config.ini
+++ b/emu-configs/yuzu/qt-config.ini
@@ -1105,7 +1105,7 @@ Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context=3
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context\default=true
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq=
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq\default=false
-Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq=Ctrl+M
+Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq=Alt+M
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq\default=false
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Repeat=false
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Repeat\default=true
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index f2d5b038..72b65bb9 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -26,6 +26,10 @@ finish-args:
   - --filesystem=xdg-run/app/com.discordapp.Discord:create
   # Dolphin
   - --allow=bluetooth
+  # PPSSPP
+  # It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows
+  - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.retrodeck
+  - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.retrodeck
 
 cleanup:
   # ES-DE
@@ -524,8 +528,8 @@ modules:
     sources:
       - type: git
         url: &ppsspp-url https://github.com/hrydgard/ppsspp.git
-        tag: v1.15.3
-        commit: 6d619201bdd6d46a3e3d4b2a82a00148eb9ebc5a
+        tag: v1.15.4
+        commit: 9a80120dc09997e40c0a73fda05c3e07a347259f
         x-checker-data:
           type: anitya
           project-id: 12295
@@ -563,8 +567,8 @@ modules:
       - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu"
     sources:
       - type: file
-        url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1440/yuzu-mainline-20230521-f82efe9f6.AppImage
-        sha256: 7a18690ada3536be78f627425a884a6cc9b74f4b1e296a2de35f6f10a76336d8
+        url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1461/yuzu-mainline-20230606-238e46ec9.AppImage
+        sha256: 4b565923b5cabcde28788151ba4f3e392275386cd8b5ff246cc43a619607a290
 
   # Yuzu - END
 
diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch
index 0b1cfb79..fbfdda61 160000
--- a/rd-submodules/retroarch
+++ b/rd-submodules/retroarch
@@ -1 +1 @@
-Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
+Subproject commit fbfdda61b3da092a71cc53999dd3e7b909f244e2
diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules
index a2441b96..50314360 160000
--- a/rd-submodules/shared-modules
+++ b/rd-submodules/shared-modules
@@ -1 +1 @@
-Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42
+Subproject commit 50314360ded6fa3b9f0b602513b1164b7a6636ed