Merge remote-tracking branch 'upstream/cooker-0.7.2b' into cooker-0.7.2b-icenine451

2024-11-22 05:55:38 +00:00 · 2023-08-30 10:00:02 -04:00 · 2023-08-30 10:00:02 -04:00 · cc4edc86f2
parent 507ad3a73e af5b12bfd8
commit cc4edc86f2
12 changed files with 272 additions and 160 deletions
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@ -32,7 +32,7 @@ jobs:
    
      - uses: actions/checkout@v3

-      - name: Generate build ID
+      - name: Generate cooker build ID
        run: |
          word1=$(shuf -n 1 ${GITHUB_WORKSPACE}/automation_tools/codename_wordlist.txt)
          capitalized_word1="$(tr '[:lower:]' '[:upper:]' <<< ${word1:0:1})${word1:1}"
@ -40,34 +40,34 @@ jobs:
          capitalized_word2="$(tr '[:lower:]' '[:upper:]' <<< ${word2:0:1})${word2:1}"
          result=$capitalized_word1$capitalized_word2
          echo $result > ${GITHUB_WORKSPACE}/buildid
-          ls -lah ${GITHUB_WORKSPACE}         # DEBUG
-          cat ${GITHUB_WORKSPACE}/buildid     # DEBUG
          echo "buildid=$result" >> $GITHUB_ENV
          echo "VersionID is $result"

-      - name: Initialize environment
+      - name: Initialize Flatpak environment
        run: |
-          git pull
-          git submodule init
-          git submodule update
          sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2
          flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          flatpak install --user -y --noninteractive \
-          org.kde.Sdk//6.3 \
-          org.kde.Platform//6.3 \
-          org.freedesktop.Platform.ffmpeg-full/x86_64/22.08 \
-          io.qt.qtwebengine.BaseApp/x86_64/6.3 \
-          org.freedesktop.Sdk.Extension.llvm13 \
-          org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 \
-          runtime/org.freedesktop.Platform.ffmpeg-full/x86_64/22.08
-          /bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh # Run pre-build automation tasks
+
+      - name: Run pre-build automation tasks
+        run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
+
+      - name: Setting branch in the manifest
+        run: |
+          sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml
+          echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)"

      - name: Build flatpak
        run: |
          git config --global protocol.file.allow always
          mkdir -vp ${GITHUB_WORKSPACE}/local
          mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker
-          flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
+          flatpak-builder --user --force-clean \
+            --install-deps-from=flathub \
+            --install-deps-from=flathub-beta \
+            --repo=${GITHUB_WORKSPACE}/local \
+            --disable-download \
+            ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \
+            net.retrodeck.retrodeck.yml

      - name: Create Artifact for flathub
        run: | 
@ -79,11 +79,22 @@ jobs:

      - name: Create Bundle
        run: |
-          flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
+          flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK-cooker.flatpak net.retrodeck.retrodeck

      - name: Set environment variable with current branch name
        run: echo "GITHUB_REF_SLUG=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV

+      - name: Get commits since last release
+        run: |
+          # Get the latest release tag
+          LATEST_TAG=$(git describe --tags --abbrev=0)
+          # Get all commits since the latest release tag
+          COMMITS=$(git log $LATEST_TAG..HEAD --pretty=format:"- %s")
+          # Set the output variable
+          echo "::set-output name=commits::$COMMITS"
+        id: commits
+        continue-on-error: true
+
      - name: Publish the flatpak in a new cooker release
        uses: ncipollo/release-action@v1
        with:
@ -92,24 +103,25 @@ jobs:
            # Release Notes (Cooker)
            This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.

+            ## Commits since last release
+            ${{ steps.commits.outputs.commits }}
+
            For the full release note for this build please refer to the channel [#BETA-TESTING](https://discord.gg/qQcrFvaA2C) on our Discord server.
      
            Cooker channel is provided for the community to test fixes and explore new functionality.
            Please DO NOT open issues or ask support on this build.

-          artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
+          artifacts: "RetroDECK-cooker.flatpak,RetroDECK-Artifact.tar.gz"
          allowUpdates: true
-          #prerelease: true
          makeLatest: true
-          #draft: true
          token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
          repo: RetroDECK-cooker
        continue-on-error: true

      # In case it cannot publish the release at least it's providing the flatpak file for creating a manual release
-      - name: Upload RetroDECK.flatpak
+      - name: Upload RetroDECK-cooker.flatpak
        uses: actions/upload-artifact@v3
        with:
          name: retrodeck-flatpak
-          path: RetroDECK.flatpak
+          path: RetroDECK-cooker.flatpak
        continue-on-error: true
--- a/.github/workflows/flathub_push_main.yml
+++ b/.github/workflows/flathub_push_main.yml
@ -9,6 +9,7 @@ jobs:
  Pushing_main_into_flathub:
    runs-on: ubuntu-latest
    steps:
+
      - name: Pushing
        shell: bash
        run: |
@ -47,17 +48,35 @@ jobs:
          # Copying only a few files as the others are cloned by git in retrodeck.sh
          cd $gits_folder/RetroDECK
          cp -rf \
-          'flathub.json' \
          'LICENSE' \
-          'flathub.yml' \
          'README.md' \
          $gits_folder/flathub/

          cd $gits_folder/flathub
          ls -lah

-          # manipulating manifest
-          mv flathub.yml net.retrodeck.retrodeck.yml
+          # Creating the manifest for flathub
+          manifest='net.retrodeck.retrodeck.yml'
+          sed -n '/cleanup/q;p' $gits_folder/RetroDECK/net.retrodeck.retrodeck.yml > $manifest
+          sed -i '/^[[:space:]]*#/d' $manifest
+          sed -i 's/[[:space:]]*#.*$//' $manifest
+          cat << EOF >> $manifest
+          modules:
+            - name: retrodeck
+              buildsystem: simple
+              build-commands:
+                - cp -rn files/* /app
+              sources:
+              - type: archive
+                url: https://artifacts.retrodeck.net/artifacts/RetroDECK-Artifact.tar.gz
+                sha256:  __SHA__
+          EOF
+
+          cat << EOF >> flathub.json
+          {
+            "only-arches": ["x86_64"]
+          }
+          EOF

          # Getting latest release name
          # version=$(\
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@ -30,28 +30,23 @@ jobs:
        run: sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
        continue-on-error: true

-      - name: Generate build ID
-        id: generating_buildid
-        run: echo "##[set-output name=build-id;]$(echo "$( git rev-parse --short HEAD )")"
-      
-      - uses: actions/checkout@v3
+      - name: Clone RetroDECK repo
+        uses: actions/checkout@v3
+        with:
+          submodules: 'true'

-      - name: Initialize enviornment
+      - name: Initialize Flatpak environment
        run: |
-          git pull
-          git submodule init
-          git submodule update
          sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2
          flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          flatpak install --user -y --noninteractive \
-          org.kde.Sdk//6.3 \
-          org.kde.Platform//6.3 \
-          org.freedesktop.Platform.ffmpeg-full/x86_64/22.08 \
-          io.qt.qtwebengine.BaseApp/x86_64/6.3 \
-          org.freedesktop.Sdk.Extension.llvm13 \
-          org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 \
-          runtime/org.freedesktop.Platform.ffmpeg-full/x86_64/22.08
-          /bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh # Run pre-build automation tasks
+
+      - name: Run pre-build automation tasks
+        run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
+
+      - name: Set branch in the manifest
+        run: |
+          sed -i "s/branch: THISBRANCH/branch: $(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml
+          echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)"  

      - name: Read manifest content
        id: read_manifest
@ -72,7 +67,13 @@ jobs:
          git config --global protocol.file.allow always
          mkdir -vp ${GITHUB_WORKSPACE}/local
          mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker
-          flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml
+          flatpak-builder --user --force-clean \
+            --install-deps-from=flathub \
+            --install-deps-from=flathub-beta \
+            --repo=${GITHUB_WORKSPACE}/local \
+            --disable-download \
+            ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \
+            net.retrodeck.retrodeck.yml

      - name: Create Artifact for flathub
        run: | 
@ -106,7 +107,6 @@ jobs:
          bodyFile: "body.md"
          artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
          allowUpdates: true
-          #prerelease: true
          makeLatest: true
          token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
          repo: RetroDECK
--- a/.gitignore
+++ b/.gitignore
@ -13,5 +13,5 @@ Thumbs.db
 .flatpak-builder/
 retrodeck-flatpak-cooker/
 retrodeck-flatpak/
-bakcup
-.old
+backup
+.old
--- a/README.md
+++ b/README.md
@ -6,6 +6,8 @@
 ![Flathub](https://img.shields.io/flathub/v/net.retrodeck.retrodeck)
 ![Discord](https://img.shields.io/discord/951662718102962256?label=discord)
 ![GitHub](https://img.shields.io/github/license/XargonWan/RetroDECK)
+[![Documentation Status](https://readthedocs.org/projects/retrodeck/badge/?version=latest)](https://retrodeck.readthedocs.io/en/latest/?badge=latest)
+

 # RetroDECK on your device!

--- a/es-configs/es_find_rules.xml
+++ b/es-configs/es_find_rules.xml
@ -15,16 +15,17 @@
            <entry>RetroArch-Linux-x86_64.AppImage</entry>
        </rule>
        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/org.libretro.RetroArch</entry>
-            <entry>~/.local/share/flatpak/exports/bin/org.libretro.RetroArch</entry>
            <entry>~/Applications/RetroArch-Linux*.AppImage</entry>
+            <entry>~/.local/share/applications/RetroArch-Linux*.AppImage</entry>
            <entry>~/.local/bin/RetroArch-Linux*.AppImage</entry>
            <entry>~/bin/RetroArch-Linux*.AppImage</entry>
+            <entry>/var/lib/flatpak/exports/bin/org.libretro.RetroArch</entry>
+            <entry>~/.local/share/flatpak/exports/bin/org.libretro.RetroArch</entry>
        </rule>
    </emulator>
    <core name="RETROARCH">
        <rule type="corepath">
-	    <!-- FlatPak RetroDECK -->
+	    <!-- Flatpak RetroDECK -->
            <entry>/app/share/libretro/cores</entry>
            <!-- Snap package -->
            <entry>~/snap/retroarch/current/.config/retroarch/cores</entry>
@ -69,11 +70,12 @@
            <entry>net.cebix.basilisk</entry>
        </rule>
        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/net.cebix.basilisk</entry>
-            <entry>~/.local/share/flatpak/exports/bin/net.cebix.basilisk</entry>
            <entry>~/Applications/BasiliskII*.AppImage</entry>
+            <entry>~/.local/share/applications/BasiliskII*.AppImage</entry>
            <entry>~/.local/bin/BasiliskII*.AppImage</entry>
            <entry>~/bin/BasiliskII*.AppImage</entry>
+            <entry>/var/lib/flatpak/exports/bin/net.cebix.basilisk</entry>
+            <entry>~/.local/share/flatpak/exports/bin/net.cebix.basilisk</entry>
        </rule>
    </emulator>
    <emulator name="BLASTEM">
@ -106,9 +108,11 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/Cemu*.AppImage</entry>
+            <entry>~/.local/share/applications/Cemu*.AppImage</entry>
            <entry>~/.local/bin/Cemu*.AppImage</entry>
            <entry>~/bin/Cemu*.AppImage</entry>
            <entry>~/Applications/Cemu/Cemu</entry>
+            <entry>~/.local/share/applications/Cemu/Cemu</entry>
            <entry>~/.local/bin/Cemu/Cemu</entry>
            <entry>~/bin/Cemu/Cemu</entry>
        </rule>
@ -122,6 +126,10 @@
            <entry>org.citra_emu.citra</entry>
        </rule>
        <rule type="staticpath">
+            <entry>~/Applications/citra*.AppImage</entry>
+            <entry>~/.local/share/applications/citra*.AppImage</entry>
+            <entry>~/.local/bin/citra*.AppImage</entry>
+            <entry>~/bin/citra*.AppImage</entry>
            <entry>/var/lib/flatpak/exports/bin/org.citra_emu.citra</entry>
            <entry>~/.local/share/flatpak/exports/bin/org.citra_emu.citra</entry>
        </rule>
@ -133,6 +141,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/cpcemu/cpcemu</entry>
+            <entry>~/.local/share/applications/cpcemu/cpcemu</entry>
            <entry>~/.local/bin/cpcemu/cpcemu</entry>
            <entry>~/bin/cpcemu/cpcemu</entry>
        </rule>
@ -141,6 +150,7 @@
        <!-- Sinclair ZX Spectrum Next emulator #CSpect -->
        <rule type="staticpath">
            <entry>~/Applications/CSpect/CSpect.exe</entry>
+            <entry>~/.local/share/applications/CSpect/CSpect.exe</entry>
            <entry>~/.local/bin/CSpect/CSpect.exe</entry>
            <entry>~/bin/CSpect/CSpect.exe</entry>
        </rule>
@ -163,11 +173,12 @@
            <entry>org.DolphinEmu.dolphin-emu</entry>
        </rule>
        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/org.DolphinEmu.dolphin-emu</entry>
-            <entry>~/.local/share/flatpak/exports/bin/org.DolphinEmu.dolphin-emu</entry>
            <entry>~/Applications/Dolphin_Emulator*.AppImage</entry>
+            <entry>~/.local/share/applications/Dolphin_Emulator*.AppImage</entry>
            <entry>~/.local/bin/Dolphin_Emulator*.AppImage</entry>
            <entry>~/bin/Dolphin_Emulator*.AppImage</entry>
+            <entry>/var/lib/flatpak/exports/bin/org.DolphinEmu.dolphin-emu</entry>
+            <entry>~/.local/share/flatpak/exports/bin/org.DolphinEmu.dolphin-emu</entry>
        </rule>
    </emulator>
    <emulator name="DOSBOX-STAGING">
@ -200,14 +211,16 @@
            <entry>org.duckstation.DuckStation</entry>
        </rule>
        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/org.duckstation.DuckStation</entry>
-            <entry>~/.local/share/flatpak/exports/bin/org.duckstation.DuckStation</entry>
            <entry>~/Applications/duckstation-nogui*.AppImage</entry>
+            <entry>~/.local/share/applications/duckstation-nogui*.AppImage</entry>
            <entry>~/.local/bin/duckstation-nogui*.AppImage</entry>
            <entry>~/bin/duckstation-nogui*.AppImage</entry>
            <entry>~/Applications/duckstation-qt*.AppImage</entry>
+            <entry>~/.local/share/applications/duckstation-qt*.AppImage</entry>
            <entry>~/.local/bin/duckstation-qt*.AppImage</entry>
            <entry>~/bin/duckstation-qt*.AppImage</entry>
+            <entry>/var/lib/flatpak/exports/bin/org.duckstation.DuckStation</entry>
+            <entry>~/.local/share/flatpak/exports/bin/org.duckstation.DuckStation</entry>
        </rule>
    </emulator>
    <emulator name="EASYRPG">
@ -217,6 +230,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/easyrpg/easyrpg-player</entry>
+            <entry>~/.local/share/applications/easyrpg/easyrpg-player</entry>
            <entry>~/.local/bin/easyrpg/easyrpg-player</entry>
            <entry>~/bin/easyrpg/easyrpg-player</entry>
        </rule>
@ -228,6 +242,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/fbneo/fbneo</entry>
+            <entry>~/.local/share/applications/fbneo/fbneo</entry>
            <entry>~/.local/bin/fbneo/fbneo</entry>
            <entry>~/bin/fbneo/fbneo</entry>
        </rule>
@ -239,11 +254,12 @@
            <entry>org.flycast.Flycast</entry>
        </rule>
        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/org.flycast.Flycast</entry>
-            <entry>~/.local/share/flatpak/exports/bin/org.flycast.Flycast</entry>
            <entry>~/Applications/flycast*.AppImage</entry>
+            <entry>~/.local/share/applications/flycast*.AppImage</entry>
            <entry>~/.local/bin/flycast*.AppImage</entry>
            <entry>~/bin/flycast*.AppImage</entry>
+            <entry>/var/lib/flatpak/exports/bin/org.flycast.Flycast</entry>
+            <entry>~/.local/share/flatpak/exports/bin/org.flycast.Flycast</entry>
        </rule>
    </emulator>
    <emulator name="FS-UAE">
@ -275,11 +291,12 @@
            <entry>gargoyle</entry>
        </rule>
        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/io.github.garglk.Gargoyle</entry>
-            <entry>~/.local/share/flatpak/exports/bin/io.github.garglk.Gargoyle</entry>
            <entry>~/Applications/Gargoyle*.AppImage</entry>
+            <entry>~/.local/share/applications/Gargoyle*.AppImage</entry>
            <entry>~/.local/bin/Gargoyle*.AppImage</entry>
            <entry>~/bin/Gargoyle*.AppImage</entry>
+            <entry>/var/lib/flatpak/exports/bin/io.github.garglk.Gargoyle</entry>
+            <entry>~/.local/share/flatpak/exports/bin/io.github.garglk.Gargoyle</entry>
        </rule>
    </emulator>
    <emulator name="GEARBOY">
@ -289,6 +306,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/gearboy/gearboy</entry>
+            <entry>~/.local/share/applications/gearboy/gearboy</entry>
            <entry>~/.local/bin/gearboy/gearboy</entry>
            <entry>~/bin/gearboy/gearboy</entry>
        </rule>
@ -297,6 +315,7 @@
        <!-- Atari 2600 emulator Gopher2600 -->
        <rule type="staticpath">
            <entry>~/Applications/gopher2600/gopher2600_linux_amd64</entry>
+            <entry>~/.local/share/applications/gopher2600/gopher2600_linux_amd64</entry>
            <entry>~/.local/bin/gopher2600/gopher2600_linux_amd64</entry>
            <entry>~/bin/gopher2600/gopher2600_linux_amd64</entry>
        </rule>
@ -318,6 +337,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/hypseus-singe/hypseus.bin</entry>
+            <entry>~/.local/share/applications/hypseus-singe/hypseus.bin</entry>
            <entry>~/.local/bin/hypseus-singe/hypseus.bin</entry>
            <entry>~/bin/hypseus-singe/hypseus.bin</entry>
        </rule>
@ -329,6 +349,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/lightspark/lightspark</entry>
+            <entry>~/.local/share/applications/lightspark/lightspark</entry>
            <entry>~/.local/bin/lightspark/lightspark</entry>
            <entry>~/bin/lightspark/lightspark</entry>
        </rule>
@ -340,6 +361,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/linapple/linapple</entry>
+            <entry>~/.local/share/applications/linapple/linapple</entry>
            <entry>~/.local/bin/linapple/linapple</entry>
            <entry>~/bin/linapple/linapple</entry>
        </rule>
@ -385,11 +407,12 @@
            <entry>io.mgba.mGBA</entry>
        </rule>
        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/io.mgba.mGBA</entry>
-            <entry>~/.local/share/flatpak/exports/bin/io.mgba.mGBA</entry>
            <entry>~/Applications/mGBA*.AppImage</entry>
+            <entry>~/.local/share/applications/mGBA*.AppImage</entry>
            <entry>~/.local/bin/mGBA*.AppImage</entry>
            <entry>~/bin/mGBA*.AppImage</entry>
+            <entry>/var/lib/flatpak/exports/bin/io.mgba.mGBA</entry>
+            <entry>~/.local/share/flatpak/exports/bin/io.mgba.mGBA</entry>
        </rule>
    </emulator>
    <emulator name="MUPEN64PLUS">
@ -430,6 +453,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/oricutron/Oricutron</entry>
+            <entry>~/.local/share/applications/oricutron/Oricutron</entry>
            <entry>~/.local/bin/oricutron/Oricutron</entry>
            <entry>~/bin/oricutron/Oricutron</entry>
        </rule>
@ -463,8 +487,8 @@
            <entry>pico8</entry>
        </rule>
        <rule type="staticpath">
-            <entry>~/retrodeck/bios/pico-8/pico8</entry>
            <entry>~/Applications/pico-8/pico8</entry>
+            <entry>~/.local/share/applications/pico-8/pico8</entry>
            <entry>~/.local/bin/pico-8/pico8</entry>
            <entry>~/bin/pico-8/pico8</entry>
        </rule>
@ -472,11 +496,12 @@
    <emulator name="PLAY!">
        <!-- Sony PlayStation 2 emulator Play! -->
        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/org.purei.Play</entry>
-            <entry>~/.local/share/flatpak/exports/bin/org.purei.Play</entry>
            <entry>~/Applications/Play!*.AppImage</entry>
+            <entry>~/.local/share/applications/Play!*.AppImage</entry>
            <entry>~/.local/bin/Play!*.AppImage</entry>
            <entry>~/bin/Play!*.AppImage</entry>
+            <entry>/var/lib/flatpak/exports/bin/org.purei.Play</entry>
+            <entry>~/.local/share/flatpak/exports/bin/org.purei.Play</entry>
        </rule>
    </emulator>
    <emulator name="PPSSPP">
@ -516,6 +541,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/punes/punes</entry>
+            <entry>~/.local/share/applications/punes/punes</entry>
            <entry>~/.local/bin/punes/punes</entry>
            <entry>~/bin/punes/punes</entry>
        </rule>
@ -527,6 +553,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/redream/redream</entry>
+            <entry>~/.local/share/applications/redream/redream</entry>
            <entry>~/.local/bin/redream/redream</entry>
            <entry>~/bin/redream/redream</entry>
        </rule>
@ -538,11 +565,12 @@
            <entry>com.github.Rosalie241.RMG</entry>
        </rule>
        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/com.github.Rosalie241.RMG</entry>
-            <entry>~/.local/share/flatpak/exports/bin/com.github.Rosalie241.RMG</entry>
            <entry>~/Applications/RMG*.AppImage</entry>
+            <entry>~/.local/share/applications/RMG*.AppImage</entry>
            <entry>~/.local/bin/RMG*.AppImage</entry>
            <entry>~/bin/RMG*.AppImage</entry>
+            <entry>/var/lib/flatpak/exports/bin/com.github.Rosalie241.RMG</entry>
+            <entry>~/.local/share/flatpak/exports/bin/com.github.Rosalie241.RMG</entry>
        </rule>
    </emulator>
    <emulator name="RPCS3">
@ -553,11 +581,12 @@
            <entry>net.rpcs3.RPCS3</entry>
        </rule>
        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/net.rpcs3.RPCS3</entry>
-            <entry>~/.local/share/flatpak/exports/bin/net.rpcs3.RPCS3</entry>
            <entry>~/Applications/rpcs3*.AppImage</entry>
+            <entry>~/.local/share/applications/rpcs3*.AppImage</entry>
            <entry>~/.local/bin/rpcs3*.AppImage</entry>
            <entry>~/bin/rpcs3*.AppImage</entry>
+            <entry>/var/lib/flatpak/exports/bin/net.rpcs3.RPCS3</entry>
+            <entry>~/.local/share/flatpak/exports/bin/net.rpcs3.RPCS3</entry>
        </rule>
    </emulator>
    <emulator name="RUFFLE">
@ -567,6 +596,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/ruffle/ruffle</entry>
+            <entry>~/.local/share/applications/ruffle/ruffle</entry>
            <entry>~/.local/bin/ruffle/ruffle</entry>
            <entry>~/bin/ruffle/ruffle</entry>
        </rule>
@ -582,9 +612,11 @@
            <entry>/var/lib/flatpak/exports/bin/org.ryujinx.Ryujinx</entry>
            <entry>~/.local/share/flatpak/exports/bin/org.ryujinx.Ryujinx</entry>
            <entry>~/Applications/publish/Ryujinx</entry>
+            <entry>~/.local/share/applications/publish/Ryujinx</entry>
            <entry>~/.local/bin/publish/Ryujinx</entry>
            <entry>~/bin/publish/Ryujinx</entry>
            <entry>~/Applications/publish/Ryujinx.Ava</entry>
+            <entry>~/.local/share/applications/publish/Ryujinx.Ava</entry>
            <entry>~/.local/bin/publish/Ryujinx.Ava</entry>
            <entry>~/bin/publish/Ryujinx.Ava</entry>
        </rule>
@ -618,6 +650,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/sdl2trs/sdl2trs</entry>
+            <entry>~/.local/share/applications/sdl2trs/sdl2trs</entry>
            <entry>~/.local/bin/sdl2trs/sdl2trs</entry>
            <entry>~/bin/sdl2trs/sdl2trs</entry>
        </rule>
@ -629,6 +662,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/SheepShaver*.AppImage</entry>
+            <entry>~/.local/share/applications/SheepShaver*.AppImage</entry>
            <entry>~/.local/bin/SheepShaver*.AppImage</entry>
            <entry>~/bin/SheepShaver*.AppImage</entry>
        </rule>
@ -640,6 +674,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/simcoupe/simcoupe</entry>
+            <entry>~/.local/share/applications/simcoupe/simcoupe</entry>
            <entry>~/.local/bin/simcoupe/simcoupe</entry>
            <entry>~/bin/simcoupe/simcoupe</entry>
        </rule>
@ -701,6 +736,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/Supermodel/supermodel</entry>
+            <entry>~/.local/share/applications/Supermodel/supermodel</entry>
            <entry>~/.local/bin/Supermodel/supermodel</entry>
            <entry>~/bin/Supermodel/supermodel</entry>
        </rule>
@ -712,6 +748,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/dolphin-emu-triforce*.AppImage</entry>
+            <entry>~/.local/share/applications/dolphin-emu-triforce*.AppImage</entry>
            <entry>~/.local/bin/dolphin-emu-triforce*.AppImage</entry>
            <entry>~/bin/dolphin-emu-triforce*.AppImage</entry>
        </rule>
@ -720,6 +757,7 @@
        <!-- Fujitsu FM Towns emulator Tsugaru -->
        <rule type="staticpath">
            <entry>~/Applications/tsugaru/Tsugaru_CUI</entry>
+            <entry>~/.local/share/applications/tsugaru/Tsugaru_CUI</entry>
            <entry>~/.local/bin/tsugaru/Tsugaru_CUI</entry>
            <entry>~/bin/tsugaru/Tsugaru_CUI</entry>
        </rule>
@ -761,6 +799,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/Vita3K/Vita3K</entry>
+            <entry>~/.local/share/applications/Vita3K/Vita3K</entry>
            <entry>~/.local/bin/Vita3K/Vita3K</entry>
            <entry>~/bin/Vita3K/Vita3K</entry>
        </rule>
@ -772,11 +811,12 @@
            <entry>app.xemu.xemu</entry>
        </rule>
        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/app.xemu.xemu</entry>
-            <entry>~/.local/share/flatpak/exports/bin/app.xemu.xemu</entry>
            <entry>~/Applications/xemu*.AppImage</entry>
+            <entry>~/.local/share/applications/xemu*.AppImage</entry>
            <entry>~/.local/bin/xemu*.AppImage</entry>
            <entry>~/bin/xemu*.AppImage</entry>
+            <entry>/var/lib/flatpak/exports/bin/app.xemu.xemu</entry>
+            <entry>~/.local/share/flatpak/exports/bin/app.xemu.xemu</entry>
        </rule>
    </emulator>
    <emulator name="XROAR">
@ -786,6 +826,7 @@
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/xroar/xroar</entry>
+            <entry>~/.local/share/applications/xroar/xroar</entry>
            <entry>~/.local/bin/xroar/xroar</entry>
            <entry>~/bin/xroar/xroar</entry>
        </rule>
@ -797,11 +838,24 @@
            <entry>org.yuzu_emu.yuzu</entry>
        </rule>
        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu</entry>
-            <entry>~/.local/share/flatpak/exports/bin/org.yuzu_emu.yuzu</entry>
            <entry>~/Applications/yuzu*.AppImage</entry>
+            <entry>~/.local/share/applications/yuzu*.AppImage</entry>
            <entry>~/.local/bin/yuzu*.AppImage</entry>
            <entry>~/bin/yuzu*.AppImage</entry>
+            <entry>/var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu</entry>
+            <entry>~/.local/share/flatpak/exports/bin/org.yuzu_emu.yuzu</entry>
+        </rule>
+    </emulator>
+    <emulator name="ZESARUX">
+        <!-- Sinclair ZX Spectrum emulator ZEsarUX -->
+        <rule type="systempath">
+            <entry>zesarux</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/ZEsarUX/zesarux</entry>
+            <entry>~/.local/share/applications/ZEsarUX/zesarux</entry>
+            <entry>~/.local/bin/ZEsarUX/zesarux</entry>
+            <entry>~/bin/ZEsarUX/zesarux</entry>
        </rule>
    </emulator>
 </ruleList>
--- a/es-configs/es_settings.xml
+++ b/es-configs/es_settings.xml
@ -25,6 +25,7 @@
 <bool name="MAMENameStripExtraInfo" value="true" />
 <bool name="MediaViewerKeepVideoRunning" value="true" />
 <bool name="MediaViewerScreenshotScanlines" value="true" />
+<bool name="MediaViewerShowTypes" value="false" />
 <bool name="MediaViewerStretchVideos" value="false" />
 <bool name="MediaViewerVideoAudio" value="true" />
 <bool name="MediaViewerVideoBlur" value="false" />
@ -51,6 +52,7 @@
 <bool name="ScrapeCovers" value="true" />
 <bool name="ScrapeFanArt" value="false" />
 <bool name="ScrapeGameNames" value="true" />
+<bool name="ScrapeManuals" value="true" />
 <bool name="ScrapeMarquees" value="true" />
 <bool name="ScrapeMetadata" value="true" />
 <bool name="ScrapePhysicalMedia" value="true" />
@ -73,6 +75,7 @@
 <bool name="ScreensaverControls" value="true" />
 <bool name="ScreensaverSlideshowCustomImages" value="false" />
 <bool name="ScreensaverSlideshowGameInfo" value="true" />
+<bool name="ScreensaverSlideshowOnlyFavorites" value="false" />
 <bool name="ScreensaverSlideshowRecurse" value="false" />
 <bool name="ScreensaverSlideshowScanlines" value="true" />
 <bool name="ScreensaverStretchImages" value="false" />
@ -80,6 +83,7 @@
 <bool name="ScreensaverVideoAudio" value="true" />
 <bool name="ScreensaverVideoBlur" value="false" />
 <bool name="ScreensaverVideoGameInfo" value="true" />
+<bool name="ScreensaverVideoOnlyFavorites" value="false" />
 <bool name="ScreensaverVideoScanlines" value="true" />
 <bool name="ShowHelpPrompts" value="true" />
 <bool name="ShowHiddenFiles" value="true" />
@ -106,9 +110,8 @@
 <int name="SoundVolumeVideos" value="80" />
 <string name="ApplicationUpdaterFrequency" value="never" />
 <string name="ApplicationUpdaterLastCheck" value="20230331T153206" />
-<string name="ApplicationVersion" value="2.0.1" />
 <string name="CollectionCustomGrouping" value="unthemed" />
-<string name="CollectionSystemsAuto" value="" />
+<string name="CollectionSystemsAuto" value="recent" />
 <string name="CollectionSystemsCustom" value="" />
 <string name="DefaultSortOrder" value="filename, ascending" />
 <string name="GamelistViewStyle" value="automatic" />
@ -117,14 +120,20 @@
 <string name="LaunchScreenDuration" value="normal" />
 <string name="LegacyThemeTransitions" value="builtin-instant" />
 <string name="MediaDirectory" value="" />
+<string name="MediaViewerHelpPrompts" value="top" />
+<string name="MenuColorScheme" value="dark" />
 <string name="MenuOpeningEffect" value="scale-up" />
 <string name="MiximageBoxSize" value="medium" />
 <string name="MiximagePhysicalMediaSize" value="medium" />
 <string name="MiximageResolution" value="1280x800" />
+<string name="MiximageScreenshotAspectThreshold" value="high" />
+<string name="MiximageScreenshotBlankAreasColor" value="black" />
+<string name="MiximageScreenshotHorizontalFit" value="crop" />
 <string name="MiximageScreenshotScaling" value="sharp" />
+<string name="MiximageScreenshotVerticalFit" value="contain" />
 <string name="OpenGLVersion" value="" />
 <string name="QuickSystemSelect" value="leftrightshoulders" />
-<string name="ROMDirectory" value="~/ROMs" />
+<string name="ROMDirectory" value="" />
 <string name="RandomEntryButton" value="games" />
 <string name="SaveGamelistsMode" value="always" />
 <string name="Scraper" value="screenscraper" />
@ -135,11 +144,11 @@
 <string name="ScreensaverSlideshowImageDir" value="~/.emulationstation/slideshow/custom_images" />
 <string name="ScreensaverType" value="video" />
 <string name="StartupSystem" value="" />
-<string name="ThemeAspectRatio" value="" />
-<string name="ThemeColorScheme" value="" />
+<string name="ThemeAspectRatio" value="automatic" />
+<string name="ThemeColorScheme" value="art-book-next" />
 <string name="ThemeSet" value="art-book-next-es-de" />
 <string name="ThemeTransitions" value="automatic" />
 <string name="ThemeVariant" value="" />
 <string name="UIMode" value="full" />
 <string name="UIMode_passkey" value="uuddlrlrba" />
-<string name="UserThemeDirectory" value="/home/deck/retrodeck/themes" />
+<string name="UserThemeDirectory" value="" />
--- a/es-configs/es_systems.xml
+++ b/es-configs/es_systems.xml
@ -506,6 +506,18 @@
        <platform>easyrpg</platform>
        <theme>easyrpg</theme>
    </system>
+    <system>
+        <name>emulators</name>
+        <fullname>Emulators</fullname>
+        <path>%ROMPATH%/emulators</path>
+        <extension>.AppImage .desktop .sh</extension>
+        <command label="Suspend ES-DE">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Keep ES-DE running">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="AppImage (Suspend ES-DE)">%EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <command label="AppImage (Keep ES-DE running)">%RUNINBACKGROUND% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <platform>pcwindows</platform>
+        <theme>emulators</theme>
+    </system>
    <system>
        <name>famicom</name>
        <fullname>Nintendo Family Computer</fullname>
@ -582,6 +594,17 @@
        <platform>fmtowns</platform>
        <theme>fmtowns</theme>
    </system>
+-->
+<!--
+    <system>
+        <name>fpinball</name>
+        <fullname>Future Pinball</fullname>
+        <path>%ROMPATH%/fpinball</path>
+        <extension>.fpt .FPT</extension>
+        <command label="Future Pinball (Standalone)">PLACEHOLDER %ROM%</command>
+        <platform>fpinball</platform>
+        <theme>fpinball</theme>
+    </system>
 -->
    <system>
        <name>gameandwatch</name>
@ -614,6 +637,7 @@
        <command label="Genesis Plus GX Wide">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM%</command>
        <command label="Gearsystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM%</command>
        <command label="SMS Plus GX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM%</command>
+<!--	<command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command> -->
 <!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module gg %ROM%</command> -->
        <platform>gamegear</platform>
        <theme>gamegear</theme>
@ -699,6 +723,17 @@
        <platform>genesis</platform>
        <theme>genesis</theme>
    </system>
+<!--
+    <system>
+        <name>gmaster</name>
+        <fullname>Hartung Game Master</fullname>
+        <path>%ROMPATH%/gmaster</path>
+        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gmaster gmaster -cart %ROM%</command>
+        <platform>gmaster</platform>
+        <theme>gmaster</theme>
+    </system>
+-->
    <system>
        <name>gx4000</name>
        <fullname>Amstrad GX4000</fullname>
@ -750,6 +785,17 @@
        <platform>lcdgames, gameandwatch</platform>
        <theme>lcdgames</theme>
    </system>
+<!--
+    <system>
+        <name>lowresnx</name>
+        <fullname>LowRes NX Fantasy Console</fullname>
+        <path>%ROMPATH%/lowresnx</path>
+        <extension>.nx .NX</extension>
+        <command label="LowRes NX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/lowresnx_libretro.so %ROM%</command>
+        <platform>lowresnx</platform>
+        <theme>lowresnx</theme>
+    </system>
+-->
    <system>
        <name>lutro</name>
        <fullname>Lutro Game Engine</fullname>
@ -1242,8 +1288,9 @@
        <name>ports</name>
        <fullname>Ports</fullname>
        <path>%ROMPATH%/ports</path>
-        <extension>.desktop .sh</extension>
-        <command label="Various">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <extension>.AppImage .desktop .sh</extension>
+        <command label="Shortcut or script">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="AppImage">%EMULATOR_OS-SHELL% -c "%ROM%"</command>
        <platform>pc, pcwindows</platform>
        <theme>ports</theme>
    </system>
@ -1269,7 +1316,8 @@
        <platform>ps3</platform>
        <theme>ps3</theme>
    </system>
-    <!-- <system>
+<!--
+    <system>
        <name>ps4</name>
        <fullname>Sony PlayStation 4</fullname>
        <path>%ROMPATH%/ps4</path>
@ -1277,7 +1325,8 @@
        <command>PLACEHOLDER %ROM%</command>
        <platform>ps4</platform>
        <theme>ps4</theme>
-    </system> -->
+    </system>
+ -->
    <system>
        <name>psp</name>
        <fullname>Sony PlayStation Portable</fullname>
@ -1402,6 +1451,17 @@
        <platform>scummvm</platform>
        <theme>scummvm</theme>
    </system>
+<!--
+    <system>
+        <name>scv</name>
+        <fullname>Epoch Super Cassette Vision</fullname>
+        <path>%ROMPATH%/scv</path>
+        <extension>.0 .bin .BIN .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/scv scv -cart %ROM%</command>
+        <platform>scv</platform>
+        <theme>scv</theme>
+    </system>
+-->
    <system>
        <name>sega32x</name>
        <fullname>Sega Mega Drive 32X</fullname>
@ -1733,6 +1793,17 @@
        <platform>virtualboy</platform>
        <theme>virtualboy</theme>
    </system>
+<!--
+    <system>
+        <name>vpinball</name>
+        <fullname>Visual Pinball</fullname>
+        <path>%ROMPATH%/vpinball</path>
+        <extension>.vpt .VPT .vpx .VPX</extension>
+        <command label="Visual Pinball (Standalone)">PLACEHOLDER %ROM%</command>
+        <platform>vpinball</platform>
+        <theme>vpinball</theme>
+    </system>
+-->
 <!--
    <system>
        <name>vsmile</name>
@ -1810,6 +1881,7 @@
        <path>%ROMPATH%/x68000</path>
        <extension>.dim .DIM .img .IMG .d88 .D88 .88d .88D .hdm .HDM .dup .DUP .2hd .2HD .xdf .XDF .hdf .HDF .cmd .CMD .m3u .M3U .7z .7Z .zip .ZIP</extension>
        <command label="PX68k">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.so %ROM%</command>
+	<!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/x68000 x68000 -flop1 %ROM%</command> -->
        <platform>x68000</platform>
        <theme>x68000</theme>
    </system>
@ -1853,6 +1925,18 @@
        <platform>zx81</platform>
        <theme>zx81</theme>
    </system>
+<!--
+    <system>
+        <name>zxnext</name>
+        <fullname>Sinclair ZX Spectrum Next</fullname>
+        <path>%ROMPATH%/zxnext</path>
+        <extension>.nex .NEX .sna .SNA</extension>
+        <command label="#CSpect (Standalone)">%STARTDIR%=%GAMEDIR% MONO_IOMAP=all mono %EMULATOR_CSPECT% -fullscreen -s28 -vsync -60 -analytics -tv -zxnext -mmc=./ %ROM%</command>
+        <command label="ZEsarUX (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_ZESARUX% &ndash;&ndash;machine tbblue &ndash;&ndash;realvideo &ndash;&ndash;enabletimexvideo &ndash;&ndash;tbblue-fast-boot-mode &ndash;&ndash;enable-esxdos-handler &ndash;&ndash;esxdos-root-dir %GAMEDIR% %ROM%</command>
+        <platform>zxnext</platform>
+        <theme>zxnext</theme>
+    </system>
+-->
    <system>
        <name>zxspectrum</name>
        <fullname>Sinclair ZX Spectrum</fullname>
@ -1863,13 +1947,4 @@
        <platform>zxspectrum</platform>
        <theme>zxspectrum</theme>
    </system>
-    <!-- <system>
-        <name>tools</name>
-        <fullname>RetroDECK Tools</fullname>
-        <path>/app/tools</path>
-        <extension>.sh .SH</extension>
-        <command>bash %ROM%</command>
-        <platform>tools</platform>
-        <theme>tools</theme>
-    </system> -->
-</systemList>
+</systemList>
--- a/flathub.json
+++ b/flathub.json
@ -1,3 +0,0 @@
-{
-    "only-arches": ["x86_64"]
-}
--- a/flathub.yml
+++ b/flathub.yml
@ -1,41 +0,0 @@
-app-id: net.retrodeck.retrodeck
-runtime: org.kde.Platform
-runtime-version: 5.15-22.08
-sdk: org.kde.Sdk
-sdk-extensions:
-  - org.freedesktop.Sdk.Extension.llvm14    # Needed for rpcs3
-base: io.qt.qtwebengine.BaseApp             # Needed for Yuzu
-base-version: 5.15-22.08                    # Needed for Yuzu
-command: retrodeck.sh
-
-finish-args:
-  - --socket=fallback-x11
-  - --socket=wayland
-  - --socket=pulseaudio
-  - --share=ipc
-  - --share=network
-  - --device=all
-  - --filesystem=home # Needed to be able to relocate / remove / create symlink at ~/retrodeck
-  - --filesystem=/run/media
-  - --filesystem=/media
-  - --allow=multiarch
-  - --talk-name=org.freedesktop.ScreenSaver
-  - --talk-name=org.freedesktop.PowerManagement.Inhibit
-  - --talk-name=org.freedesktop.login1.Manager
-  - --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
-
-modules:
-  - name: retrodeck
-    buildsystem: simple
-    build-commands:
-      - cp -rn files/* /app
-    sources:
-    - type: archive
-      url: https://artifacts.retrodeck.net/artifacts/RetroDECK-Artifact.tar.gz
-      sha256:  __SHA__
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@ -68,8 +68,6 @@ modules:
  # UPDATE STEPS FOR MAIN:
  # [ ] Update the VERSION variable
  # [ ] Update the appdata.xml with the version number and notes
-  # [ ] change branch into main in version-initialization (first one)
-  # [ ] change branch into main in retrodeck module (last one)
  # [ ] if header (before modules) was edited, edit it even in flathub.yml
  #
  - name: version-initialization
--- a/rd-submodules/es-de/Window.cpp.patch
+++ b/rd-submodules/es-de/Window.cpp.patch
@ -1,22 +1,9 @@
 diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp
--- emulationstation-de/es-core/src/Window.cpp	2023-08-23 13:12:15.625292630 +0200
-+++ emulationstation-de/es-core/src/Window.cpp	2023-08-23 14:04:13.393435463 +0200
-@@ -140,7 +140,7 @@
-     mSplashTextScanning = std::unique_ptr<TextCache>(
-        mDefaultFonts.at(1)->buildTextCache("Searching for games...", 0.0f, 0.0f, 0x777777FF));
-+        mDefaultFonts.at(1)->buildTextCache("Searching for games...", 0.0f, 0.0f, 0xC858E6FF));
-     mSplashTextPopulating = std::unique_ptr<TextCache>(
-        mDefaultFonts.at(1)->buildTextCache("Loading systems...", 0.0f, 0.0f, 0x777777FF));
-+        mDefaultFonts.at(1)->buildTextCache("Loading systems...", 0.0f, 0.0f, 0xC858E6FF));
-     mSplashTextReloading = std::unique_ptr<TextCache>(
-        mDefaultFonts.at(1)->buildTextCache("Reloading...", 0.0f, 0.0f, 0x777777FF));
-+        mDefaultFonts.at(1)->buildTextCache("Reloading...", 0.0f, 0.0f, 0xC858E6FF));
- 
-@@ -165,3 +165,3 @@
-     progressBarRect.barPosY = mSplashTextPositions.y + (progressBarRect.barHeight * 2.0f);
-    progressBarRect.color = 0x777777FF;
+--- emulationstation-de/es-core/src/Window.cpp	2023-08-29 14:14:17.208301836 +0200
+++ emulationstation-de/es-core/src/Window.cpp	2023-08-29 14:12:37.307334069 +0200
+
+@@ -181,3 +181,3 @@
+     progressBarRect.barPosY += borderThickness;
+-    progressBarRect.color = 0x79010FFF;
 +    progressBarRect.color = 0xC858E6FF;
     mProgressBarRectangles.emplace_back(progressBarRect);
-@@ -978 +978,2 @@
- }
-+