diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index d4e1c211..4b355c5c 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -832,117 +832,117 @@ modules:
 
   # Ryujinx - START
 
-  - name: Ryujinx
-    buildsystem: simple
-    build-options:
-      append-path: /usr/lib/sdk/dotnet6/bin
-      append-ld-library-path: /usr/lib/sdk/dotnet6/lib
-      arch:
-        x86_64:
-          env:
-            RUNTIME: linux-x64
-      env:
-        PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/sdk/dotnet6/lib/pkgconfig
-        DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
-        DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true'
-        RYUJINX_VERSION: 1.1.102
-        RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: flathub
-        RYUJINX_TARGET_RELEASE_CHANNEL_REPO: org.ryujinx.Ryujinx
-        RYUJINX_TARGET_RELEASE_CHANNEL_NAME: master
-    build-commands:
-    - |
-      export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD)
-      sed -r --in-place "s/\%\%RYUJINX_BUILD_VERSION\%\%/$RYUJINX_VERSION/g;" Ryujinx.Common/ReleaseInformations.cs
-      sed -r --in-place "s/\%\%RYUJINX_BUILD_GIT_HASH\%\%/$RYUJINX_GIT_SHORT_HASH/g;" Ryujinx.Common/ReleaseInformations.cs
-      sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_NAME/g;" Ryujinx.Common/ReleaseInformations.cs
-      sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_OWNER/g;" Ryujinx.Common/ReleaseInformations.cs
-      sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_REPO/g;" Ryujinx.Common/ReleaseInformations.cs
-      mkdir -p /app/bin
-      dotnet publish -c Release -r $RUNTIME /p:DebugType=embedded Ryujinx /p:Version=$RYUJINX_VERSION /p:SourceRevisionId=$RYUJINX_GIT_SHORT_HASH /p:ExtraDefineConstants=DISABLE_UPDATER --self-contained --source nuget-sources
-      if [ $? -ne 0 ]; then
-          exit 1;
-      fi;
-      cp -r --remove-destination /run/build/Ryujinx/Ryujinx/bin/Release/net6.0/$RUNTIME/publish/* /app/bin/
-      mkdir -p /app/lib/ffmpeg
-      ln -s /usr/lib/x86_64-linux-gnu/libX11.so.6 /app/lib/libX11.so
-      install -Dm644 $FLATPAK_ID.appdata.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml
-      install -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper
-      install -Dm644 distribution/linux/ryujinx-logo.svg /app/share/icons/hicolor/scalable/apps/ryujinx.svg
-      install -Dm644 distribution/linux/ryujinx-mime.xml /app/share/mime/packages/$FLATPAK_ID.mime.xml
-      install -Dm644 distribution/linux/ryujinx.desktop /app/share/applications/$FLATPAK_ID.desktop
-      desktop-file-edit --set-key="Exec" --set-value="ryujinx-wrapper %f" /app/share/applications/$FLATPAK_ID.desktop
-    sources:
-    - nuget_sources.json
-    - type: git
-      url: https://github.com/Ryujinx/Ryujinx.git
-      commit: 247d26b4b50df8a068b9bfbb412a29f0c9f6a97b
-    - type: file
-      path: ryujinx-wrapper
-    - type: file
-      path: org.ryujinx.Ryujinx.appdata.xml
+  # - name: Ryujinx
+  #   buildsystem: simple
+  #   build-options:
+  #     append-path: /usr/lib/sdk/dotnet6/bin
+  #     append-ld-library-path: /usr/lib/sdk/dotnet6/lib
+  #     arch:
+  #       x86_64:
+  #         env:
+  #           RUNTIME: linux-x64
+  #     env:
+  #       PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/sdk/dotnet6/lib/pkgconfig
+  #       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
+  #       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true'
+  #       RYUJINX_VERSION: 1.1.102
+  #       RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: flathub
+  #       RYUJINX_TARGET_RELEASE_CHANNEL_REPO: org.ryujinx.Ryujinx
+  #       RYUJINX_TARGET_RELEASE_CHANNEL_NAME: master
+  #   build-commands:
+  #   - |
+  #     export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD)
+  #     sed -r --in-place "s/\%\%RYUJINX_BUILD_VERSION\%\%/$RYUJINX_VERSION/g;" Ryujinx.Common/ReleaseInformations.cs
+  #     sed -r --in-place "s/\%\%RYUJINX_BUILD_GIT_HASH\%\%/$RYUJINX_GIT_SHORT_HASH/g;" Ryujinx.Common/ReleaseInformations.cs
+  #     sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_NAME/g;" Ryujinx.Common/ReleaseInformations.cs
+  #     sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_OWNER/g;" Ryujinx.Common/ReleaseInformations.cs
+  #     sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_REPO/g;" Ryujinx.Common/ReleaseInformations.cs
+  #     mkdir -p /app/bin
+  #     dotnet publish -c Release -r $RUNTIME /p:DebugType=embedded Ryujinx /p:Version=$RYUJINX_VERSION /p:SourceRevisionId=$RYUJINX_GIT_SHORT_HASH /p:ExtraDefineConstants=DISABLE_UPDATER --self-contained --source nuget-sources
+  #     if [ $? -ne 0 ]; then
+  #         exit 1;
+  #     fi;
+  #     cp -r --remove-destination /run/build/Ryujinx/Ryujinx/bin/Release/net6.0/$RUNTIME/publish/* /app/bin/
+  #     mkdir -p /app/lib/ffmpeg
+  #     ln -s /usr/lib/x86_64-linux-gnu/libX11.so.6 /app/lib/libX11.so
+  #     install -Dm644 $FLATPAK_ID.appdata.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml
+  #     install -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper
+  #     install -Dm644 distribution/linux/ryujinx-logo.svg /app/share/icons/hicolor/scalable/apps/ryujinx.svg
+  #     install -Dm644 distribution/linux/ryujinx-mime.xml /app/share/mime/packages/$FLATPAK_ID.mime.xml
+  #     install -Dm644 distribution/linux/ryujinx.desktop /app/share/applications/$FLATPAK_ID.desktop
+  #     desktop-file-edit --set-key="Exec" --set-value="ryujinx-wrapper %f" /app/share/applications/$FLATPAK_ID.desktop
+  #   sources:
+  #   - nuget_sources.json
+  #   - type: git
+  #     url: https://github.com/Ryujinx/Ryujinx.git
+  #     commit: 247d26b4b50df8a068b9bfbb412a29f0c9f6a97b
+  #   - type: file
+  #     path: ryujinx-wrapper
+  #   - type: file
+  #     path: org.ryujinx.Ryujinx.appdata.xml
 
   # Ryujinx - END
 
   # CITRA - START
   # https://github.com/flathub/org.citra_emu.citra
 
-  # - name: citra
-  #   buildsystem: cmake-ninja
-  #   builddir: true
-  #   config-opts:
-  #     - '-DCMAKE_BUILD_TYPE=Release'
-  #     - '-DENABLE_QT_TRANSLATION=ON'
-  #     - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON'
-  #     - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON'
-  #     - '-DENABLE_FFMPEG_VIDEO_DUMPER=ON'
-  #     - '-DENABLE_FDK=ON'
-  #   build-options:
-  #     env:
-  #       CI: '1'
-  #       GITHUB_ACTIONS: '1'
-  #       GITHUB_REPOSITORY: citra-emu/citra-nightly
-  #       GIT_TAG_NAME: nightly-1759
-  #   cleanup:
-  #     - /share/man
-  #     - /share/pixmaps
-  #   post-install:
-  #     - >-
-  #       install -Dm644 ../org.citra_emu.citra.metainfo.xml
-  #       /app/share/appdata/org.citra_emu.citra.metainfo.xml
-  #     - desktop-file-install --dir=/app/share/applications ../dist/citra.desktop
-  #     - echo 'StartupWMClass=citra-qt' >> /app/share/applications/citra.desktop
-  #     - >-
-  #       install -Dm644 ../dist/citra.svg
-  #       /app/share/icons/hicolor/scalable/apps/citra.svg
-  #     - >-
-  #       install -Dm644 ../dist/icon.png
-  #       /app/share/icons/hicolor/512x512/apps/citra.png
-  #     - >-
-  #       mv /app/share/mime/packages/citra.xml
-  #       /app/share/mime/packages/org.citra_emu.citra.xml
-  #     - >-
-  #       sed 's/citra/org.citra_emu.citra/g' -i
-  #       /app/share/mime/packages/org.citra_emu.citra.xml
-  #   sources:
-  #     - type: git
-  #       url: 'https://github.com/citra-emu/citra-nightly.git'
-  #       tag: nightly-1759
-  #       commit: 3df43f9505505fbe2abb543c795f791615541cd4
-  #       disable-shallow-clone: true
-  #       x-checker-data:
-  #         type: git
-  #         tag-pattern: ^(nightly-\d+)$
-  #         is-main-source: true
-  #     - type: file
-  #       path: org.citra_emu.citra.metainfo.xml
-  #     - type: file
-  #       path: compatibility_list.json
-  #       dest-filename: compatibility_list.json
-  #     - type: shell
-  #       commands:
-  #         - >-
-  #           cp -v compatibility_list.json
-  #           dist/compatibility_list/compatibility_list.json
+  - name: citra
+    buildsystem: cmake-ninja
+    builddir: true
+    config-opts:
+      - '-DCMAKE_BUILD_TYPE=Release'
+      - '-DENABLE_QT_TRANSLATION=ON'
+      - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON'
+      - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON'
+      - '-DENABLE_FFMPEG_VIDEO_DUMPER=ON'
+      - '-DENABLE_FDK=ON'
+    build-options:
+      env:
+        CI: '1'
+        GITHUB_ACTIONS: '1'
+        GITHUB_REPOSITORY: citra-emu/citra-nightly
+        GIT_TAG_NAME: nightly-1759
+    cleanup:
+      - /share/man
+      - /share/pixmaps
+    post-install:
+      - >-
+        install -Dm644 ../org.citra_emu.citra.metainfo.xml
+        /app/share/appdata/org.citra_emu.citra.metainfo.xml
+      - desktop-file-install --dir=/app/share/applications ../dist/citra.desktop
+      - echo 'StartupWMClass=citra-qt' >> /app/share/applications/citra.desktop
+      - >-
+        install -Dm644 ../dist/citra.svg
+        /app/share/icons/hicolor/scalable/apps/citra.svg
+      - >-
+        install -Dm644 ../dist/icon.png
+        /app/share/icons/hicolor/512x512/apps/citra.png
+      - >-
+        mv /app/share/mime/packages/citra.xml
+        /app/share/mime/packages/org.citra_emu.citra.xml
+      - >-
+        sed 's/citra/org.citra_emu.citra/g' -i
+        /app/share/mime/packages/org.citra_emu.citra.xml
+    sources:
+      - type: git
+        url: 'https://github.com/citra-emu/citra-nightly.git'
+        tag: nightly-1759
+        commit: 3df43f9505505fbe2abb543c795f791615541cd4
+        disable-shallow-clone: true
+        x-checker-data:
+          type: git
+          tag-pattern: ^(nightly-\d+)$
+          is-main-source: true
+      - type: file
+        path: rd-submodules/citra/org.citra_emu.citra.metainfo.xml
+      - type: file
+        path: rd-submodules/citra/compatibility_list.json
+        dest-filename: compatibility_list.json
+      - type: shell
+        commands:
+          - >-
+            cp -v compatibility_list.json
+            dist/compatibility_list/compatibility_list.json
 
   # CITRA - END