diff --git a/global.sh b/global.sh
index 9355d61a..29ad7ccb 100755
--- a/global.sh
+++ b/global.sh
@@ -48,7 +48,6 @@ conf_write() {
   then
     sed -i "s%sdcard=.*%sdcard=$sdcard%" "$rd_conf"
   fi
-
   echo "DEBUG: New contents:"
   cat "$rd_conf"
   echo ""
diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index c750ca63..c2b9104f 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -66,18 +66,19 @@
       <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.5b</url>
       <description>
          <ul>
-          <li>IMPORTANT: Started saves migration, the saves are being moved to retrodeck/saves/systemname/emulator, so if the emulator cannot load your saves you have to move them to the new path</li>
+          <li>IMPORTANT: Started saves migration, the saves are being moved to retrodeck/saves/systemname/emulator upon update, however if some emulators cannot load your saves you have to move them manually to the new path</li>
           <li>Theme revamp and more themes available such as the old one</li>
-          <li>Updated RetroArch and its cores from 1.10.2 to 1.10.3</li>
+          <li>Updated RetroArch and its cores from 1.10.2 to 1.11.0</li>
           <li>Updated all the standalone emulators to their latest releases</li>
           <li>Updated ES-DE to 1.2.6</li>
-          <li>Removed the unavailable emualtors from the ES-DE list to avoid confusion</li>
+          <li>Removed the unavailable emulators from the ES-DE list to avoid confusion</li>
           <li>Updated XEMU configurations and added its (free) assets</li>
           <li>Added free assets for RetroArch, PPSSPP and BlueMSX (libretro)</li>
           <li>New emulator: PCSX2-QT, it's now the default PS2 emulator. Former PCSX2 emulator is now called PCSX2 (Legacy).</li>
           <li>New emualtor: Duckstation for PSX.</li>
+          <li>Swanstation (Libretro) is the new PSX default emulator, so if you don't find your saves just switch back to Beetle</li>
           <li>New varialbes system: now some variables such as game folder location are saved in /var/config/retrodeck/retrodeck.cfg.</li>
-          <li>Solved an issue where Dolphin (Standalone) was not saving in the intended riectories.</li>
+          <li>Solved an issue where Dolphin (Standalone) was not saving in the intended directories.</li>
         </ul>
 
       </description>
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index d7510677..a8620a46 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -289,7 +289,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/libretro/RetroArch.git
-        branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38
+        commit: 9586d679a8b143fbe1880dff7454fd0809262b55
       - type: file
         path: rd-submodules/retroarch/retroarch.cfg
     post-install:
@@ -322,7 +322,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/libretro/RetroArch.git
-        branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38
+        commit: 9586d679a8b143fbe1880dff7454fd0809262b55
   - name: retroarch-filers-audio
     subdir: libretro-common/audio/dsp_filters
     make-install-args:
@@ -330,63 +330,63 @@ modules:
     sources:
       - type: git
         url: https://github.com/libretro/RetroArch.git
-        branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38
+        commit: 9586d679a8b143fbe1880dff7454fd0809262b55
   - name: retroarch-assets
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
         url: https://github.com/libretro/retroarch-assets.git
-        commit: f45dd1351e6bfb9f01e12bee8d358ad22a2bb8f9
+        commit: ee33f8ef693b42a8e23ca3fd48f43f345e7cd087
   - name: libretro-database
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
         url: https://github.com/libretro/libretro-database.git
-        commit: f3b10ec262fcbd78da3473f46d244270d12a327e
+        commit: 772011a54392aab6be1302bf1bd8aa1cc0c0c6c2
   - name: libretro-core-info
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
         url: https://github.com/libretro/libretro-core-info.git
-        commit: 06dac6318c067a6a40e2ea1e1260e74681ada844
+        commit: 0cc4912691cd1adb87168ce87b6795bdf57b2fe5
   - name: retroarch-joypad-autoconfig
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
         url: https://github.com/libretro/retroarch-joypad-autoconfig.git
-        commit: 760b057f1865a827762a54a8a32afda2cdd9e170
+        commit: a3b5067b8954f15e8e87eeed71a4262f0ea7fd1c
   - name: common-shaders
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
         url: https://github.com/libretro/common-shaders.git
-        commit: 55e401834b732e62c34411321c4ffd82524345d4
+        commit: 86cfa146a8dfddf6377ddb5dbcff552feae2e5bf
   - name: slang-shaders
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
         url: https://github.com/libretro/slang-shaders.git
-        commit: 148c57d9747f5db124135501ac280b5ca129a83f
+        commit: f8f99ee220edbf2c5df2714a73d46faea43e62e2
   - name: glsl-shaders
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
         url: https://github.com/libretro/glsl-shaders.git
-        commit: 8f6b2649489760caea8f36ec6099998854059569
+        commit: 46a00f15e09ffbd4fba46ab41f0653aeea918fd1
   - name: common-overlays
     make-install-args:
       - PREFIX=${FLATPAK_DEST}
     sources:
       - type: git
         url: https://github.com/libretro/common-overlays.git
-        commit: db9744f4e58a740f0f10b04b62af347cd6f01928
+        commit: e2ba730083769b45bac62d164115e7dc197c8b63
 
   # RetroArch - END
 
@@ -398,8 +398,8 @@ 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.3/linux/x86_64/RetroArch_cores.7z
-        sha256: 33abf39839687f8faba202ed5dcf3a54c06266a49fad35f0521fa445523d009f
+        url: https://buildbot.libretro.com/stable/1.11.0/linux/x86_64/RetroArch_cores.7z
+        sha256: a443c18708b3eda12bdc3419e1aaf9d95370580a38f23d0abfa7868b84ff6fdc
 
   # PPSSPP - START
   # https://github.com/flathub/org.ppsspp.PPSSPP
@@ -958,8 +958,8 @@ modules:
       - ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt"
     sources:
       - type: file
-        url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3325/pcsx2-v1.7.3325-linux-AppImage-64bit-AVX2-Qt.AppImage
-        sha256: 5fa89570fb68b8a729dc0589e568d3a09b2b9243d4d66a5b7086975fb02e95e4
+        url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3357/pcsx2-v1.7.3357-linux-AppImage-64bit-AVX2-Qt.AppImage
+        sha256: 07f293c1aad832f0a908c18ff94c8b545db0cb56230b4f4574ba75071bd91441
 
   # PCSX2 - END