diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index 637d9950..aba65b3c 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -677,96 +677,94 @@ modules:
   # Disabled because of this error:
   # https://github.com/flathub/net.rpcs3.RPCS3/issues/854
 
-  #- name: rpcs3-llvm
-  #  buildsystem: cmake-ninja
-  #  builddir: true
-  #  build-options:
-  #    cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong
-  #      -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection
-  #      -fcf-protection -fno-omit-frame-pointer
-  #    cflags-override: true
-  #    cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong
-  #      -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection
-  #      -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16
-  #    cxxflags-override: true
-  #    env:
-  #      AR: llvm-ar
-  #      CC: clang
-  #      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
-  #  config-opts:
-  #    - -DCMAKE_BUILD_TYPE=Release
-  #    - -DBUILD_SHARED_LIBS=OFF
-  #    - -DLLVM_CCACHE_BUILD=ON
-  #    - -DLLVM_TARGETS_TO_BUILD='X86'
-  #    - -DLLVM_BUILD_RUNTIME=OFF
-  #    - -DLLVM_BUILD_TOOLS=OFF
-  #    - -DLLVM_INCLUDE_DOCS=OFF
-  #    - -DLLVM_INCLUDE_EXAMPLES=OFF
-  #    - -DLLVM_INCLUDE_TESTS=OFF
-  #    - -DLLVM_INCLUDE_TOOLS=OFF
-  #    - -DLLVM_INCLUDE_UTILS=OFF
-  #    - -DLLVM_USE_INTEL_JITEVENTS=ON
-  #    - -DLLVM_USE_PERF=ON
-  #    - -DLLVM_ENABLE_Z3_SOLVER=OFF
-  #    - -DCMAKE_CXX_STANDARD=17
-  #    - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi
-  #    - -Wno-dev
-  #  cleanup:
-  #    - '*'
-  #  sources:
-  #    - type: git
-  #      url: https://github.com/RPCS3/llvm-mirror.git
-  #      branch: master
-  #      commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60
-  #    - type: git
-  #      url: https://github.com/intel/ittapi.git
-  #      dest: ittapi/ittapi
-  #      disable-shallow-clone: true
-  #
-  #- name: rpcs3
-  #  buildsystem: cmake-ninja
-  #  builddir: true
-  #  build-options:
-  #    append-ld-library-path: /usr/lib/sdk/llvm13/lib
-  #    append-path: /usr/lib/sdk/llvm13/bin
-  #    cflags: *optflags
-  #    cflags-override: true
-  #    cxxflags: *optflags
-  #    cxxflags-override: true
-  #    env:
-  #      AR: llvm-ar
-  #      CC: clang
-  #      CXX: clang++
-  #      RANLIB: llvm-ranlib
-  #    ldflags: -fuse-ld=lld
-  #  config-opts:
-  #    - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-  #    - -DBUILD_LLVM_SUBMODULE=OFF
-  #    - -DUSE_NATIVE_INSTRUCTIONS=OFF
-  #    - -DUSE_PRECOMPILED_HEADERS=OFF
-  #    - -DUSE_SYSTEM_CURL=ON
-  #    - -DUSE_SYSTEM_FFMPEG=ON
-  #    - -DUSE_SYSTEM_LIBPNG=ON
-  #    - -DUSE_SYSTEM_ZLIB=ON
-  #    - -Wno-dev
-  #  post-install:
-  #    - |
-  #      set -eux;
-  #      sed -i 's|<id>RPCS3</id>|<id>net.rpcs3.RPCS3</id>|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml;
-  #      COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)";
-  #      COMM_COUNT="$(git rev-list --count HEAD)";
-  #      COMM_HASH="$(git rev-parse --short=8 HEAD)";
-  #      sed -i 's|</component>|<content_rating type="oars-1.1"/><releases><release date="'$(git show -s --format=%cs)'" version="'"${COMM_TAG}"'-'"${COMM_COUNT}"'-'"${COMM_HASH}"'"/></releases></component>|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml;
-  #  sources:
-  #    - type: git
-  #      url: https://github.com/RPCS3/rpcs3.git
-  #      branch: master
-  #      commit: d6b026314409980734605e9275950f835f04e8df
-  #
+  - name: rpcs3-llvm
+   buildsystem: cmake-ninja
+   builddir: true
+   build-options:
+     cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong
+       -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection
+       -fcf-protection -fno-omit-frame-pointer
+     cflags-override: true
+     cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong
+       -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection
+       -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16
+     cxxflags-override: true
+     env:
+       AR: llvm-ar
+       CC: clang
+       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
+   config-opts:
+     - -DCMAKE_BUILD_TYPE=Release
+     - -DBUILD_SHARED_LIBS=OFF
+     - -DLLVM_CCACHE_BUILD=ON
+     - -DLLVM_TARGETS_TO_BUILD='X86'
+     - -DLLVM_BUILD_RUNTIME=OFF
+     - -DLLVM_BUILD_TOOLS=OFF
+     - -DLLVM_INCLUDE_DOCS=OFF
+     - -DLLVM_INCLUDE_EXAMPLES=OFF
+     - -DLLVM_INCLUDE_TESTS=OFF
+     - -DLLVM_INCLUDE_TOOLS=OFF
+     - -DLLVM_INCLUDE_UTILS=OFF
+     - -DLLVM_USE_INTEL_JITEVENTS=ON
+     - -DLLVM_USE_PERF=ON
+     - -DLLVM_ENABLE_Z3_SOLVER=OFF
+     - -DCMAKE_CXX_STANDARD=17
+     - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi
+     - -Wno-dev
+   cleanup:
+     - '*'
+   sources:
+     - type: git
+       url: https://github.com/RPCS3/llvm-mirror.git
+       commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60
+     - type: git
+       url: https://github.com/intel/ittapi.git
+       dest: ittapi/ittapi
+       disable-shallow-clone: true
+  
+  - name: rpcs3
+   buildsystem: cmake-ninja
+   builddir: true
+   build-options:
+     append-ld-library-path: /usr/lib/sdk/llvm13/lib
+     append-path: /usr/lib/sdk/llvm13/bin
+     cflags: *optflags
+     cflags-override: true
+     cxxflags: *optflags
+     cxxflags-override: true
+     env:
+       AR: llvm-ar
+       CC: clang
+       CXX: clang++
+       RANLIB: llvm-ranlib
+     ldflags: -fuse-ld=lld
+   config-opts:
+     - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+     - -DBUILD_LLVM_SUBMODULE=OFF
+     - -DUSE_NATIVE_INSTRUCTIONS=OFF
+     - -DUSE_PRECOMPILED_HEADERS=OFF
+     - -DUSE_SYSTEM_CURL=ON
+     - -DUSE_SYSTEM_FFMPEG=ON
+     - -DUSE_SYSTEM_LIBPNG=ON
+     - -DUSE_SYSTEM_ZLIB=ON
+     - -Wno-dev
+   post-install:
+     - |
+       set -eux;
+       sed -i 's|<id>RPCS3</id>|<id>net.rpcs3.RPCS3</id>|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml;
+       COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)";
+       COMM_COUNT="$(git rev-list --count HEAD)";
+       COMM_HASH="$(git rev-parse --short=8 HEAD)";
+       sed -i 's|</component>|<content_rating type="oars-1.1"/><releases><release date="'$(git show -s --format=%cs)'" version="'"${COMM_TAG}"'-'"${COMM_COUNT}"'-'"${COMM_HASH}"'"/></releases></component>|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml;
+   sources:
+     - type: git
+       url: https://github.com/RPCS3/rpcs3.git
+       commit: d6b026314409980734605e9275950f835f04e8df
+  
   # RPCS3 - END
 
   # XEMU - START
@@ -888,63 +886,63 @@ modules:
   # 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: 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
 
   # CITRA - END