From 35474be4fd5b47ad975d6283cd95c8aa60f0ca20 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 17 Mar 2023 14:31:01 +0000
Subject: [PATCH 01/35] TEST: printing version and description in release notes

---
 .github/workflows/TEST_release_info.yml | 57 +++++++++++++++++++++++++
 rd-submodules/retroarch                 |  2 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/TEST_release_info.yml

diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml
new file mode 100644
index 00000000..e3c185dc
--- /dev/null
+++ b/.github/workflows/TEST_release_info.yml
@@ -0,0 +1,57 @@
+name: TEST_release_info
+
+on:
+  push:
+    branches:
+     - main
+    paths:
+      - .github/workflows/TEST_release_info.yml
+  pull_request: 
+    branches:
+     - main
+
+  workflow_dispatch:
+
+
+jobs:
+
+  Building_RetroDECK:
+    runs-on: ubuntu-latest
+    steps:
+
+      - 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: Initialize enviornment
+        run: |
+          git pull
+          git submodule init
+          git submodule update
+          sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet
+
+      - name: Getting version info
+        id: version
+        run: |
+          appdata="https://raw.githubusercontent.com/XargonWan/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml"
+          version=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
+          description="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
+
+      - name: Publish the flatpak in a new release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: "${{ steps.version.version }}"
+          body: |
+            # Release Notes
+
+            "${{ steps.version.description }}"
+
+          #artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
+          allowUpdates: true
+          prerelease: true
+          draft: true
+          token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
+          repo: RetroDECK
+        continue-on-error: true
\ No newline at end of file
diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch
index 0b1cfb79..717b7809 160000
--- a/rd-submodules/retroarch
+++ b/rd-submodules/retroarch
@@ -1 +1 @@
-Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
+Subproject commit 717b78093797270877ec416e58082f1c71d435d8

From ddad3071cc475a48a68f6bca4348171f195ab375 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 17 Mar 2023 14:42:04 +0000
Subject: [PATCH 02/35] TEST: printing version and description in release notes

---
 .github/workflows/TEST_release_info.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml
index e3c185dc..08c37638 100644
--- a/.github/workflows/TEST_release_info.yml
+++ b/.github/workflows/TEST_release_info.yml
@@ -36,17 +36,17 @@ jobs:
         id: version
         run: |
           appdata="https://raw.githubusercontent.com/XargonWan/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml"
-          version=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
-          description="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
+          export REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
+          EXPORT REL_DESC="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
 
       - name: Publish the flatpak in a new release
         uses: ncipollo/release-action@v1
         with:
-          tag: "${{ steps.version.version }}"
+          tag: "${{ steps.version.REL_VER }}"
           body: |
             # Release Notes
 
-            "${{ steps.version.description }}"
+            "${{ steps.version.REL_DESC }}"
 
           #artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
           allowUpdates: true

From 78bab6db86ab8cb33923951ce352f24a66e72719 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 17 Mar 2023 14:42:52 +0000
Subject: [PATCH 03/35] TEST: printing version and description in release notes

---
 .github/workflows/TEST_release_info.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml
index 08c37638..81fe4c80 100644
--- a/.github/workflows/TEST_release_info.yml
+++ b/.github/workflows/TEST_release_info.yml
@@ -37,7 +37,7 @@ jobs:
         run: |
           appdata="https://raw.githubusercontent.com/XargonWan/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml"
           export REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
-          EXPORT REL_DESC="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
+          export REL_DESC="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
 
       - name: Publish the flatpak in a new release
         uses: ncipollo/release-action@v1

From 44976fb53e746dba02eba4ecaa53bf6b39e8b284 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 17 Mar 2023 14:50:47 +0000
Subject: [PATCH 04/35] TEST: printing version and description in release notes

---
 .github/workflows/TEST_release_info.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml
index 81fe4c80..1268202d 100644
--- a/.github/workflows/TEST_release_info.yml
+++ b/.github/workflows/TEST_release_info.yml
@@ -36,22 +36,26 @@ jobs:
         id: version
         run: |
           appdata="https://raw.githubusercontent.com/XargonWan/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml"
-          export REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
-          export REL_DESC="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
+          REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
+          REL_DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
+          echo "REL_VER=$REL_VER" >> $GITHUB_ENV
+          echo "REL_DES=$REL_DES" >> $GITHUB_ENV
 
       - name: Publish the flatpak in a new release
         uses: ncipollo/release-action@v1
+        env:
+          REL_VER: ${{ env.REL_VER }}
+          REL_DES: ${{ env.REL_DES }}
         with:
-          tag: "${{ steps.version.REL_VER }}"
+          tag: "$REL_VER"
           body: |
             # Release Notes
 
-            "${{ steps.version.REL_DESC }}"
+            "$REL_DES"
 
           #artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
           allowUpdates: true
-          prerelease: true
           draft: true
           token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
           repo: RetroDECK
-        continue-on-error: true
\ No newline at end of file
+        #continue-on-error: true
\ No newline at end of file

From 537f64bb0f25ab838da14233d504a21d16418f1e Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 17 Mar 2023 14:58:28 +0000
Subject: [PATCH 05/35] TEST: printing version and description in release notes

---
 .github/workflows/TEST_release_info.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml
index 1268202d..cdfbe26e 100644
--- a/.github/workflows/TEST_release_info.yml
+++ b/.github/workflows/TEST_release_info.yml
@@ -39,7 +39,7 @@ jobs:
           REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
           REL_DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
           echo "REL_VER=$REL_VER" >> $GITHUB_ENV
-          echo "REL_DES=$REL_DES" >> $GITHUB_ENV
+          echo "REL_DES='$REL_DES'" >> $GITHUB_ENV
 
       - name: Publish the flatpak in a new release
         uses: ncipollo/release-action@v1

From 23625d87bab4ab3b4c69386ef98de5017671f95b Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 17 Mar 2023 16:48:55 +0000
Subject: [PATCH 06/35] TEST: printing version and description in release notes

---
 .github/workflows/TEST_release_info.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml
index cdfbe26e..b5c06cb4 100644
--- a/.github/workflows/TEST_release_info.yml
+++ b/.github/workflows/TEST_release_info.yml
@@ -39,7 +39,7 @@ jobs:
           REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
           REL_DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
           echo "REL_VER=$REL_VER" >> $GITHUB_ENV
-          echo "REL_DES='$REL_DES'" >> $GITHUB_ENV
+          echo "REL_DES=\"${REL_DES//\"/\\\"}\"" >> $GITHUB_ENV
 
       - name: Publish the flatpak in a new release
         uses: ncipollo/release-action@v1

From 12c55df32156fb812094118b3f4b6696a2115308 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 17 Mar 2023 16:52:44 +0000
Subject: [PATCH 07/35] TEST: printing version and description in release notes

---
 .github/workflows/TEST_release_info.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml
index b5c06cb4..4e1439a1 100644
--- a/.github/workflows/TEST_release_info.yml
+++ b/.github/workflows/TEST_release_info.yml
@@ -37,9 +37,12 @@ jobs:
         run: |
           appdata="https://raw.githubusercontent.com/XargonWan/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml"
           REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
-          REL_DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
+          DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
           echo "REL_VER=$REL_VER" >> $GITHUB_ENV
-          echo "REL_DES=\"${REL_DES//\"/\\\"}\"" >> $GITHUB_ENV
+          REL_DES=$(echo "$DES" | sed ':a;N;$!ba;s/\n/\\n/g')
+          echo "REL_DES=$REL_DES" >> $GITHUB_ENV
+          
+
 
       - name: Publish the flatpak in a new release
         uses: ncipollo/release-action@v1

From 3f2ad28f5c85b523e86dd974793ab7e25361c97a Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 17 Mar 2023 16:59:08 +0000
Subject: [PATCH 08/35] TEST: printing version and description in release notes

---
 .github/workflows/TEST_release_info.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml
index 4e1439a1..0a84f807 100644
--- a/.github/workflows/TEST_release_info.yml
+++ b/.github/workflows/TEST_release_info.yml
@@ -39,10 +39,9 @@ jobs:
           REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
           DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
           echo "REL_VER=$REL_VER" >> $GITHUB_ENV
-          REL_DES=$(echo "$DES" | sed ':a;N;$!ba;s/\n/\\n/g')
-          echo "REL_DES=$REL_DES" >> $GITHUB_ENV
-          
-
+          #REL_DES=$(echo "$DES" | sed ':a;N;$!ba;s/\n/\\n/g')
+          #echo "REL_DES=$REL_DES" >> $GITHUB_ENV
+          echo "$DES" >> "body.md" 
 
       - name: Publish the flatpak in a new release
         uses: ncipollo/release-action@v1
@@ -51,11 +50,7 @@ jobs:
           REL_DES: ${{ env.REL_DES }}
         with:
           tag: "$REL_VER"
-          body: |
-            # Release Notes
-
-            "$REL_DES"
-
+          bodyFile: "body.md"
           #artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
           allowUpdates: true
           draft: true

From 099075a6e7d677326d28d7699d1aa92a7cd63530 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 17 Mar 2023 17:03:43 +0000
Subject: [PATCH 09/35] TEST: printing version and description in release notes

---
 .github/workflows/TEST_release_info.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml
index 0a84f807..34413ff0 100644
--- a/.github/workflows/TEST_release_info.yml
+++ b/.github/workflows/TEST_release_info.yml
@@ -39,17 +39,15 @@ jobs:
           REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
           DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
           echo "REL_VER=$REL_VER" >> $GITHUB_ENV
-          #REL_DES=$(echo "$DES" | sed ':a;N;$!ba;s/\n/\\n/g')
-          #echo "REL_DES=$REL_DES" >> $GITHUB_ENV
+          echo -e "# Release Notes\n" >> "body.md" 
           echo "$DES" >> "body.md" 
 
       - name: Publish the flatpak in a new release
         uses: ncipollo/release-action@v1
         env:
           REL_VER: ${{ env.REL_VER }}
-          REL_DES: ${{ env.REL_DES }}
         with:
-          tag: "$REL_VER"
+          tag: ${{ env.REL_VER }}
           bodyFile: "body.md"
           #artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
           allowUpdates: true

From 9619d750bd1eb8a09742b7a8001621578a94ff8f Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 17 Mar 2023 17:05:50 +0000
Subject: [PATCH 10/35] TEST: printing version and description in release notes

---
 .github/workflows/TEST_release_info.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml
index 34413ff0..39f5a90c 100644
--- a/.github/workflows/TEST_release_info.yml
+++ b/.github/workflows/TEST_release_info.yml
@@ -48,6 +48,7 @@ jobs:
           REL_VER: ${{ env.REL_VER }}
         with:
           tag: ${{ env.REL_VER }}
+          name: "RetroDECK v${{ env.REL_VER }}"
           bodyFile: "body.md"
           #artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
           allowUpdates: true

From cf8a662f3010450187e6e819c0673feee65986b7 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sat, 18 Mar 2023 17:50:14 +0000
Subject: [PATCH 11/35] Updated pipelines + buildserver migration test

---
 .github/workflows/TEST_release_info.yml |  4 ++--
 .github/workflows/cooker-selfhosted.yml |  2 +-
 .github/workflows/main-selfhosted.yml   | 24 ++++++++++++++++--------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml
index 39f5a90c..24bb221b 100644
--- a/.github/workflows/TEST_release_info.yml
+++ b/.github/workflows/TEST_release_info.yml
@@ -39,8 +39,8 @@ jobs:
           REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
           DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
           echo "REL_VER=$REL_VER" >> $GITHUB_ENV
-          echo -e "# Release Notes\n" >> "body.md" 
-          echo "$DES" >> "body.md" 
+          echo -e "# Release Notes\n" >> "body.md"
+          echo "$DES" >> "body.md"
 
       - name: Publish the flatpak in a new release
         uses: ncipollo/release-action@v1
diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index c6bc850f..02d8d283 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Publish the flatpak in a new cooker release
         uses: ncipollo/release-action@v1
         with:
-          tag: "${{ steps.generating_buildid.outputs.build-id }}"
+          tag: "${GITHUB_REF##*/}-${{ steps.generating_buildid.outputs.build-id }}"
           body: |
             # Release Notes (Cooker)
             This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index 29253348..da3974f5 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -32,7 +32,7 @@ jobs:
           git pull
           git submodule init
           git submodule update
-          sudo apt install -y flatpak flatpak-builder p7zip-full
+          sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet
           flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           flatpak install --user -y --noninteractive \
           org.kde.Sdk//6.3 \
@@ -59,19 +59,27 @@ jobs:
         run: |
           flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
 
+      - name: Getting version info
+        id: version
+        run: |
+          appdata="https://raw.githubusercontent.com/XargonWan/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml"
+          REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1)
+          DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')"
+          echo "REL_VER=$REL_VER" >> $GITHUB_ENV
+          echo -e "# Release Notes\n" >> "body.md"
+          echo "$DES" >> "body.md"
+
       - name: Publish the flatpak in a new release
         uses: ncipollo/release-action@v1
+        env:
+          REL_VER: ${{ env.REL_VER }}
         with:
-          tag: "${{ steps.generating_buildid.outputs.build-id }}"
-          body: |
-            # Release Notes
-
-            ( Write release notes here )
-
+          tag: ${{ env.REL_VER }}
+          name: "RetroDECK v${{ env.REL_VER }}"
+          bodyFile: "body.md"
           artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz"
           allowUpdates: true
           prerelease: true
-          draft: true
           token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
           repo: RetroDECK
         continue-on-error: true

From 9a1a41cacee18be49e33da900394edc641c2b2e9 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sun, 19 Mar 2023 08:53:02 +0000
Subject: [PATCH 12/35] WF: removed mount unstucker, let's see if we need this
 again. [skip ci]

---
 .github/workflows/cooker-selfhosted.yml | 6 +++---
 .github/workflows/main-selfhosted.yml   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 02d8d283..dce82a2a 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -17,9 +17,9 @@ jobs:
     runs-on: self-hosted
     steps:
 
-      - name: Remove stuck mounts
-        run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
-        continue-on-error: true
+      # - name: Remove stuck mounts
+      #   run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
+      #   continue-on-error: true
 
       - name: Generate build ID
         id: generating_buildid
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index da3974f5..7b5c0843 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -17,9 +17,9 @@ jobs:
     runs-on: self-hosted
     steps:
 
-      - name: Remove stuck mounts
-        run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
-        continue-on-error: true
+      # - name: Remove stuck mounts
+      #   run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
+      #   continue-on-error: true
 
       - name: Generate build ID
         id: generating_buildid

From 39977270b40ff02d3cdad90b2a19dd085697e7a2 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sun, 19 Mar 2023 09:56:44 +0000
Subject: [PATCH 13/35] WF: added bzip2 [skip ci]

---
 .github/workflows/cooker-selfhosted.yml | 2 +-
 .github/workflows/main-selfhosted.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index dce82a2a..ae699c6c 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -32,7 +32,7 @@ jobs:
           git pull
           git submodule init
           git submodule update
-          sudo apt install -y flatpak flatpak-builder p7zip-full
+          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 \
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index 7b5c0843..f3b917e1 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -32,7 +32,7 @@ jobs:
           git pull
           git submodule init
           git submodule update
-          sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet
+          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 \

From 61939b1c532816ea7811a0e67703d805ab047cde Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 20 Mar 2023 16:13:07 +0000
Subject: [PATCH 14/35] Pipelines: restored old tag in cooker-seflhosted [skip
 ci]

---
 .github/workflows/cooker-selfhosted.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index ae699c6c..a9590ed7 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Publish the flatpak in a new cooker release
         uses: ncipollo/release-action@v1
         with:
-          tag: "${GITHUB_REF##*/}-${{ steps.generating_buildid.outputs.build-id }}"
+          tag: "${{ steps.generating_buildid.outputs.build-id }}"
           body: |
             # Release Notes (Cooker)
             This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.

From e22d905977dac70d5f666f3798f79153447c86a2 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 20 Mar 2023 16:29:16 +0000
Subject: [PATCH 15/35] [TEST] Pipeline: testing new tag variable [skip ci]

---
 .../workflows/[TEST] cooker-selfhosted.yml    | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 .github/workflows/[TEST] cooker-selfhosted.yml

diff --git a/.github/workflows/[TEST] cooker-selfhosted.yml b/.github/workflows/[TEST] cooker-selfhosted.yml
new file mode 100644
index 00000000..f0c4f57b
--- /dev/null
+++ b/.github/workflows/[TEST] cooker-selfhosted.yml	
@@ -0,0 +1,44 @@
+name: cooker-selfhosted
+
+on:
+  push:
+    branches:
+     - cooker*
+  pull_request: 
+    branches:
+     - cooker*
+
+  workflow_dispatch:
+
+
+jobs:
+
+  Building_RetroDECK:
+    runs-on: ubuntu-latest
+    steps:
+
+      - 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: Set environment variable with current branch name
+        run: echo "GITHUB_REF_SLUG=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
+
+      - name: Publish the flatpak in a new cooker release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: "${{ env.GITHUB_REF_SLUG }}-${{ steps.generating_buildid.outputs.build-id }}"
+          body: |
+            # Release Notes (Cooker)
+            This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
+      
+            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.
+
+          allowUpdates: true
+          draft: true
+          token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
+          repo: RetroDECK-cooker
+        continue-on-error: true

From 448b9628463e7c806e1a56d17911758143f953ec Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 20 Mar 2023 16:30:19 +0000
Subject: [PATCH 16/35] [TEST] Pipeline: testing new tag variable [skip ci]

---
 .github/workflows/[TEST] cooker-selfhosted.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/[TEST] cooker-selfhosted.yml b/.github/workflows/[TEST] cooker-selfhosted.yml
index f0c4f57b..d4e9290c 100644
--- a/.github/workflows/[TEST] cooker-selfhosted.yml	
+++ b/.github/workflows/[TEST] cooker-selfhosted.yml	
@@ -1,4 +1,4 @@
-name: cooker-selfhosted
+name: test-version-tag
 
 on:
   push:

From 063f2a0f3e6c431d96b6b2506eb233874b7b97ec Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 20 Mar 2023 16:33:57 +0000
Subject: [PATCH 17/35] Pipeline: cooker-seflhosted updated version tag [skip
 ci]

---
 .../workflows/[TEST] cooker-selfhosted.yml    | 44 -------------------
 .github/workflows/cooker-selfhosted.yml       |  7 ++-
 2 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/[TEST] cooker-selfhosted.yml

diff --git a/.github/workflows/[TEST] cooker-selfhosted.yml b/.github/workflows/[TEST] cooker-selfhosted.yml
deleted file mode 100644
index d4e9290c..00000000
--- a/.github/workflows/[TEST] cooker-selfhosted.yml	
+++ /dev/null
@@ -1,44 +0,0 @@
-name: test-version-tag
-
-on:
-  push:
-    branches:
-     - cooker*
-  pull_request: 
-    branches:
-     - cooker*
-
-  workflow_dispatch:
-
-
-jobs:
-
-  Building_RetroDECK:
-    runs-on: ubuntu-latest
-    steps:
-
-      - 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: Set environment variable with current branch name
-        run: echo "GITHUB_REF_SLUG=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
-
-      - name: Publish the flatpak in a new cooker release
-        uses: ncipollo/release-action@v1
-        with:
-          tag: "${{ env.GITHUB_REF_SLUG }}-${{ steps.generating_buildid.outputs.build-id }}"
-          body: |
-            # Release Notes (Cooker)
-            This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
-      
-            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.
-
-          allowUpdates: true
-          draft: true
-          token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
-          repo: RetroDECK-cooker
-        continue-on-error: true
diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index a9590ed7..4dc6a128 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -61,10 +61,13 @@ jobs:
         run: |
           flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.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: Publish the flatpak in a new cooker release
         uses: ncipollo/release-action@v1
         with:
-          tag: "${{ steps.generating_buildid.outputs.build-id }}"
+          tag: "${{ env.GITHUB_REF_SLUG }}-${{ steps.generating_buildid.outputs.build-id }}"
           body: |
             # Release Notes (Cooker)
             This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
@@ -86,4 +89,4 @@ jobs:
         with:
           name: retrodeck-flatpak
           path: RetroDECK.flatpak
-        continue-on-error: true
+        continue-on-error: true
\ No newline at end of file

From f3d7d24bd87e49986fae7963acd5fa04daed2c8e Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Tue, 21 Mar 2023 08:53:22 +0000
Subject: [PATCH 18/35] WF: fixed pipelines not uploading artifacts [skip ci]

---
 .github/workflows/cooker-selfhosted.yml | 10 ++++++----
 .github/workflows/main-selfhosted.yml   |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 4dc6a128..32000afe 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -47,14 +47,16 @@ jobs:
       - 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
 
       - name: Create Artifact for flathub
         run: | 
-          tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker .
-          hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz))
-          echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact.sha
-          mv -f RetroDECK-Artifact.* ${{ secrets.ARTIFACT_REPO }}
+          tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker .
+          hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz))
+          echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.sha
+          mv -f RetroDECK-Artifact-cooker.* ${{ secrets.ARTIFACT_REPO }}
         continue-on-error: true
 
       - name: Create Bundle
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index f3b917e1..7c9d2a71 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -44,7 +44,9 @@ jobs:
 
       - name: Build flatpak
         run: |
-          git config --global protocol.allow always
+          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
 
       - name: Create Artifact for flathub

From 210d81ea08a911fe597bfba810d6846815cc218f Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Tue, 21 Mar 2023 14:07:39 +0000
Subject: [PATCH 19/35] WF: restored unstucker [skip ci]

---
 .github/workflows/cooker-selfhosted.yml | 6 +++---
 .github/workflows/main-selfhosted.yml   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 32000afe..0401daab 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -17,9 +17,9 @@ jobs:
     runs-on: self-hosted
     steps:
 
-      # - name: Remove stuck mounts
-      #   run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
-      #   continue-on-error: true
+      - name: Remove stuck mounts
+        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
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index 7c9d2a71..24c0d8d6 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -17,9 +17,9 @@ jobs:
     runs-on: self-hosted
     steps:
 
-      # - name: Remove stuck mounts
-      #   run: sudo umount -f /home/administrator/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/*
-      #   continue-on-error: true
+      - name: Remove stuck mounts
+        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

From 1d273829b758cd5f4125f116480cfd6492b574fe Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 24 Mar 2023 07:53:20 +0000
Subject: [PATCH 20/35] RetroDECK v0.6.3b

---
 net.retrodeck.retrodeck.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 7fd6917c..fa53e0e2 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -78,7 +78,7 @@ modules:
       - |
         git checkout ${GITHUB_REF_NAME}
         mkdir -p ${FLATPAK_DEST}/retrodeck/
-        VERSION="cooker-0.6.3b"
+        VERSION="0.6.3b"
         if [[ $VERSION == *"cooker"* ]];
         then
           VERSION="$VERSION-[$(git rev-parse --short HEAD)]"
@@ -88,7 +88,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.6.3b
+        branch: main
 
   - name: xmlstarlet
     config-opts:
@@ -1095,4 +1095,4 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.6.3b
\ No newline at end of file
+        branch: main
\ No newline at end of file

From 53d3eec689f05f78c65e670a3b71b4ea3354ab21 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 24 Mar 2023 10:54:06 +0000
Subject: [PATCH 21/35] RetroDECK v0.6.3b - FIX for Too many <p> tags for a
 good description [14/10] -.-''

---
 net.retrodeck.retrodeck.appdata.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index 08eea1b1..e379696a 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -69,20 +69,13 @@
       <release version="0.6.3b" date="2023-03-24">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.3b</url>
          <description>
-            <p>New features - General:</p>
             <ul>
                <li>Added support support for multiple file compression via CLI.</li>
-            </ul>
-            <p>RetroDECK Configurator:</p>
-            <ul>
                <li>Added support support for multiple file compression in the Configurator.</li>
                <li>Added safety y/n prompts to the reset functions.</li>
                <li>Fixed some missing layout changes.</li>
                <li>Renamed "Reset All" to "Reset RetroDECK".</li>
                <li>Moved configurator into the RO partition for futher enhancements.</li>
-            </ul>
-            <p>Bug fixes and other changes:</p>
-            <ul>
                <li>Fixed a bug in the compression tool with certain filenames with spaces.</li>
                <li>Fixed a bug where some folders were recursively symlinked.</li>
                <li>Fixed a bug where some emulator configs were not correctly deployed.</li>

From 6bd109dcba49f2cb3824d59f372b76b975e606f5 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 24 Mar 2023 11:00:17 +0000
Subject: [PATCH 22/35] RetroDECK v0.6.3b - FIX for Too many <p> tags for a
 good description [14/10] -.-''

---
 net.retrodeck.retrodeck.appdata.xml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index e379696a..e05d94a0 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -41,9 +41,8 @@
   It's inspired by other embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, Lakka, and Batocera.
   RetroDECK is powered by EmulationStation Desktop Edition, that uses RetroArch and other standalone emulators to allow you to import and play your favorite games in a tidy environment.
   No other software is needed as everything it's already included in one package!</p>
-      <p>BETA NOTICE: RetroDECK is still in Beta and the team is actively developing and adding more features.</p>
-      <p>About the Beta:
-  The primary focus during the beta period is on SteamOS and the Steam Deck but we hope to expand to more devices and general Linux desktop in the future</p>
+      <p>BETA NOTICE: RetroDECK is still in Beta and the team is actively developing and adding more features.
+         The primary focus during the beta period is on SteamOS and the Steam Deck but we hope to expand to more devices and general Linux desktop in the future</p>
       <p>NOTE: It can be run on Linux desktop right now but there will be some manual configurations needed for input, storage location and other tiny hickups.</p>
       <p>
          INSTALLATION INSTRUCTIONS FOR THE STEAM DECK:
@@ -54,14 +53,14 @@
             <li>4. [OPTIONAL] Download Steam Grids graphics for RetroDECK with BoilR</li>
          </ul>
       </p>
-      <p>For more detailed information check our wiki:</p>
-      <p>https://github.com/XargonWan/RetroDECK/wiki</p>
-      <p>If you want to sponsor the project:</p>
-      <p>https://www.patreon.com/RetroDECK</p>
+      <p>For more detailed information check our wiki: 
+      https://github.com/XargonWan/RetroDECK/wiki</p>
+      <p>If you want to sponsor the project: 
+      https://www.patreon.com/RetroDECK</p>
       <p>If you want to join the RetroDECK community check our:</p>
-      <p>Discord: https://discord.gg/Dz3szYsP8g</p>
       <p>Reddit: https://www.reddit.com/r/RetroDECK/</p>
-      <p>If you want to help out with the project join the "i-want-to-help" channel on our Discord.</p>
+      <p>Discord: https://discord.gg/Dz3szYsP8g 
+         (If you want to help out with the project join the "i-want-to-help" channel)</p>
    </description>
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
@@ -69,13 +68,20 @@
       <release version="0.6.3b" date="2023-03-24">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.3b</url>
          <description>
+            <p>New features - General:</p>
             <ul>
                <li>Added support support for multiple file compression via CLI.</li>
+            </ul>
+            <p>RetroDECK Configurator:</p>
+            <ul>
                <li>Added support support for multiple file compression in the Configurator.</li>
                <li>Added safety y/n prompts to the reset functions.</li>
                <li>Fixed some missing layout changes.</li>
                <li>Renamed "Reset All" to "Reset RetroDECK".</li>
                <li>Moved configurator into the RO partition for futher enhancements.</li>
+            </ul>
+            <p>Bug fixes and other changes:</p>
+            <ul>
                <li>Fixed a bug in the compression tool with certain filenames with spaces.</li>
                <li>Fixed a bug where some folders were recursively symlinked.</li>
                <li>Fixed a bug where some emulator configs were not correctly deployed.</li>

From e31b5090badc83e72fefe9361851e3a0662ab6ab Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 24 Mar 2023 11:11:00 +0000
Subject: [PATCH 23/35] [TEST] Appdata validator

---
 .github/workflows/TEST_release_info.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml
index 24bb221b..6fc1545f 100644
--- a/.github/workflows/TEST_release_info.yml
+++ b/.github/workflows/TEST_release_info.yml
@@ -32,6 +32,10 @@ jobs:
           git submodule update
           sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet
 
+      - name: Validating the appdata
+        run: appstream-util validate "net.retrodeck.retrodeck.appdata.xml"
+        continue-on-error: true
+
       - name: Getting version info
         id: version
         run: |

From cc56fee15557a2f1a7b7c081e1b4cad2aa507355 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 24 Mar 2023 11:14:46 +0000
Subject: [PATCH 24/35] [TEST] Appdata validator

---
 .github/workflows/TEST_release_info.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml
index 6fc1545f..ebf21609 100644
--- a/.github/workflows/TEST_release_info.yml
+++ b/.github/workflows/TEST_release_info.yml
@@ -30,7 +30,7 @@ jobs:
           git pull
           git submodule init
           git submodule update
-          sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet
+          sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet appstream-util
 
       - name: Validating the appdata
         run: appstream-util validate "net.retrodeck.retrodeck.appdata.xml"

From b04ad53bcdb78265dc60ff50776feca40bad4083 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 24 Mar 2023 15:14:58 +0000
Subject: [PATCH 25/35] I know you like support, so we put some support in your
 support! [skip ci]

---
 net.retrodeck.retrodeck.appdata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index e05d94a0..7633237c 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -70,11 +70,11 @@
          <description>
             <p>New features - General:</p>
             <ul>
-               <li>Added support support for multiple file compression via CLI.</li>
+               <li>Added support for multiple file compression via CLI.</li>
             </ul>
             <p>RetroDECK Configurator:</p>
             <ul>
-               <li>Added support support for multiple file compression in the Configurator.</li>
+               <li>Added support for multiple file compression in the Configurator.</li>
                <li>Added safety y/n prompts to the reset functions.</li>
                <li>Fixed some missing layout changes.</li>
                <li>Renamed "Reset All" to "Reset RetroDECK".</li>

From fbb76fd865e6e5fb53ef7dfeb733eb50599e0d69 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sat, 25 Mar 2023 17:03:32 +0000
Subject: [PATCH 26/35] ES-DE: Updated 2.0 + themes update + nso theme added

---
 net.retrodeck.retrodeck.appdata.xml | 10 ++++++++
 net.retrodeck.retrodeck.yml         | 36 +++++++++++++++++++----------
 rd-submodules/shared-modules        |  2 +-
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index 7633237c..e2937c13 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -65,6 +65,16 @@
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
    <releases>
+      <release version="0.6.4b" date="2023-03-25">
+         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.4b</url>
+         <description>
+            <p>New features - General:</p>
+            <ul>
+               <li>Updated EmulationStation Desktop Edition to 2.0</li>
+               <li>Removed legacy themes and added themes for ES-DE 2.0</li>
+            </ul>
+         </description>
+      </release>
       <release version="0.6.3b" date="2023-03-24">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.3b</url>
          <description>
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index fa53e0e2..5e532d3c 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -66,11 +66,11 @@ modules:
   # The version number is hardcoded in /app/retrodeck/version
   #
   # UPDATE STEPS FOR MAIN:
-  # [X] Update the VERSION variable
-  # [X] Update the appdata.xml with the version number and notes
-  # [X] change branch into main in version-initialization (first one)
-  # [X] change branch into main in retrodeck module (last one)
-  # [X] if header (before modules) was edited, edit it even in flathub.yml
+  # [ ] 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
     buildsystem: simple
@@ -78,7 +78,7 @@ modules:
       - |
         git checkout ${GITHUB_REF_NAME}
         mkdir -p ${FLATPAK_DEST}/retrodeck/
-        VERSION="0.6.3b"
+        VERSION="cooker-0.6.4b"
         if [[ $VERSION == *"cooker"* ]];
         then
           VERSION="$VERSION-[$(git rev-parse --short HEAD)]"
@@ -88,7 +88,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: main
+        branch: cooker-0.6.4b
 
   - name: xmlstarlet
     config-opts:
@@ -239,13 +239,15 @@ modules:
   # But we don't include them 1:1 as RetroDECK got some specific configs in some cases
   - name: emulationstation-de
     buildsystem: cmake-ninja
+    config-opts:
+      - DRETRODECK=on
     cleanup:
       - es-app
       - es-core
     sources:
       - type: git
         url: https://gitlab.com/es-de/emulationstation-de
-        branch: f8d782f1f3b1fba8a119b793edd01f37e0258953
+        branch: 608d8a3c09abc5db398cdadc09e18fd2dfbaf570
       - type: shell
         commands:
           - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp
@@ -265,7 +267,7 @@ modules:
     sources:
       - type: git
         url:  https://github.com/anthonycaccese/art-book-next-retropie.git
-        commit: 23932f484a9949313baf80f92b2fbca38a7a8f37
+        commit: 5b2e44ab18007e42b581df57bd5d2a82255b9c14
 
   - name: alekfull-nx-light
     buildsystem: simple
@@ -275,7 +277,7 @@ modules:
     sources:
       - type: git
         url:  https://github.com/anthonycaccese/alekfull-nx-retropie.git
-        commit: 67c8c8dee086bd06bcdc6dc34bb9bef1e1c11be7
+        commit: 8d9aa2a992ab31cbe6dc3dc1c155dfb78e7a9732
 
   - name: retrofix-revisited
     buildsystem: simple
@@ -285,7 +287,17 @@ modules:
     sources:
       - type: git
         url:  https://github.com/anthonycaccese/retrofix-revisited-retropie.git
-        commit: 6e75c9521426e69eb9abcb39d135d97a17d14568
+        commit: 07207d20d2b617af336dcf829ae9fb901cc1ce94
+
+  - name: nso-menu-interpreted
+    buildsystem: simple
+    build-commands:
+      - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted/
+      - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted/
+    sources:
+      - type: git
+        url:  https://github.com/anthonycaccese/nso-menu-interpreted-es-de.git
+        commit: f129c2d88e060a6c5d7643de5aeb02a0cc013de3
 
   # ES-DE Themes - END
 
@@ -1095,4 +1107,4 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: main
\ No newline at end of file
+        branch: cooker-0.6.4b
\ No newline at end of file
diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules
index ae5d7192..a2441b96 160000
--- a/rd-submodules/shared-modules
+++ b/rd-submodules/shared-modules
@@ -1 +1 @@
-Subproject commit ae5d7192c6a37f2c754fd92685a72d514931131a
+Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42

From a1b3a2d6ccb0e314a5534698bccdbd5b7d0a8f30 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 31 Mar 2023 08:34:11 +0000
Subject: [PATCH 27/35] ES-DE: updated es_systems and es_findrules

---
 es-configs/es_find_rules.xml | 289 ++++++++++++++++--
 es-configs/es_systems.xml    | 558 +++++++++++++++++++++++++----------
 2 files changed, 661 insertions(+), 186 deletions(-)

diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml
index 78791834..05835dd8 100644
--- a/es-configs/es_find_rules.xml
+++ b/es-configs/es_find_rules.xml
@@ -17,9 +17,9 @@
         <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-x86_64.AppImage</entry>
-            <entry>~/.local/bin/RetroArch-Linux-x86_64.AppImage</entry>
-            <entry>~/bin/RetroArch-Linux-x86_64.AppImage</entry>
+            <entry>~/Applications/RetroArch-Linux*.AppImage</entry>
+            <entry>~/.local/bin/RetroArch-Linux*.AppImage</entry>
+            <entry>~/bin/RetroArch-Linux*.AppImage</entry>
         </rule>
     </emulator>
     <core name="RETROARCH">
@@ -44,6 +44,17 @@
             <entry>/usr/pkg/lib/libretro</entry>
         </rule>
     </core>
+    <emulator name="ARES">
+        <!-- Multi-system emulator ares -->
+        <rule type="systempath">
+            <entry>ares</entry>
+            <entry>dev.ares.ares</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/dev.ares.ares</entry>
+            <entry>~/.local/share/flatpak/exports/bin/dev.ares.ares</entry>
+        </rule>
+    </emulator>
     <emulator name="ATARI800">
         <!-- Atari 8-bit computer emulator Atari800 -->
         <rule type="systempath">
@@ -60,9 +71,9 @@
         <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-x86_64.AppImage</entry>
-            <entry>~/.local/bin/BasiliskII-x86_64.AppImage</entry>
-            <entry>~/bin/BasiliskII-x86_64.AppImage</entry>
+            <entry>~/Applications/BasiliskII*.AppImage</entry>
+            <entry>~/.local/bin/BasiliskII*.AppImage</entry>
+            <entry>~/bin/BasiliskII*.AppImage</entry>
         </rule>
     </emulator>
     <emulator name="BLASTEM">
@@ -89,9 +100,13 @@
     <emulator name="CEMU">
         <!-- Nintendo Wii U emulator Cemu -->
         <rule type="systempath">
+            <entry>cemu</entry>
             <entry>Cemu</entry>
         </rule>
         <rule type="staticpath">
+            <entry>~/Applications/Cemu*.AppImage</entry>
+            <entry>~/.local/bin/Cemu*.AppImage</entry>
+            <entry>~/bin/Cemu*.AppImage</entry>
             <entry>~/Applications/Cemu/Cemu</entry>
             <entry>~/.local/bin/Cemu/Cemu</entry>
             <entry>~/bin/Cemu/Cemu</entry>
@@ -101,6 +116,7 @@
         <!-- Nintendo 3DS emulator Citra -->
         <rule type="systempath">
             <entry>citra-qt</entry>
+	    <entry>citra</entry>
             <entry>citra-emu.citra-nightly</entry>
             <entry>org.citra_emu.citra</entry>
         </rule>
@@ -109,6 +125,17 @@
             <entry>~/.local/share/flatpak/exports/bin/org.citra_emu.citra</entry>
         </rule>
     </emulator>
+    <emulator name="CPCEMU">
+        <!-- Amstrad CPC emulator CPCemu -->
+        <rule type="systempath">
+            <entry>cpcemu</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/cpcemu/cpcemu</entry>
+            <entry>~/.local/bin/cpcemu/cpcemu</entry>
+            <entry>~/bin/cpcemu/cpcemu</entry>
+        </rule>
+    </emulator>
     <emulator name="DESMUME">
         <!-- Nintendo DS emulator DeSmuME -->
         <rule type="systempath">
@@ -166,12 +193,12 @@
         <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-x64.AppImage</entry>
-            <entry>~/.local/bin/duckstation-nogui-x64.AppImage</entry>
-            <entry>~/bin/duckstation-nogui-x64.AppImage</entry>
-            <entry>~/Applications/duckstation-qt-x64.AppImage</entry>
-            <entry>~/.local/bin/duckstation-qt-x64.AppImage</entry>
-            <entry>~/bin/duckstation-qt-x64.AppImage</entry>
+            <entry>~/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/bin/duckstation-qt*.AppImage</entry>
+            <entry>~/bin/duckstation-qt*.AppImage</entry>
         </rule>
     </emulator>
     <emulator name="EASYRPG">
@@ -185,6 +212,17 @@
             <entry>~/bin/easyrpg/easyrpg-player</entry>
         </rule>
     </emulator>
+    <emulator name="FINALBURN-NEO">
+        <!-- Arcade emulator FinalBurn Neo -->
+        <rule type="systempath">
+            <entry>fbneo</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/fbneo/fbneo</entry>
+            <entry>~/.local/bin/fbneo/fbneo</entry>
+            <entry>~/bin/fbneo/fbneo</entry>
+        </rule>
+    </emulator>
     <emulator name="FLYCAST">
         <!-- Sega Dreamcast emulator Flycast -->
         <rule type="systempath">
@@ -194,6 +232,9 @@
         <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/bin/flycast*.AppImage</entry>
+            <entry>~/bin/flycast*.AppImage</entry>
         </rule>
     </emulator>
     <emulator name="FS-UAE">
@@ -208,6 +249,59 @@
             <entry>~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE</entry>
         </rule>
     </emulator>
+    <emulator name="FUSE">
+        <!-- Sinclair ZX Spectrum emulator Fuse -->
+        <rule type="systempath">
+            <entry>fuse</entry>
+            <entry>net.sf.fuse_emulator</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/net.sf.fuse_emulator</entry>
+            <entry>~/.local/share/flatpak/exports/bin/net.sf.fuse_emulator</entry>
+        </rule>
+    </emulator>
+    <emulator name="GARGOYLE">
+        <!-- Interactive fiction player Gargoyle -->
+        <rule type="systempath">
+            <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/bin/Gargoyle*.AppImage</entry>
+            <entry>~/bin/Gargoyle*.AppImage</entry>
+        </rule>
+    </emulator>
+    <emulator name="GEARBOY">
+        <!-- Nintendo Game Boy and Game Boy Color emulator Gearboy -->
+        <rule type="systempath">
+            <entry>gearboy</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/gearboy/gearboy</entry>
+            <entry>~/.local/bin/gearboy/gearboy</entry>
+            <entry>~/bin/gearboy/gearboy</entry>
+        </rule>
+    </emulator>
+    <emulator name="GOPHER2600">
+        <!-- Atari 2600 emulator Gopher2600 -->
+        <rule type="staticpath">
+            <entry>~/Applications/gopher2600/gopher2600_linux_amd64</entry>
+            <entry>~/.local/bin/gopher2600/gopher2600_linux_amd64</entry>
+            <entry>~/bin/gopher2600/gopher2600_linux_amd64</entry>
+        </rule>
+    </emulator>
+    <emulator name="HATARI">
+        <!-- Atari ST/STE/TT/Falcon emulator Hatari -->
+        <rule type="systempath">
+            <entry>hatari</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/org.tuxfamily.hatari</entry>
+            <entry>~/.local/share/flatpak/exports/bin/org.tuxfamily.hatari</entry>
+        </rule>
+    </emulator>
     <emulator name="HYPSEUS-SINGE">
         <!-- Hypseus Singe, fork of arcade LaserDisc emulator Daphne -->
         <rule type="systempath">
@@ -257,6 +351,10 @@
         <rule type="systempath">
             <entry>mednafen</entry>
         </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/com.github.AmatCoder.mednaffe|flatpak run --command=mednafen com.github.AmatCoder.mednaffe</entry>
+            <entry>~/.local/share/flatpak/exports/bin/com.github.AmatCoder.mednaffe|flatpak run --command=mednafen com.github.AmatCoder.mednaffe</entry>
+        </rule>
     </emulator>
     <emulator name="MELONDS">
         <!-- Nintendo DS and DSi emulator melonDS -->
@@ -274,6 +372,7 @@
         <!-- Nintendo Game Boy Advance emulator mGBA -->
         <rule type="systempath">
             <entry>mgba</entry>
+            <entry>mgba-qt</entry>
             <entry>io.mgba.mGBA</entry>
         </rule>
         <rule type="staticpath">
@@ -296,7 +395,7 @@
         </rule>
     </emulator>
     <emulator name="NESTOPIA-UE">
-        <!-- NES/Famicom emulator Nestopia UE -->
+        <!-- Nintendo NES and Famicom emulator Nestopia UE -->
         <rule type="systempath">
             <entry>nestopia</entry>
         </rule>
@@ -305,6 +404,16 @@
             <entry>~/.local/share/flatpak/exports/bin/ca._0ldsk00l.Nestopia</entry>
         </rule>
     </emulator>
+    <emulator name="OPENMSX">
+        <!-- MSX home computer emulator openMSX -->
+        <rule type="systempath">
+            <entry>openmsx</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/org.openmsx.openMSX</entry>
+            <entry>~/.local/share/flatpak/exports/bin/org.openmsx.openMSX</entry>
+        </rule>
+    </emulator>
     <emulator name="ORICUTRON">
         <!-- Tangerine Computer Systems emulator Oricutron -->
         <rule type="systempath">
@@ -327,6 +436,18 @@
             <entry>~/bin/pcsx2*-Qt.AppImage</entry>
         </rule>
     </emulator>
+    <emulator name="PCSX2-LEGACY">
+        <!-- Sony PlayStation 2 emulator PCSX2 (legacy) -->
+        <rule type="systempath">
+            <entry>PCSX2</entry>
+            <entry>pcsx2</entry>
+            <entry>net.pcsx2.PCSX2</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/net.pcsx2.PCSX2</entry>
+            <entry>~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2</entry>
+        </rule>
+    </emulator>
     <emulator name="PICO-8">
         <!-- PICO-8 Fantasy Console (game engine) -->
         <rule type="systempath">
@@ -362,6 +483,12 @@
             <entry>~/.local/share/flatpak/exports/bin/org.ppsspp.PPSSPP</entry>
         </rule>
     </emulator>
+    <emulator name="PRBOOM-PLUS">
+        <!-- Doom engine source port PrBoom+ -->
+        <rule type="systempath">
+            <entry>prboom-plus</entry>
+        </rule>
+    </emulator>
     <emulator name="PRIMEHACK">
         <!-- PrimeHack, fork of Nintendo GameCube and Wii emulator Dolphin -->
         <rule type="systempath">
@@ -373,6 +500,17 @@
             <entry>~/.local/share/flatpak/exports/bin/io.github.shiiion.primehack</entry>
         </rule>
     </emulator>
+    <emulator name="PUNES">
+        <!-- Nintendo NES and Famicom emulator puNES -->
+        <rule type="systempath">
+            <entry>punes</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/punes/punes</entry>
+            <entry>~/.local/bin/punes/punes</entry>
+            <entry>~/bin/punes/punes</entry>
+        </rule>
+    </emulator>
     <emulator name="REDREAM">
         <!-- Sega Dreamcast emulator Redream -->
         <rule type="systempath">
@@ -384,6 +522,20 @@
             <entry>~/bin/redream/redream</entry>
         </rule>
     </emulator>
+    <emulator name="ROSALIES-MUPEN-GUI">
+        <!-- Nintendo 64 emulator Rosalie's Mupen GUI -->
+        <rule type="systempath">
+            <entry>RMG</entry>
+            <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/bin/RMG*.AppImage</entry>
+            <entry>~/bin/RMG*.AppImage</entry>
+        </rule>
+    </emulator>
     <emulator name="RPCS3">
         <!-- Sony PlayStation 3 emulator RPCS3 -->
         <rule type="systempath">
@@ -399,16 +551,6 @@
             <entry>~/bin/rpcs3*.AppImage</entry>
         </rule>
     </emulator>
-    <emulator name="SNES9X">
-        <!-- Super Nintendo emulator Snes9x -->
-        <rule type="systempath">
-            <entry>snes9x</entry>
-        </rule>
-        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/com.snes9x.Snes9x</entry>
-            <entry>~/.local/share/flatpak/exports/bin/com.snes9x.Snes9x</entry>
-        </rule>
-    </emulator>
     <emulator name="RUFFLE">
         <!-- Adobe Flash player Ruffle -->
         <rule type="systempath">
@@ -424,6 +566,7 @@
         <!-- Nintendo Switch emulator Ryujinx -->
         <rule type="systempath">
             <entry>Ryujinx</entry>
+            <entry>Ryujinx.Ava</entry>
             <entry>org.ryujinx.Ryujinx</entry>
         </rule>
         <rule type="staticpath">
@@ -432,6 +575,20 @@
             <entry>~/Applications/publish/Ryujinx</entry>
             <entry>~/.local/bin/publish/Ryujinx</entry>
             <entry>~/bin/publish/Ryujinx</entry>
+            <entry>~/Applications/publish/Ryujinx.Ava</entry>
+            <entry>~/.local/bin/publish/Ryujinx.Ava</entry>
+            <entry>~/bin/publish/Ryujinx.Ava</entry>
+        </rule>
+    </emulator>
+    <emulator name="SAMEBOY">
+        <!-- Nintendo Game Boy and Game Boy Color emulator SameBoy -->
+        <rule type="systempath">
+            <entry>sameboy</entry>
+            <entry>io.github.sameboy.SameBoy</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/io.github.sameboy.SameBoy</entry>
+            <entry>~/.local/share/flatpak/exports/bin/io.github.sameboy.SameBoy</entry>
         </rule>
     </emulator>
     <emulator name="SCUMMVM">
@@ -457,14 +614,14 @@
         </rule>
     </emulator>
     <emulator name="SHEEPSHAVER">
-        <!-- Macintosh PowerPC emulator SheepShaver -->
+        <!-- Apple Macintosh PowerPC emulator SheepShaver -->
         <rule type="systempath">
             <entry>SheepShaver</entry>
         </rule>
         <rule type="staticpath">
-            <entry>~/Applications/SheepShaver-x86_64.AppImage</entry>
-            <entry>~/.local/bin/SheepShaver-x86_64.AppImage</entry>
-            <entry>~/bin/SheepShaver-x86_64.AppImage</entry>
+            <entry>~/Applications/SheepShaver*.AppImage</entry>
+            <entry>~/.local/bin/SheepShaver*.AppImage</entry>
+            <entry>~/bin/SheepShaver*.AppImage</entry>
         </rule>
     </emulator>
     <emulator name="SIMCOUPE">
@@ -478,10 +635,22 @@
             <entry>~/bin/simcoupe/simcoupe</entry>
         </rule>
     </emulator>
+    <emulator name="SIMPLE64">
+        <!-- Nintendo 64 emulator simple64 -->
+        <rule type="systempath">
+            <entry>simple64-gui</entry>
+            <entry>io.github.simple64.simple64</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/io.github.simple64.simple64</entry>
+            <entry>~/.local/share/flatpak/exports/bin/io.github.simple64.simple64</entry>
+        </rule>
+    </emulator>
     <emulator name="SNES9X">
         <!-- Super Nintendo emulator Snes9x -->
         <rule type="systempath">
             <entry>snes9x</entry>
+            <entry>snes9x-gtk</entry>
         </rule>
         <rule type="staticpath">
             <entry>/var/lib/flatpak/exports/bin/com.snes9x.Snes9x</entry>
@@ -494,6 +663,10 @@
             <entry>solarus-run</entry>
             <entry>solarus.run</entry>
         </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/org.solarus_games.solarus.Launcher|flatpak run --command=solarus-run org.solarus_games.solarus.Launcher</entry>
+            <entry>~/.local/share/flatpak/exports/bin/org.solarus_games.solarus.Launcher|flatpak run --command=solarus-run org.solarus_games.solarus.Launcher</entry>
+        </rule>
     </emulator>
     <emulator name="STEAM">
         <!-- Valve Steam -->
@@ -501,6 +674,39 @@
             <entry>steam</entry>
         </rule>
     </emulator>
+    <emulator name="STELLA">
+        <!-- Atari 2600 emulator Stella -->
+        <rule type="systempath">
+            <entry>stella</entry>
+            <entry>io.github.stella_emu.Stella</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/io.github.stella_emu.Stella</entry>
+            <entry>~/.local/share/flatpak/exports/bin/io.github.stella_emu.Stella</entry>
+        </rule>
+    </emulator>
+    <emulator name="SUPERMODEL">
+        <!-- Sega Model 3 emulator Supermodel -->
+        <rule type="systempath">
+            <entry>supermodel</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/Supermodel/supermodel</entry>
+            <entry>~/.local/bin/Supermodel/supermodel</entry>
+            <entry>~/bin/Supermodel/supermodel</entry>
+        </rule>
+    </emulator>
+    <emulator name="TRIFORCE">
+        <!-- Triforce, fork of Nintendo GameCube and Wii emulator Dolphin -->
+        <rule type="systempath">
+            <entry>dolphin-emu-triforce</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/dolphin-emu-triforce*.AppImage</entry>
+            <entry>~/.local/bin/dolphin-emu-triforce*.AppImage</entry>
+            <entry>~/bin/dolphin-emu-triforce*.AppImage</entry>
+        </rule>
+    </emulator>
     <emulator name="TSUGARU">
         <!-- Fujitsu FM Towns emulator Tsugaru -->
         <rule type="staticpath">
@@ -515,6 +721,29 @@
             <entry>visualboyadvance-m</entry>
         </rule>
     </emulator>
+    <emulator name="VICE-X64SC">
+        <!-- Commodore 8-bit computer emulator VICE (x64sc accurate) -->
+        <rule type="systempath">
+            <entry>x64sc</entry>
+            <entry>vice-jz.x64sc</entry>
+            <entry>net.sf.VICE</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/net.sf.VICE</entry>
+            <entry>~/.local/share/flatpak/exports/bin/net.sf.VICE</entry>
+        </rule>
+    </emulator>
+    <emulator name="VICE-XVIC">
+        <!-- Commodore 8-bit computer emulator VICE (xvic VIC-20) -->
+        <rule type="systempath">
+            <entry>xvic</entry>
+            <entry>vice-jz.xvic</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xvic net.sf.VICE</entry>
+            <entry>~/.local/share/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xvic net.sf.VICE</entry>
+        </rule>
+    </emulator>
     <emulator name="VITA3K">
         <!-- Sony PlayStation Vita emulator Vita3K -->
         <rule type="systempath">
@@ -536,9 +765,9 @@
         <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/bin/Xemu*.AppImage</entry>
-            <entry>~/bin/Xemu*.AppImage</entry>
+            <entry>~/Applications/xemu*.AppImage</entry>
+            <entry>~/.local/bin/xemu*.AppImage</entry>
+            <entry>~/bin/xemu*.AppImage</entry>
         </rule>
     </emulator>
     <emulator name="XROAR">
diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml
index 84a91903..933f093f 100644
--- a/es-configs/es_systems.xml
+++ b/es-configs/es_systems.xml
@@ -3,31 +3,20 @@
 <systemList>
     <system>
         <name>3do</name>
-        <fullname>3DO</fullname>
+        <fullname>3DO Interactive Multiplayer</fullname>
         <path>%ROMPATH%/3do</path>
-        <extension>.iso .ISO .bin .BIN .chd .CHD .cue .CUE</extension>
+        <extension>.bin .BIN .chd .CHD .cue .CUE .iso .ISO</extension>
         <command label="Opera">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/opera_libretro.so %ROM%</command>
         <platform>3do</platform>
         <theme>3do</theme>
     </system>
-    <system>
-        <name>64dd</name>
-        <fullname>Nintendo 64DD</fullname>
-        <path>%ROMPATH%/64dd</path>
-        <extension>.n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP</extension>
-        <command label="Mupen64Plus-Next">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM%</command>
-        <command label="Mupen64Plus (Standalone)">%EMULATOR_MUPEN64PLUS% --nogui %ROM%</command>
-        <command label="ParaLLEl N64">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.so %ROM%</command>
-        <platform>n64</platform>
-        <theme>64dd</theme>
-    </system>
 <!--
     <system>
         <name>ags</name>
         <fullname>Adventure Game Studio Game Engine</fullname>
         <path>%ROMPATH%/ags</path>
         <extension>.desktop</extension>
-        <command>%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Native binary">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>ags</platform>
         <theme>ags</theme>
     </system>
@@ -79,6 +68,7 @@
         <extension>.cdt .CDT .cpr .CPR .dsk .DSK .kcr .KCR .m3u .M3U .sna .SNA .tap .TAR .voc .VOC .7z .7Z .zip .ZIP</extension>
         <command label="Caprice32">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/cap32_libretro.so %ROM%</command>
         <command label="CrocoDS">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/crocods_libretro.so %ROM%</command>
+        <command label="CPCemu (Standalone)">%STARTDIR%=~/.CPCemu %EMULATOR_CPCEMU% %ROM%</command>
         <platform>amstradcpc</platform>
         <theme>amstradcpc</theme>
     </system>
@@ -97,9 +87,9 @@
         <fullname>Apple II</fullname>
         <path>%ROMPATH%/apple2</path>
         <extension>.do .DO .dsk .DSK .nib .NIB .po .PO</extension>
-        <command label="LinApple (Standalone)">%EMULATOR_LINAPPLE% -f -b &#45;&#45;d1 %ROM%</command> TJIS WAS DOULBE - BUT IT'S NOT ALLOWED IN THE COMMENTS
+        <command label="LinApple (Standalone)">%EMULATOR_LINAPPLE% -f -b &ndash;&ndash;d1 %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module apple2 %ROM%</command>
-        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/apple2 apple2e -flop1 %ROM%</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/apple2 apple2e -flop1 %ROM%</command>
         <platform>apple2</platform>
         <theme>apple2</theme>
     </system>
@@ -109,7 +99,7 @@
         <fullname>Apple IIGS</fullname>
         <path>%ROMPATH%/apple2gs</path>
         <extension>.2mg .2MG</extension>
-        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/apple2gs apple2gs -flop3 %ROM%</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/apple2gs apple2gs -flop3 %ROM%</command>
         <platform>apple2gs</platform>
         <theme>apple2gs</theme>
     </system>
@@ -117,27 +107,51 @@
         <name>arcade</name>
         <fullname>Arcade</fullname>
         <path>%ROMPATH%/arcade</path>
-        <extension>.cmd .CMD .7z .7Z .zip .ZIP</extension>
+        <extension>.cmd .CMD .desktop .sh .7z .7Z .zip .ZIP</extension>
         <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
         <command label="MAME 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM%</command>
         <command label="MAME 2003-Plus">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM%</command>
         <command label="MAME 2000">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM%</command>
-<!--        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/arcade %BASENAME%</command> -->
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/arcade %BASENAME%</command>
         <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% -fullscreen %BASENAME%</command>
         <command label="FB Alpha 2012">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM%</command>
         <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
-<!--        <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command> -->
+        <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command>
         <command label="Kronos">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM%</command>
+        <command label="Supermodel (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -force-feedback %INJECT%=%BASENAME%.commands %ROM%</command>
+        <command label="Supermodel [Fullscreen] (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -fullscreen -force-feedback %INJECT%=%BASENAME%.commands %ROM%</command>
+        <command label="Shortcut or script">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>arcade</platform>
         <theme>arcade</theme>
     </system>
+<!--
+    <system>
+        <name>arcadia</name>
+        <fullname>Emerson Arcadia 2001</fullname>
+        <path>%ROMPATH%/arcadia</path>
+        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/arcadia arcadia -cart %ROM%</command>
+        <platform>arcadia</platform>
+        <theme>arcadia</theme>
+    </system>
+-->
+    <system>
+        <name>arduboy</name>
+        <fullname>Arduboy Miniature Game System</fullname>
+        <path>%ROMPATH%/arduboy</path>
+        <extension>.hex .HEX .7z .7Z .zip .ZIP</extension>
+        <command label="Arduous">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/arduous_libretro.so %ROM%</command>
+        <platform>arduboy</platform>
+        <theme>arduboy</theme>
+    </system>
     <system>
         <name>astrocde</name>
         <fullname>Bally Astrocade</fullname>
         <path>%ROMPATH%/astrocde</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
-        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/astrocde astrocde -cart %BASENAME%</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/astrocde astrocde -cart %BASENAME%</command>
         <platform>astrocde</platform>
         <theme>astrocade</theme>
     </system>
@@ -148,6 +162,9 @@
         <extension>.a26 .A26 .bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="Stella">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella_libretro.so %ROM%</command>
         <command label="Stella 2014">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella2014_libretro.so %ROM%</command>
+        <!-- <command label="Stella (Standalone)">%EMULATOR_STELLA% %ROM%</command> -->
+        <!-- <command label="Gopher2600 (Standalone)">%EMULATOR_GOPHER2600% %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Atari 2600" %ROM%</command> -->
         <platform>atari2600</platform>
         <theme>atari2600</theme>
     </system>
@@ -155,7 +172,7 @@
         <name>atari5200</name>
         <fullname>Atari 5200</fullname>
         <path>%ROMPATH%/atari5200</path>
-        <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP</extension>
+        <extension>.a52 .A52 .atr .ATR .atx .ATX .bin .BIN .car .CAR .cas .CAS .cdm .CDM .rom .ROM .xex .XEX .xfd .XFD .7z .7Z .zip .ZIP</extension>
         <command label="a5200">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/a5200_libretro.so %ROM%</command>
         <command label="Atari800">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%</command>
 <!--        <command label="Atari800 (Standalone)">%EMULATOR_ATARI800% %ROM%</command> -->
@@ -167,7 +184,7 @@
         <fullname>Atari 7800 ProSystem</fullname>
         <path>%ROMPATH%/atari7800</path>
         <extension>.a78 .A78 .bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM%</command>
+        <command label="ProSystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM%</command>
         <platform>atari7800</platform>
         <theme>atari7800</theme>
     </system>
@@ -175,7 +192,7 @@
         <name>atari800</name>
         <fullname>Atari 800</fullname>
         <path>%ROMPATH%/atari800</path>
-        <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .rom .ROM .7z .7Z .zip .ZIP</extension>
+        <extension>.a52 .A52 .atr .ATR .atx .ATX .bin .BIN .car .CAR .cas .CAS .cdm .CDM .rom .ROM .xex .XEX .xfd .XFD .7z .7Z .zip .ZIP</extension>
         <command label="Atari800">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%</command>
         <command label="Atari800 (Standalone)">%EMULATOR_ATARI800% %ROM%</command>
         <platform>atari800</platform>
@@ -185,8 +202,9 @@
         <name>atarijaguar</name>
         <fullname>Atari Jaguar</fullname>
         <path>%ROMPATH%/atarijaguar</path>
-        <extension>.j64 .J64 .jag .JAG .rom .ROM .abs .ABS .cof .COF .bin .BIN .prg .PRG .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.so %ROM%</command>
+        <extension>.abs .ABS .bin .BIN .cdi .CDI .cof .COF .cue .CUE .j64 .J64 .jag .JAG .prg .PRG .rom .ROM .7z .7Z .zip .ZIP</extension>
+        <command label="Virtual Jaguar">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.so %ROM%</command>
+        <!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/atarijaguar jaguar -cart %ROM%</command> -->
         <platform>atarijaguar, atarijaguarcd</platform>
         <theme>atarijaguar</theme>
     </system>
@@ -215,7 +233,8 @@
         <fullname>Atari ST</fullname>
         <path>%ROMPATH%/atarist</path>
         <extension>.st .ST .msa .MSA .stx .STX .dim .DIM .ipf .IPF .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/hatari_libretro.so %ROM%</command>
+        <command label="Hatari">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/hatari_libretro.so %ROM%</command>
+        <!-- <command label="Hatari (Standalone)">%EMULATOR_HATARI% %ROM%</command> -->
         <platform>atarist</platform>
         <theme>atarist</theme>
     </system>
@@ -223,7 +242,7 @@
         <name>atarixe</name>
         <fullname>Atari XE</fullname>
         <path>%ROMPATH%/atarixe</path>
-        <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP</extension>
+        <extension>.a52 .A52 .atr .ATR .atx .ATX .bin .BIN .cas .CAS .cdm .CDM .xex .XEX .xfd .XFD .7z .7Z .zip .ZIP</extension>
         <command label="Atari800">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%</command>
         <command label="Atari800 (Standalone)">%EMULATOR_ATARI800% %ROM%</command>
         <platform>atarixe</platform>
@@ -231,29 +250,32 @@
     </system>
     <system>
         <name>atomiswave</name>
-        <fullname>Atomiswave</fullname>
+        <fullname>Sammy Corporation Atomiswave</fullname>
         <path>%ROMPATH%/atomiswave</path>
-        <extension>.cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
+        <extension>.bin .BIN .cdi .CDI .cue .CUE .dat .DAT .elf .ELF .gdi .GDI .iso .ISO .lst .LST .m3u .M3U .7z .7Z .zip .ZIP</extension>
         <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
         <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command>
         <platform>arcade</platform>
         <theme>atomiswave</theme>
     </system>
+<!--
     <system>
         <name>bbcmicro</name>
-        <fullname>BBC Micro</fullname>
+        <fullname>Acorn Computers BBC Micro</fullname>
         <path>%ROMPATH%/bbcmicro</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.dsd .DSD .img .IMG .ssd .SSD .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/bbcmicro bbcb -autoboot_delay "2" -autoboot_command "*cat\n\n*exec !boot\n" -flop1 %ROM%</command>
         <platform>bbcmicro</platform>
         <theme>bbcmicro</theme>
     </system>
+-->
     <system>
         <name>c64</name>
         <fullname>Commodore 64</fullname>
         <path>%ROMPATH%/c64</path>
         <extension>.bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP</extension>
         <command label="VICE x64sc Accurate">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64sc_libretro.so %ROM%</command>
+        <!-- <command label="VICE x64sc Accurate (Standalone)">%EMULATOR_VICE-X64SC% %ROM%</command> -->
         <command label="VICE x64 Fast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64_libretro.so %ROM%</command>
         <command label="VICE x64 SuperCPU">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xscpu64_libretro.so %ROM%</command>
         <command label="VICE x128">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x128_libretro.so %ROM%</command>
@@ -266,7 +288,7 @@
         <fullname>Cave Story (NXEngine)</fullname>
         <path>%ROMPATH%/cavestory</path>
         <extension>.exe .EXE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.so %ROM%</command>
+        <command label="NXEngine">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.so %ROM%</command>
         <platform>cavestory</platform>
         <theme>cavestory</theme>
     </system>
@@ -295,7 +317,7 @@
         <fullname>ChaiLove Game Engine</fullname>
         <path>%ROMPATH%/chailove</path>
         <extension>.chai .CHAI .chailove .CHAILOVE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/chailove_libretro.so %ROM%</command>
+        <command label="ChaiLove">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/chailove_libretro.so %ROM%</command>
         <platform>love</platform>
         <theme>chailove</theme>
     </system>
@@ -304,7 +326,7 @@
         <fullname>Fairchild Channel F</fullname>
         <path>%ROMPATH%/channelf</path>
         <extension>.bin .BIN .chf .CHF .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.so %ROM%</command>
+        <command label="FreeChaF">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.so %ROM%</command>
         <platform>channelf</platform>
         <theme>channelf</theme>
     </system>
@@ -322,11 +344,13 @@
 -->
     <system>
         <name>colecovision</name>
-        <fullname>ColecoVision</fullname>
+        <fullname>Coleco ColecoVision</fullname>
         <path>%ROMPATH%/colecovision</path>
         <extension>.bin .BIN .cas .CAS .col .COL .cv .CV .dsk .DSK .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ri .RI .rom .ROM .sc .SC .sg .SG .7z .7Z .zip .ZIP</extension>
         <command label="blueMSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
         <command label="Gearcoleco">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearcoleco_libretro.so %ROM%</command>
+        <!-- <command label="openMSX (Standalone)">%EMULATOR_OPENMSX% -machine ColecoVision_SGM %INJECT%=%BASENAME%.commands -cart %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "ColecoVision" %ROM%</command> -->
         <platform>colecovision</platform>
         <theme>colecovision</theme>
     </system>
@@ -339,8 +363,9 @@
         <command label="MAME 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM%</command>
         <command label="MAME 2003-Plus">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM%</command>
         <command label="MAME 2000">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM%</command>
-        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/arcade %BASENAME%</command>
+        <!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/cps %BASENAME%</command> -->
         <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <!-- <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% -fullscreen %BASENAME%</command> -->
         <command label="FB Alpha 2012">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM%</command>
         <command label="FB Alpha 2012 CPS-1">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps1_libretro.so %ROM%</command>
         <command label="FB Alpha 2012 CPS-2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps2_libretro.so %ROM%</command>
@@ -348,6 +373,68 @@
         <platform>arcade</platform>
         <theme>cps</theme>
     </system>
+    <system>
+        <name>cps1</name>
+        <fullname>Capcom Play System I</fullname>
+        <path>%ROMPATH%/cps1</path>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
+        <command label="MAME 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM%</command>
+        <command label="MAME 2003-Plus">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM%</command>
+        <command label="MAME 2000">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM%</command>
+        <!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/cps1 %BASENAME%</command> -->
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <!-- <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% -fullscreen %BASENAME%</command> -->
+        <command label="FB Alpha 2012">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM%</command>
+        <command label="FB Alpha 2012 CPS-1">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps1_libretro.so %ROM%</command>
+        <platform>arcade</platform>
+        <theme>cps1</theme>
+    </system>
+    <system>
+        <name>cps2</name>
+        <fullname>Capcom Play System II</fullname>
+        <path>%ROMPATH%/cps2</path>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
+        <command label="MAME 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM%</command>
+        <command label="MAME 2003-Plus">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM%</command>
+        <command label="MAME 2000">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM%</command>
+        <!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/cps2 %BASENAME%</command> -->
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <!-- <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% -fullscreen %BASENAME%</command> -->
+        <command label="FB Alpha 2012">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM%</command>
+        <command label="FB Alpha 2012 CPS-2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps2_libretro.so %ROM%</command>
+        <platform>arcade</platform>
+        <theme>cps2</theme>
+    </system>
+    <system>
+        <name>cps3</name>
+        <fullname>Capcom Play System III</fullname>
+        <path>%ROMPATH%/cps3</path>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
+        <command label="MAME 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM%</command>
+        <command label="MAME 2003-Plus">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM%</command>
+        <command label="MAME 2000">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM%</command>
+        <!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/cps3 %BASENAME%</command> -->
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <!-- <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% -fullscreen %BASENAME%</command> -->
+        <command label="FB Alpha 2012">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM%</command>
+        <command label="FB Alpha 2012 CPS-3">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps3_libretro.so %ROM%</command>
+        <platform>arcade</platform>
+        <theme>cps3</theme>
+    </system>
+<!--
+    <system>
+        <name>crvision</name>
+        <fullname>VTech CreatiVision</fullname>
+        <path>%ROMPATH%/crvision</path>
+        <extension>.bin .BIN .rom .ROM .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/crvision crvision -cart %ROM%</command>
+        <platform>crvision</platform>
+        <theme>crvision</theme>
+    </system>
+-->
     <system>
         <name>daphne</name>
         <fullname>Daphne Arcade LaserDisc Emulator</fullname>
@@ -364,6 +451,7 @@
         <path>%ROMPATH%/doom</path>
         <extension>.desktop .iwad .IWAD .pk4 .PK4 .pwad .PWAD .sh .wad .WAD</extension>
         <command label="PrBoom">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prboom_libretro.so %ROM%</command>
+        <command label="PrBoom+ (Standalone)">%EMULATOR_PRBOOM-PLUS% -iwad %ROM%</command>
         <command label="Boom 3">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/boom3_libretro.so %ROM%</command>
         <command label="Boom 3 xp">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/boom3_xp_libretro.so %ROM%</command>
         <command label="Shortcut or script">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
@@ -374,19 +462,19 @@
         <name>dos</name>
         <fullname>DOS (PC)</fullname>
         <path>%ROMPATH%/dos</path>
-        <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z</extension>
+        <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
         <command label="DOSBox-Pure">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM%</command>
         <command label="DOSBox-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM%</command>
         <command label="DOSBox-SVN">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM%</command>
-        <command label="DOSBox-X (Standalone)">%EMULATOR_DOSBOX-X% %ROM%</command>
-        <command label="DOSBox Staging (Standalone)">%EMULATOR_DOSBOX-STAGING% %ROM%</command>
+        <!-- <command label="DOSBox-X (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_DOSBOX-X% %ROM%</command> -->
+        <!-- <command label="DOSBox Staging (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_DOSBOX-STAGING% %ROM%</command> -->
         <platform>dos</platform>
         <theme>dos</theme>
     </system>
 <!--
     <system>
         <name>dragon32</name>
-        <fullname>Dragon 32</fullname>
+        <fullname>Dragon Data Dragon 32</fullname>
         <path>%ROMPATH%/dragon32</path>
         <extension>.cas .CAS .ccc .CCC .dsk .DSK .rom .ROM</extension>
         <command label="XRoar Dragon 32 (Standalone)">%EMULATOR_XROAR% -fs -default-machine dragon32 %ROM%</command>
@@ -423,10 +511,13 @@
         <extension>.fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
         <command label="Mesen">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%</command>
         <command label="Nestopia UE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
-<!--        <command label="Nestopia UE (Standalone)">%EMULATOR_NESTOPIA-UE% &#45;&#45;fullscreen %ROM%</command> -->
+        <!-- <command label="Nestopia UE (Standalone)">%EMULATOR_NESTOPIA-UE% &ndash;&ndash;fullscreen %ROM%</command> -->
         <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
         <command label="QuickNES">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command> -->
+        <!-- <command label="puNES (Standalone)">%EMULATOR_PUNES% -u yes %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Famicom" %ROM%</command> -->
+        <!-- <command label="ares FDS (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Famicom Disk System" %ROM%</command> -->
         <platform>famicom</platform>
         <theme>famicom</theme>
     </system>
@@ -447,8 +538,9 @@
         <name>fbneo</name>
         <fullname>FinalBurn Neo</fullname>
         <path>%ROMPATH%/fbneo</path>
-        <extension>.ccd .CCD .cue .CUE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <!-- <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% -fullscreen %BASENAME%</command> -->
         <platform>arcade</platform>
         <theme>fbneo</theme>
     </system>
@@ -459,9 +551,10 @@
         <extension>.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP</extension>
         <command label="Mesen">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%</command>
         <command label="Nestopia UE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
-<!--        <command label="Nestopia UE (Standalone)">%EMULATOR_NESTOPIA-UE% &#45;&#45;fullscreen %ROM%</command> -->
+        <!-- <command label="Nestopia UE (Standalone)">%EMULATOR_NESTOPIA-UE% &ndash;&ndash;fullscreen %ROM%</command> -->
         <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Famicom Disk System" %ROM%</command> -->
         <platform>fds</platform>
         <theme>fds</theme>
     </system>
@@ -471,11 +564,12 @@
         <fullname>Adobe Flash</fullname>
         <path>%ROMPATH%/flash</path>
         <extension>.swf .SWF</extension>
-        <command label="Ruffle (Standalone)">%EMULATOR_RUFFLE% &#45;&#45;fullscreen %ROM%</command>
-        <command label="Lightspark (Standalone)">%EMULATOR_LIGHTSPARK% %ROM%</command>
+        <command label="Ruffle (Standalone)">%EMULATOR_RUFFLE% &ndash;&ndash;fullscreen %ROM%</command>
+        <command label="Lightspark (Standalone)">%EMULATOR_LIGHTSPARK% &ndash;&ndash;fullscreen %ROM%</command>
         <platform>flash</platform>
         <theme>flash</theme>
     </system>
+-->
     <system>
         <name>fmtowns</name>
         <fullname>Fujitsu FM Towns</fullname>
@@ -491,10 +585,23 @@
         <fullname>Nintendo Game and Watch</fullname>
         <path>%ROMPATH%/gameandwatch</path>
         <extension>.mgw .MGW .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gw_libretro.so %ROM%</command>
+        <!-- <command label="MAME Local Artwork (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -artpath %ROMPATH%/gameandwatch/artwork -rompath %GAMEDIR%\;%ROMPATH%/gameandwatch %BASENAME%</command> -->
+        <!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gameandwatch %BASENAME%</command> -->
+        <command label="Handheld Electronic (GW)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gw_libretro.so %ROM%</command>
         <platform>gameandwatch</platform>
         <theme>gameandwatch</theme>
     </system>
+<!--
+    <system>
+        <name>gamecom</name>
+        <fullname>Tiger Electronics Game.com</fullname>
+        <path>%ROMPATH%/gamecom</path>
+        <extension>.tgc .TGC .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gamecom gamecom -cartridge1 %ROM%</command>
+        <platform>gamecom</platform>
+        <theme>gamecom</theme>
+    </system>
+-->
     <system>
         <name>gamegear</name>
         <fullname>Sega Game Gear</fullname>
@@ -515,7 +622,9 @@
         <extension>.bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP</extension>
         <command label="Gambatte">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.so %ROM%</command>
         <command label="SameBoy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM%</command>
+        <!-- <command label="SameBoy (Standalone)">%EMULATOR_SAMEBOY% -f %ROM%</command> -->
         <command label="Gearboy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.so %ROM%</command>
+        <!-- <command label="Gearboy (Standalone)">%EMULATOR_GEARBOY% %ROM%</command> -->
         <command label="TGB Dual">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM%</command>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
         <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
@@ -547,7 +656,9 @@
         <extension>.bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP</extension>
         <command label="Gambatte">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.so %ROM%</command>
         <command label="SameBoy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM%</command>
+        <!-- <command label="Sameboy (Standalone)">%EMULATOR_SAMEBOY% -f %ROM%</command> -->
         <command label="Gearboy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.so %ROM%</command>
+        <!-- <command label="Gearboy (Standalone)">%EMULATOR_GEARBOY% %ROM%</command> -->
         <command label="TGB Dual">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM%</command>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
         <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
@@ -562,10 +673,11 @@
         <name>gc</name>
         <fullname>Nintendo GameCube</fullname>
         <path>%ROMPATH%/gc</path>
-        <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .json .JSON .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command label="Dolphin (Standalone)">%EMULATOR_DOLPHIN% -b -e %ROM%</command>
+        <extension>.ciso .CISO .dff .DFF .dol .DOL .elf .ELF .gcm .GCM .gcz .GCZ .iso .ISO .json .JSON .m3u .M3U .rvz .RVZ .tgc .TGC .wad .WAD .wbfs .WBFS .wia .WIA .7z .7Z .zip .ZIP</extension>
         <command label="Dolphin">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%</command>
-        <command label="PrimeHack (Standalone)">%EMULATOR_PRIMEHACK% -b -e %ROM%</command>
+        <command label="Dolphin (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_DOLPHIN% -b -e %ROM%</command>
+        <command label="PrimeHack (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_PRIMEHACK% -b -e %ROM%</command>
+        <!-- <command label="Triforce (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_TRIFORCE% -b -e %ROM%</command> -->
         <platform>gc</platform>
         <theme>gc</theme>
     </system>
@@ -578,8 +690,9 @@
         <command label="Genesis Plus GX Wide">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM%</command>
         <command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
         <command label="BlastEm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.so %ROM%</command>
-        <command label="BlastEm (Standalone)">%EMULATOR_BLASTEM% -m gen %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module md %ROM%</command> -->
+        <!-- <command label="BlastEm (Standalone)">%EMULATOR_BLASTEM% -m gen %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module md %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Mega Drive" %ROM%</command> -->
         <platform>genesis</platform>
         <theme>genesis</theme>
     </system>
@@ -587,9 +700,10 @@
         <name>gx4000</name>
         <fullname>Amstrad GX4000</fullname>
         <path>%ROMPATH%/gx4000</path>
-        <extension>.cdt .CDT .cpr .CPR .dsk .DSK .kcr .KCR .m3u .M3U .sna .SNA .tap .TAR .voc .VOC .7z .7Z .zip .ZIP</extension>
+        <extension>.bin .BIN .cdt .CDT .cpr .CPR .dsk .DSK .kcr .KCR .m3u .M3U .sna .SNA .tap .TAR .voc .VOC .7z .7Z .zip .ZIP</extension>
         <command label="Caprice32">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/cap32_libretro.so %ROM%</command>
         <command label="CrocoDS">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/crocods_libretro.so %ROM%</command>
+        <!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gx4000 gx4000 -cart %ROM%</command> -->
         <platform>gx4000</platform>
         <theme>gx4000</theme>
     </system>
@@ -598,7 +712,7 @@
         <fullname>Mattel Electronics Intellivision</fullname>
         <path>%ROMPATH%/intellivision</path>
         <extension>.int .INT .bin .BIN .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.so %ROM%</command>
+        <command label="FreeIntv">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.so %ROM%</command>
         <platform>intellivision</platform>
         <theme>intellivision</theme>
     </system>
@@ -611,12 +725,34 @@
         <platform>android</platform>
         <theme>j2me</theme>
     </system>
+<!-- 
+    <system>
+        <name>kodi</name>
+        <fullname>Kodi Home Theatre Software</fullname>
+        <path>%ROMPATH%/kodi</path>
+        <extension>.desktop .sh</extension>
+        <command label="Kodi (Standalone)">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <platform>pc</platform>
+        <theme>kodi</theme>
+    </system>
+-->
+    <system>
+        <name>lcdgames</name>
+        <fullname>LCD Handheld Games</fullname>
+        <path>%ROMPATH%/lcdgames</path>
+        <extension>.mgw .MGW .7z .7Z .zip .ZIP</extension>
+        <!-- <command label="MAME Local Artwork (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -artpath %ROMPATH%/lcdgames/artwork -rompath %GAMEDIR%\;%ROMPATH%/lcdgames %BASENAME%</command> -->
+        <!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/lcdgames %BASENAME%</command> -->
+        <command label="Handheld Electronic (GW)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gw_libretro.so %ROM%</command>
+        <platform>lcdgames, gameandwatch</platform>
+        <theme>lcdgames</theme>
+    </system>
     <system>
         <name>lutro</name>
         <fullname>Lutro Game Engine</fullname>
         <path>%ROMPATH%/lutro</path>
         <extension>.lua .LUA .lutro .LUTRO .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/lutro_libretro.so %ROM%</command>
+        <command label="Lutro">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/lutro_libretro.so %ROM%</command>
         <platform>lutro</platform>
         <theme>lutro</theme>
     </system>
@@ -624,17 +760,21 @@
         <name>mame</name>
         <fullname>Multiple Arcade Machine Emulator</fullname>
         <path>%ROMPATH%/mame</path>
-        <extension>.cmd .CMD .7z .7Z .zip .ZIP</extension>
+        <extension>.cmd .CMD .desktop .sh .7z .7Z .zip .ZIP</extension>
         <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
         <command label="MAME 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM%</command>
         <command label="MAME 2003-Plus">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM%</command>
         <command label="MAME 2000">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM%</command>
-<!--        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/mame %BASENAME%</command> -->
+        <!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/mame %BASENAME%</command> -->
         <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <!-- <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% -fullscreen %BASENAME%</command> -->
         <command label="FB Alpha 2012">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM%</command>
         <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
-<!--        <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command> -->
+        <!-- <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command> -->
         <command label="Kronos">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM%</command>
+        <!-- <command label="Supermodel (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -force-feedback %INJECT%=%BASENAME%.commands %ROM%</command> -->
+        <!-- <command label="Supermodel [Fullscreen] (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -fullscreen -force-feedback %INJECT%=%BASENAME%.commands %ROM%</command> -->
+        <command label="Shortcut or script">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>arcade</platform>
         <theme>mame</theme>
     </system>
@@ -666,7 +806,8 @@
         <command label="SMS Plus GX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM%</command>
         <command label="Gearsystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_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 sms %ROM%</command>  -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module sms %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Master System" %ROM%</command> -->
         <platform>mastersystem</platform>
         <theme>mastersystem</theme>
     </system>
@@ -678,6 +819,7 @@
         <command label="Genesis Plus GX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM%</command>
         <command label="Genesis Plus GX Wide">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM%</command>
         <command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Mega CD" %ROM%</command> -->
         <platform>segacd</platform>
         <theme>megacd</theme>
     </system>
@@ -689,6 +831,7 @@
         <command label="Genesis Plus GX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM%</command>
         <command label="Genesis Plus GX Wide">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM%</command>
         <command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Mega CD" %ROM%</command> -->
         <platform>segacd</platform>
         <theme>megacdjp</theme>
     </system>
@@ -701,8 +844,9 @@
         <command label="Genesis Plus GX Wide">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM%</command>
         <command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
         <command label="BlastEm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.so %ROM%</command>
-<!--        <command label="BlastEm (Standalone)">%EMULATOR_BLASTEM% -m gen %ROM%</command>
-        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module md %ROM%</command> -->
+        <!-- <command label="BlastEm (Standalone)">%EMULATOR_BLASTEM% -m gen %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module md %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Mega Drive" %ROM%</command> -->
         <platform>megadrive</platform>
         <theme>megadrive</theme>
     </system>
@@ -720,7 +864,7 @@
         <fullname>Multi Emulator Super System</fullname>
         <path>%ROMPATH%/mess</path>
         <extension>.chd .CHD .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mess2015_libretro.so %ROM%</command>
+        <command label="MESS 2015">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mess2015_libretro.so %ROM%</command>
         <platform>mess</platform>
         <theme>mess</theme>
     </system>
@@ -729,19 +873,23 @@
         <fullname>Sega Model 2</fullname>
         <path>%ROMPATH%/model2</path>
         <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
+        <!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/model2 %BASENAME%</command> -->
         <platform>arcade</platform>
         <theme>model2</theme>
     </system>
+<!-- 
     <system>
         <name>model3</name>
         <fullname>Sega Model 3</fullname>
         <path>%ROMPATH%/model3</path>
         <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <command label="Supermodel (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -force-feedback %INJECT%=%BASENAME%.commands %ROM%</command>
+        <command label="Supermodel [Fullscreen] (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -fullscreen -force-feedback %INJECT%=%BASENAME%.commands %ROM%</command>
         <platform>arcade</platform>
         <theme>model3</theme>
     </system>
+-->
     <system>
         <name>moonlight</name>
         <fullname>Moonlight Game Streaming</fullname>
@@ -756,7 +904,7 @@
         <fullname>Thomson MO/TO Series</fullname>
         <path>%ROMPATH%/moto</path>
         <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM%</command>
+        <command label="Theodore">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM%</command>
         <platform>moto</platform>
         <theme>moto</theme>
     </system>
@@ -764,9 +912,12 @@
         <name>msx</name>
         <fullname>MSX</fullname>
         <path>%ROMPATH%/msx</path>
-        <extension>.rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP</extension>
+        <extension>.cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP</extension>
         <command label="blueMSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
         <command label="fMSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM%</command>
+        <!-- <command label="openMSX (Standalone)">%EMULATOR_OPENMSX% -machine National_CF-3300 %INJECT%=%BASENAME%.commands %ROM%</command> -->
+        <!-- <command label="openMSX No Machine (Standalone)">%EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "MSX" %ROM%</command> -->
         <platform>msx</platform>
         <theme>msx</theme>
     </system>
@@ -774,9 +925,12 @@
         <name>msx1</name>
         <fullname>MSX1</fullname>
         <path>%ROMPATH%/msx1</path>
-        <extension>.rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP</extension>
+        <extension>.cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP</extension>
         <command label="blueMSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
         <command label="fMSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM%</command>
+        <!-- <command label="openMSX (Standalone)">%EMULATOR_OPENMSX% -machine National_CF-3300 %INJECT%=%BASENAME%.commands %ROM%</command> -->
+        <!-- <command label="openMSX No Machine (Standalone)">%EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "MSX" %ROM%</command> -->
         <platform>msx</platform>
         <theme>msx1</theme>
     </system>
@@ -784,9 +938,12 @@
         <name>msx2</name>
         <fullname>MSX2</fullname>
         <path>%ROMPATH%/msx2</path>
-        <extension>.rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP</extension>
+        <extension>.cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP</extension>
         <command label="blueMSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
         <command label="fMSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM%</command>
+        <!-- <command label="openMSX (Standalone)">%EMULATOR_OPENMSX% -machine Panasonic_FS-A1WSX %INJECT%=%BASENAME%.commands %ROM%</command> -->
+        <!-- <command label="openMSX No Machine (Standalone)">%EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "MSX2" %ROM%</command> -->
         <platform>msx2</platform>
         <theme>msx2</theme>
     </system>
@@ -794,8 +951,10 @@
         <name>msxturbor</name>
         <fullname>MSX Turbo R</fullname>
         <path>%ROMPATH%/msxturbor</path>
-        <extension>.rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
+        <extension>.cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP</extension>
+        <command label="blueMSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
+        <!-- <command label="openMSX (Standalone)">%EMULATOR_OPENMSX% -machine Panasonic_FS-A1GT %INJECT%=%BASENAME%.commands %ROM%</command> -->
+        <!-- <command label="openMSX No Machine (Standalone)">%EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM%</command> -->
         <platform>msxturbor</platform>
         <theme>msxturbor</theme>
     </system>
@@ -804,8 +963,8 @@
         <name>mugen</name>
         <fullname>M.U.G.E.N Game Engine</fullname>
         <path>%ROMPATH%/mugen</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.mugen</extension>
+        <command label="Ikemen GO (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
         <platform>mugen</platform>
         <theme>mugen</theme>
     </system>
@@ -815,7 +974,7 @@
         <fullname>Othello Multivision</fullname>
         <path>%ROMPATH%/multivision</path>
         <extension>.bin .BIN .gg .GG .rom .ROM .sg .SG .sms .SMS .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM%</command>
+        <command label="Gearsystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM%</command>
         <platform>sg-1000</platform>
         <theme>multivision</theme>
     </system>
@@ -834,7 +993,7 @@
         <name>n64</name>
         <fullname>Nintendo 64</fullname>
         <path>%ROMPATH%/n64</path>
-        <extension>.bin .BIN .n64 .N64 .ndd .NDD .u1 .U1 .v64 .V64 .z64 .Z64 .7z .7Z .zip .ZIP</extension>
+        <extension>.bin .BIN .d64 .D64 .n64 .N64 .ndd .NDD .u1 .U1 .v64 .V64 .z64 .Z64 .7z .7Z .zip .ZIP</extension>
         <command label="Mupen64Plus-Next">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM%</command>
 <!--        <command label="Mupen64Plus (Standalone)">%EMULATOR_MUPEN64PLUS% &#45;&#45;nogui %ROM%</command> -->
         <command label="ParaLLEl N64">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.so %ROM%</command>
@@ -845,9 +1004,10 @@
         <name>n64dd</name>
         <fullname>Nintendo 64DD</fullname>
         <path>%ROMPATH%/n64dd</path>
-        <extension>.bin .BIN .n64 .N64 .ndd .NDD .u1 .U1 .v64 .V64 .z64 .Z64 .7z .7Z .zip .ZIP</extension>
+        <extension>.bin .BIN .d64 .D64 .n64 .N64 .ndd .NDD .u1 .U1 .v64 .V64 .z64 .Z64 .7z .7Z .zip .ZIP</extension>
         <command label="ParaLLEl N64">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.so %ROM%</command>
         <command label="Mupen64Plus-Next">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM%</command>
+        <!-- <command label="Rosalie's Mupen GUI (Standalone)">%EMULATOR_ROSALIES-MUPEN-GUI% &ndash;&ndash;nogui -q %ROM%</command> -->
         <platform>n64</platform>
         <theme>n64dd</theme>
     </system>
@@ -875,7 +1035,7 @@
         <name>nds</name>
         <fullname>Nintendo DS</fullname>
         <path>%ROMPATH%/nds</path>
-        <extension>.bin .BIN .nds .NDS .7z .7Z .zip .ZIP</extension>
+        <extension>.app .APP .bin .BIN .nds .NDS .7z .7Z .zip .ZIP</extension>
         <command label="DeSmuME">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume_libretro.so %ROM%</command>
         <command label="DeSmuME 2015">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume2015_libretro.so %ROM%</command>
         <command label="DeSmuME (Standalone)">%EMULATOR_DESMUME% %ROM%</command>
@@ -888,8 +1048,10 @@
         <name>neogeo</name>
         <fullname>SNK Neo Geo</fullname>
         <path>%ROMPATH%/neogeo</path>
-        <extension>.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <!-- <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% -fullscreen %BASENAME%</command> -->
+        <!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/neogeo %BASENAME%</command> -->
         <platform>neogeo</platform>
         <theme>neogeo</theme>
     </system>
@@ -897,8 +1059,11 @@
         <name>neogeocd</name>
         <fullname>SNK Neo Geo CD</fullname>
         <path>%ROMPATH%/neogeocd</path>
-        <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM%</command>
+        <extension>.chd .CHD .cue .CUE</extension>
+        <command label="NeoCD">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM%</command>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% --subsystem neocd -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <!-- <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% neocdz -fullscreen -cd %ROM%</command> -->
+        <!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/neogeocd neocdz -cdrm %ROM%</command> -->
         <platform>neogeocd</platform>
         <theme>neogeocd</theme>
     </system>
@@ -906,8 +1071,11 @@
         <name>neogeocdjp</name>
         <fullname>SNK Neo Geo CD</fullname>
         <path>%ROMPATH%/neogeocdjp</path>
-        <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM%</command>
+        <extension>.chd .CHD .cue .CUE</extension>
+        <command label="NeoCD">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM%</command>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% --subsystem neocd -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <!-- <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% neocdz -fullscreen -cd %ROM%</command> -->
+        <!-- <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/neogeocdjp neocdz -cdrm %ROM%</command> -->
         <platform>neogeocd</platform>
         <theme>neogeocdjp</theme>
     </system>
@@ -921,7 +1089,10 @@
         <command label="Nestopia UE (Standalone)">%EMULATOR_NESTOPIA-UE% --fullscreen %ROM%</command>
         <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
         <command label="QuickNES">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command> -->
+        <!-- <command label="puNES (Standalone)">%EMULATOR_PUNES% -u yes %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Famicom" %ROM%</command> -->
+        <!-- <command label="ares FDS (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Famicom Disk System" %ROM%</command> -->
         <platform>nes</platform>
         <theme>nes</theme>
     </system>
@@ -932,7 +1103,8 @@
         <extension>.ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP</extension>
         <command label="Beetle NeoPop">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_ngp_libretro.so %ROM%</command>
         <command label="RACE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/race_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module ngp %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module ngp %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Neo Geo Pocket" %ROM%</command> -->
         <platform>ngp</platform>
         <theme>ngp</theme>
     </system>
@@ -943,7 +1115,8 @@
         <extension>.ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP</extension>
         <command label="Beetle NeoPop">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_ngp_libretro.so %ROM%</command>
         <command label="RACE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/race_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module ngp %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module ngp %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Neo Geo Pocket Color" %ROM%</command> -->
         <platform>ngpc</platform>
         <theme>ngpc</theme>
     </system>
@@ -952,19 +1125,21 @@
         <fullname>Magnavox Odyssey2</fullname>
         <path>%ROMPATH%/odyssey2</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
+        <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
         <platform>odyssey2</platform>
         <theme>odyssey2</theme>
     </system>
+<!-- 
     <system>
         <name>openbor</name>
         <fullname>OpenBOR Game Engine</fullname>
         <path>%ROMPATH%/openbor</path>
         <extension>.AppImage</extension>
-        <command>%STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <command label="OpenBOR (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
         <platform>openbor</platform>
         <theme>openbor</theme>
     </system>
+-->
 <!--
     <system>
         <name>oric</name>
@@ -981,7 +1156,7 @@
         <fullname>Palm OS</fullname>
         <path>%ROMPATH%/palm</path>
         <extension>.prc .PRC .pqa .PQA .img .IMG .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mu_libretro.so %ROM%</command>
+        <command label="Mu">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mu_libretro.so %ROM%</command>
         <platform>palm</platform>
         <theme>palm</theme>
     </system>
@@ -990,7 +1165,7 @@
         <fullname>NEC PC-8800 Series</fullname>
         <path>%ROMPATH%/pc88</path>
         <extension>.d88 .D88 .u88 .U88 .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quasi88_libretro.so %ROM%</command>
+        <command label="QUASI88">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quasi88_libretro.so %ROM%</command>
         <platform>pc88</platform>
         <theme>pc88</theme>
     </system>
@@ -998,7 +1173,7 @@
         <name>pc98</name>
         <fullname>NEC PC-9800 Series</fullname>
         <path>%ROMPATH%/pc98</path>
-        <extension>.2hd .2HD .88d .88D .98d .98D .d88 .D88 .d98 .D98 .cmd .CMD .dup .DUP .fdd .FDD .fdi .FDI .hdd .HDD .hdi .HDI .hdm .HDM .hdn .HDN .nhd .NHD .tfd .TFD .thd .THD . xdf .XDF .7z .7Z .zip .ZIP</extension>
+        <extension>.2hd .2HD .88d .88D .98d .98D .d88 .D88 .d98 .D98 .cmd .CMD .dup .DUP .fdd .FDD .fdi .FDI .hdd .HDD .hdi .HDI .hdm .HDM .hdn .HDN .m3u .M3U .nhd .NHD .tfd .TFD .thd .THD . xdf .XDF .7z .7Z .zip .ZIP</extension>
         <command label="Neko Project II Kai">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/np2kai_libretro.so %ROM%</command>
         <command label="Neko Project II">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nekop2_libretro.so %ROM%</command>
         <platform>pc98</platform>
@@ -1011,7 +1186,8 @@
         <extension>.ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP</extension>
         <command label="Beetle PCE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%</command>
         <command label="Beetle PCE FAST">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module pce %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module pce %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "PC Engine" %ROM%</command> -->
         <platform>pcengine</platform>
         <theme>pcengine</theme>
     </system>
@@ -1022,7 +1198,8 @@
         <extension>.ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP</extension>
         <command label="Beetle PCE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%</command>
         <command label="Beetle PCE FAST">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module pce %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module pce %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "PC Engine CD" %ROM%</command> -->
         <platform>pcenginecd</platform>
         <theme>pcenginecd</theme>
     </system>
@@ -1030,9 +1207,9 @@
         <name>pcfx</name>
         <fullname>NEC PC-FX</fullname>
         <path>%ROMPATH%/pcfx</path>
-        <extension>.cue CUE .ccd .CCD .toc .TOC .chd .CHD .7z .7Z .zip .ZIP</extension>
+        <extension>.ccd .CCD .chd .CHD .cue CUE .m3u .M3U .toc .TOC .7z .7Z .zip .ZIP</extension>
         <command label="Beetle PC-FX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pcfx_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module pcfx %ROM%</command> -->
+        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module pcfx %ROM%</command>
         <platform>pcfx</platform>
         <theme>pcfx</theme>
     </system>
@@ -1051,7 +1228,7 @@
         <fullname>Nintendo Pokémon Mini</fullname>
         <path>%ROMPATH%/pokemini</path>
         <extension>.min .MIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pokemini_libretro.so %ROM%</command>
+        <command label="PokeMini">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pokemini_libretro.so %ROM%</command>
         <platform>pokemini</platform>
         <theme>pokemini</theme>
     </system>
@@ -1060,18 +1237,18 @@
         <fullname>Ports</fullname>
         <path>%ROMPATH%/ports</path>
         <extension>.desktop .sh</extension>
-        <command>%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
-        <platform>pc</platform>
+        <command label="Various">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <platform>pc, pcwindows</platform>
         <theme>ports</theme>
     </system>
     <system>
         <name>ps2</name>
         <fullname>Sony PlayStation 2</fullname>
         <path>%ROMPATH%/ps2</path>
-        <command label="PCSX2 (Standalone)">%EMULATOR_PCSX2% -batch %ROM%</command>
         <extension>.bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG</extension>
+	<command label="PCSX2 (Standalone)">%EMULATOR_PCSX2% -batch %ROM%</command>
         <command label="PCSX2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%</command>
-<!--        <command label="Play! (Standalone)">%EMULATOR_PLAY!% &#45;&#45;disc %ROM%</command> -->
+        <!-- <command label="Play! (Standalone)">%EMULATOR_PLAY!% &ndash;&ndash;disc %ROM%</command> -->
         <platform>ps2</platform>
         <theme>ps2</theme>
     </system>
@@ -1119,26 +1296,53 @@
         <name>psx</name>
         <fullname>Sony PlayStation</fullname>
         <path>%ROMPATH%/psx</path>
-        <extension>.bin .BIN .cbn .CBN .ccd .CCD .chd .CHD .cue .CUE .ecm .ECM .exe .EXE .img .IMG .iso .ISO .m3u .M3U .mdf .MDF .mds .MDS .pbp .PBP .psexe .PSEXE .psf .PSF .toc .TOC .z .Z .znx .ZNX .7z .7Z .zip .ZIP</extension>
-        <command label="SwanStation">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/swanstation_libretro.so %ROM%</command>
+        <extension>.bin .BIN .cbn .CBN .ccd .CCD .chd .CHD .cue .CUE .ecm .ECM .exe .EXE .img .IMG .iso .ISO .m3u .M3U .mdf .MDF .mds .MDS .minipsf .MINIPSF .pbp .PBP .psexe .PSEXE .psf .PSF .toc .TOC .z .Z .znx .ZNX .7z .7Z .zip .ZIP</extension>
         <command label="Beetle PSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_libretro.so %ROM%</command>
         <command label="Beetle PSX HW">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_hw_libretro.so %ROM%</command>
         <command label="PCSX ReARMed">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx_rearmed_libretro.so %ROM%</command>
+        <command label="SwanStation">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/swanstation_libretro.so %ROM%</command>
         <command label="DuckStation (Standalone)">%EMULATOR_DUCKSTATION% -batch %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module psx %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module psx %ROM%</command> -->
         <platform>psx</platform>
         <theme>psx</theme>
     </system>
+<!--
+    <system>
+        <name>pv1000</name>
+        <fullname>Casio PV-1000</fullname>
+        <path>%ROMPATH%/pv1000</path>
+        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/pv1000 pv1000 -cart %ROM%</command>
+        <platform>pv1000</platform>
+        <theme>pv1000</theme>
+    </system>
+-->
+    <system>
+        <name>quake</name>
+        <fullname>Quake</fullname>
+        <path>%ROMPATH%/quake</path>
+        <extension>.desktop .pak .PAK .pk3 .PK3 .sh</extension>
+        <command label="TyrQuake">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tyrquake_libretro.so %ROM%</command>
+        <command label="vitaQuake 2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vitaquake2_libretro.so %ROM%</command>
+        <command label="vitaQuake 2 [Rogue]">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vitaquake2-rogue_libretro.so %ROM%</command>
+        <command label="vitaQuake 2 [Xatrix]">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vitaquake2-xatrix_libretro.so %ROM%</command>
+        <command label="vitaQuake 2 [Zaero]">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vitaquake2-zaero_libretro.so %ROM%</command>
+        <command label="vitaQuake 3">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vitaquake3_libretro.so %ROM%</command>
+        <command label="Shortcut or script">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <platform>pc, pcwindows</platform>
+        <theme>quake</theme>
+    </system>
+<!--
     <system>
         <name>samcoupe</name>
-        <fullname>SAM Coupé</fullname>
+        <fullname>MGT SAM Coupé</fullname>
         <path>%ROMPATH%/samcoupe</path>
         <extension>.dsk .DSK .mgt .MGT .sbt .SBT .sad .SAD .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/simcp_libretro.so %ROM%</command>
-<!--        <command>%EMULATOR_SIMCOUPE% %ROM%</command> -->
+        <command label="SimCoupé (Standalone)">%EMULATOR_SIMCOUPE% %ROM%</command>
         <platform>samcoupe</platform>
         <theme>samcoupe</theme>
     </system>
+-->
     <system>
         <name>satellaview</name>
         <fullname>Nintendo Satellaview</fullname>
@@ -1164,7 +1368,7 @@
         <command label="Kronos">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM%</command>
         <command label="YabaSanshiro">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabasanshiro_libretro.so %ROM%</command>
         <command label="Yabause">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabause_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module ss %ROM%</command> -->
+        <!--<command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module ss %ROM%</command> -->
         <platform>saturn</platform>
         <theme>saturn</theme>
     </system>
@@ -1177,7 +1381,7 @@
         <command label="Kronos">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM%</command>
         <command label="YabaSanshiro">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabasanshiro_libretro.so %ROM%</command>
         <command label="Yabause">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabause_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module ss %ROM%</command> -->
+<!--    <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module ss %ROM%</command> -->
         <platform>saturn</platform>
         <theme>saturnjp</theme>
     </system>
@@ -1187,7 +1391,7 @@
         <path>%ROMPATH%/scummvm</path>
         <extension>.scummvm .SCUMMVM .svm .SVM</extension>
         <command label="ScummVM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.so %ROM%</command>
-<!--        <command label="ScummVM (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_SCUMMVM% %BASENAME%</command> -->
+<!--    <command label="ScummVM (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_SCUMMVM% %BASENAME%</command> -->
         <platform>scummvm</platform>
         <theme>scummvm</theme>
     </system>
@@ -1196,7 +1400,8 @@
         <fullname>Sega Mega Drive 32X</fullname>
         <path>%ROMPATH%/sega32x</path>
         <extension>.bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
+        <command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Mega 32X" %ROM%</command> -->
         <platform>sega32x</platform>
         <theme>sega32x</theme>
     </system>
@@ -1205,7 +1410,8 @@
         <fullname>Sega Super 32X</fullname>
         <path>%ROMPATH%/sega32xjp</path>
         <extension>.bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
+        <command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Mega 32X" %ROM%</command> -->
         <platform>sega32x</platform>
         <theme>sega32xjp</theme>
     </system>
@@ -1214,7 +1420,8 @@
         <fullname>Sega Genesis 32X</fullname>
         <path>%ROMPATH%/sega32xna</path>
         <extension>.bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
+        <command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Mega 32X" %ROM%</command> -->
         <platform>sega32x</platform>
         <theme>sega32xna</theme>
     </system>
@@ -1226,6 +1433,7 @@
         <command label="Genesis Plus GX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM%</command>
         <command label="Genesis Plus GX Wide">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM%</command>
         <command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Mega CD" %ROM%</command> -->
         <platform>segacd</platform>
         <theme>segacd</theme>
     </system>
@@ -1236,13 +1444,15 @@
         <extension>.bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP</extension>
         <command label="Snes9x - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
         <command label="Snes9x 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM%</command>
-        <command label="Snes9x (Standalone)">%EMULATOR_SNES9X% %ROM%</command>
+        <!-- <command label="Snes9x (Standalone)">%EMULATOR_SNES9X% %ROM%</command> -->
         <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
         <command label="bsnes-hd">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%</command>
         <command label="bsnes-mercury Accuracy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%</command>
-        <command label="bsnes (Standalone)">%EMULATOR_BSNES% --fullscreen %ROM%</command>
+        <!-- <command label="bsnes (Standalone)">%EMULATOR_BSNES% &ndash;&ndash;fullscreen %ROM%</command> -->
         <command label="Beetle Supafaust">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM%</command>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module snes %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Super Famicom" %ROM%</command> -->
         <platform>snes</platform>
         <theme>sfc</theme>
     </system>
@@ -1255,6 +1465,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="blueMSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "SG-1000" %ROM%</command> -->
         <platform>sg-1000</platform>
         <theme>sg-1000</theme>
     </system>
@@ -1265,7 +1476,7 @@
         <extension>.gb .GB .gbc .GBC .sgb .SGB .7z .7Z .zip .ZIP</extension>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
         <command label="mGBA">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM%</command>
-<!--        <command label="mGBA (Standalone)">%EMULATOR_MGBA% -f %ROM%</command> -->
+        <!-- <command label="mGBA (Standalone)">%EMULATOR_MGBA% -f %ROM%</command> -->
         <platform>gb</platform>
         <theme>sgb</theme>
     </system>
@@ -1276,13 +1487,15 @@
         <extension>.bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP</extension>
         <command label="Snes9x - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
         <command label="Snes9x 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM%</command>
-        <command label="Snes9x (Standalone)">%EMULATOR_SNES9X% %ROM%</command>
+        <!-- <command label="Snes9x (Standalone)">%EMULATOR_SNES9X% %ROM%</command> -->
         <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
         <command label="bsnes-hd">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%</command>
         <command label="bsnes-mercury Accuracy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%</command>
-        <command label="bsnes (Standalone)">%EMULATOR_BSNES% --fullscreen %ROM%</command>
+        <!-- <command label="bsnes (Standalone)">%EMULATOR_BSNES% &ndash;&ndash;fullscreen %ROM%</command> -->
         <command label="Beetle Supafaust">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM%</command>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module snes %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Super Famicom" %ROM%</command> -->
         <platform>snes</platform>
         <theme>snes</theme>
     </system>
@@ -1293,13 +1506,15 @@
         <extension>.bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP</extension>
         <command label="Snes9x - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
         <command label="Snes9x 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM%</command>
-        <command label="Snes9x (Standalone)">%EMULATOR_SNES9X% %ROM%</command>
+        <!-- <command label="Snes9x (Standalone)">%EMULATOR_SNES9X% %ROM%</command> -->
         <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
         <command label="bsnes-hd">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%</command>
         <command label="bsnes-mercury Accuracy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%</command>
-        <command label="bsnes (Standalone)">%EMULATOR_BSNES% --fullscreen %ROM%</command>
+        <!-- <command label="bsnes (Standalone)">%EMULATOR_BSNES% &ndash;&ndash;fullscreen %ROM%</command> -->
         <command label="Beetle Supafaust">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM%</command>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module snes %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Super Famicom" %ROM%</command> -->
         <platform>snes</platform>
         <theme>snesna</theme>
     </system>
@@ -1309,7 +1524,7 @@
         <fullname>Solarus Game Engine</fullname>
         <path>%ROMPATH%/solarus</path>
         <extension>.solarus</extension>
-        <command>%EMULATOR_SOLARUS% %ROM%</command>
+        <command label="Solarus (Standalone)">%EMULATOR_SOLARUS% %ROM%</command>
         <platform>solarus</platform>
         <theme>solarus</theme>
     </system>
@@ -1319,7 +1534,7 @@
         <fullname>Spectravideo</fullname>
         <path>%ROMPATH%/spectravideo</path>
         <extension>.rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
+        <command label="blueMSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
         <platform>spectravideo</platform>
         <theme>spectravideo</theme>
     </system>
@@ -1339,11 +1554,12 @@
         <extension>.bml .BML .bs .BS .fig .FIG .sfc .SFC .smc .SMC .st .ST .7z .7Z .zip .ZIP</extension>
         <command label="Snes9x - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
         <command label="Snes9x 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM%</command>
-        <command label="Snes9x (Standalone)">%EMULATOR_SNES9X% %ROM%</command>
+        <!-- <command label="Snes9x (Standalone)">%EMULATOR_SNES9X% %ROM%</command> -->
         <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
         <command label="bsnes-hd">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%</command>
         <command label="bsnes-mercury Accuracy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%</command>
-        <command label="bsnes (Standalone)">%EMULATOR_BSNES% --fullscreen %ROM%</command>
+        <!-- <command label="bsnes (Standalone)">%EMULATOR_BSNES% &ndash;&ndash;fullscreen %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Super Famicom" %ROM%</command> -->
         <platform>sufami</platform>
         <theme>sufami</theme>
     </system>
@@ -1354,6 +1570,7 @@
         <extension>.pce .PCE .sgx .SGX .cue .CUE .ccd .CCD .chd .CHD .7z .7Z .zip .ZIP</extension>
         <command label="Beetle SuperGrafx">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supergrafx_libretro.so %ROM%</command>
         <command label="Beetle PCE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%</command>
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "SuperGrafx" %ROM%</command> -->
         <platform>supergrafx</platform>
         <theme>supergrafx</theme>
     </system>
@@ -1370,9 +1587,9 @@
         <name>switch</name>
         <fullname>Nintendo Switch</fullname>
         <path>%ROMPATH%/switch</path>
-        <extension>.nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI .7z .7Z .zip .ZIP</extension>
-        <command label="Yuzu (Standalone)">%EMULATOR_YUZU% -f -g %ROM%</command>
-        <!--<command label="Ryujinx (Standalone)">%EMULATOR_RYUJINX% %ROM%</command>-->
+        <extension>.nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI</extension>
+        <command label="Yuzu (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_YUZU% -f -g %ROM%</command>
+        <!-- <command label="Ryujinx (Standalone)">%EMULATOR_RYUJINX% %ROM%</command> -->
         <platform>switch</platform>
         <theme>switch</theme>
     </system>
@@ -1403,7 +1620,8 @@
         <extension>.ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP</extension>
         <command label="Beetle PCE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%</command>
         <command label="Beetle PCE FAST">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module pce %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module pce %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "PC Engine" %ROM%</command> -->
         <platform>pcengine</platform>
         <theme>tg16</theme>
     </system>
@@ -1414,25 +1632,28 @@
         <extension>.ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP</extension>
         <command label="Beetle PCE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%</command>
         <command label="Beetle PCE FAST">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module pce %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module pce %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "PC Engine CD" %ROM%</command> -->
         <platform>pcenginecd</platform>
         <theme>tg-cd</theme>
     </system>
+<!--
     <system>
         <name>ti99</name>
         <fullname>Texas Instruments TI-99</fullname>
         <path>%ROMPATH%/ti99</path>
         <extension>.rpk .RPK .7z .7Z .zip .ZIP</extension>
-        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/ti99 ti99_4a -ioport peb -ioport:peb:slot3 speech -cart %BASENAME%</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/ti99 ti99_4a -ioport peb -ioport:peb:slot3 speech -cart %BASENAME%</command>
         <platform>ti99</platform>
         <theme>ti99</theme>
     </system>
+-->
     <system>
         <name>tic80</name>
         <fullname>TIC-80 Game Engine</fullname>
         <path>%ROMPATH%/tic80</path>
         <extension>.tic .TIC</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tic80_libretro.so %ROM%</command>
+        <command label="TIC-80">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tic80_libretro.so %ROM%</command>
         <platform>tic80</platform>
         <theme>tic80</theme>
     </system>
@@ -1441,7 +1662,7 @@
         <fullname>Thomson TO8</fullname>
         <path>%ROMPATH%/to8</path>
         <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM%</command>
+        <command label="Theodore">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM%</command>
         <platform>moto</platform>
         <theme>to8</theme>
     </system>
@@ -1460,19 +1681,19 @@
 -->
     <system>
         <name>uzebox</name>
-        <fullname>Uzebox</fullname>
+        <fullname>Uzebox Open Source Console</fullname>
         <path>%ROMPATH%/uzebox</path>
         <extension>.uze .UZE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/uzem_libretro.so %ROM%</command>
+        <command label="Uzem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/uzem_libretro.so %ROM%</command>
         <platform>uzebox</platform>
         <theme>uzebox</theme>
     </system>
     <system>
         <name>vectrex</name>
-        <fullname>Vectrex</fullname>
+        <fullname>Smith Engineering Vectrex</fullname>
         <path>%ROMPATH%/vectrex</path>
         <extension>.bin .BIN .vec .VEC .gam .GAM .vc .VC .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.so %ROM%</command>
+        <command label="vecx">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.so %ROM%</command>
         <platform>vectrex</platform>
         <theme>vectrex</theme>
     </system>
@@ -1481,7 +1702,8 @@
         <fullname>Commodore VIC-20</fullname>
         <path>%ROMPATH%/vic20</path>
         <extension>.bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xvic_libretro.so %ROM%</command>
+        <command label="VICE xvic">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xvic_libretro.so %ROM%</command>
+        <!-- <command label="VICE xvic (Standalone)">%EMULATOR_VICE-XVIC% %ROM%</command> -->
         <platform>vic20</platform>
         <theme>vic20</theme>
     </system>
@@ -1490,7 +1712,7 @@
         <fullname>Philips Videopac G7000</fullname>
         <path>%ROMPATH%/videopac</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
+        <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
         <platform>videopac</platform>
         <theme>videopac</theme>
     </system>
@@ -1500,18 +1722,38 @@
         <path>%ROMPATH%/virtualboy</path>
         <extension>.vb .VB .vboy .VBOY .bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="Beetle VB">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_vb_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module vb %ROM%</command> -->
+        <!--  <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module vb %ROM%</command> -->
         <platform>virtualboy</platform>
         <theme>virtualboy</theme>
     </system>
+<!--
+    <system>
+        <name>vsmile</name>
+        <fullname>VTech V.Smile</fullname>
+        <path>%ROMPATH%/vsmile</path>
+        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/vsmile vsmile -cart %ROM%</command>
+        <platform>vsmile</platform>
+        <theme>vsmile</theme>
+    </system>
+-->
+    <system>
+        <name>wasm4</name>
+        <fullname>WASM-4 Fantasy Console</fullname>
+        <path>%ROMPATH%/wasm4</path>
+        <extension>.wasm .WASM</extension>
+        <command label="WASM-4">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/wasm4_libretro.so %ROM%</command>
+        <platform>wasm4</platform>
+        <theme>wasm4</theme>
+    </system>
     <system>
         <name>wii</name>
         <fullname>Nintendo Wii</fullname>
         <path>%ROMPATH%/wii</path>
-        <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .json .JSON .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command label="Dolphin (Standalone)">%EMULATOR_DOLPHIN% -b -e %ROM%</command>
+        <extension>.ciso .CISO .dff .DFF .dol .DOL .elf .ELF .gcm .GCM .gcz .GCZ .iso .ISO .json .JSON .m3u .M3U .rvz .RVZ .tgc .TGC .wad .WAD .wbfs .WBFS .wia .WIA .7z .7Z .zip .ZIP</extension>
         <command label="Dolphin">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%</command>
-        <command label="PrimeHack (Standalone)">%EMULATOR_PRIMEHACK% -b -e %ROM%</command>
+        <command label="Dolphin (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_DOLPHIN% -b -e %ROM%</command>
+        <command label="PrimeHack (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_PRIMEHACK% -b -e %ROM%</command>
         <platform>wii</platform>
         <theme>wii</theme>
     </system>
@@ -1526,14 +1768,14 @@
         <theme>wiiu</theme>
     </system>
 -->
-
     <system>
         <name>wonderswan</name>
         <fullname>Bandai WonderSwan</fullname>
         <path>%ROMPATH%/wonderswan</path>
         <extension>.ws .WS .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
         <command label="Beetle Cygne">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module wswan %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module wswan %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "WonderSwan" %ROM%</command> -->
         <platform>wonderswan</platform>
         <theme>wonderswan</theme>
     </system>
@@ -1543,7 +1785,8 @@
         <path>%ROMPATH%/wonderswancolor</path>
         <extension>.ws .WS .wsc .WSC .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
         <command label="Beetle Cygne">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module wswan %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module wswan %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "WonderSwan Color" %ROM%</command> -->
         <platform>wonderswancolor</platform>
         <theme>wonderswancolor</theme>
     </system>
@@ -1552,7 +1795,7 @@
         <fullname>Sharp X1</fullname>
         <path>%ROMPATH%/x1</path>
         <extension>.dx1 .DX1 .2d .2D .2hd .2HD .tfd .TFD .d88 .D88 .88d .88D .hdm .HDM .xdf .XDF .dup .DUP .tap .TAP .cmd .CMD .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.so %ROM%</command>
+        <command label="x1">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.so %ROM%</command>
         <platform>x1</platform>
         <theme>x1</theme>
     </system>
@@ -1561,7 +1804,7 @@
         <fullname>Sharp X68000</fullname>
         <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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.so %ROM%</command>
+        <command label="PX68k">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.so %ROM%</command>
         <platform>x68000</platform>
         <theme>x68000</theme>
     </system>
@@ -1570,7 +1813,7 @@
         <fullname>Microsoft Xbox</fullname>
         <path>%ROMPATH%/xbox</path>
         <extension>.iso .ISO</extension>
-        <command label="xemu (Standalone)">%EMULATOR_XEMU% -dvd_path %ROM%</command>
+        <command label="xemu (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_XEMU% -dvd_path %ROM%</command>
         <platform>xbox</platform>
         <theme>xbox</theme>
     </system>
@@ -1583,21 +1826,23 @@
         <platform>xbox360</platform>
         <theme>xbox360</theme>
     </system>
+<!--
     <system>
         <name>zmachine</name>
         <fullname>Infocom Z-machine</fullname>
         <path>%ROMPATH%/zmachine</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.dat .DAT .z1 .Z1 .z2 .Z2 .z3 .Z3 .z4 .Z4 .z5 .Z5 .z6 .Z6 .z7 .Z7 .z8 .Z8 .zlb .ZLB .zblorb .ZBLORB</extension>
+        <command label="Gargoyle (Standalone)">%EMULATOR_GARGOYLE% %ROM%</command>
         <platform>zmachine</platform>
         <theme>zmachine</theme>
     </system>
+-->
     <system>
         <name>zx81</name>
         <fullname>Sinclair ZX81</fullname>
         <path>%ROMPATH%/zx81</path>
         <extension>.tzx .TZX .p .P .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.so %ROM%</command>
+        <command label="EightyOne">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.so %ROM%</command>
         <platform>zx81</platform>
         <theme>zx81</theme>
     </system>
@@ -1605,8 +1850,9 @@
         <name>zxspectrum</name>
         <fullname>Sinclair ZX Spectrum</fullname>
         <path>%ROMPATH%/zxspectrum</path>
-        <extension>.tzx .TZX .tap .TAP .z80 .Z80 .rzx .RZX .scl .SCL .trd .TRD .sh .SH .sna .SNA .szx .SZX .udi .UDI .mgt .MGT .img .IMG .dsk .DSK .gz .GZ .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fuse_libretro.so %ROM%</command>
+        <extension>.dsk .DSK .gz .GZ .img .IMG .mgt .MGT .rzx .RZX .scl .SCL .sh .SH .sna .SNA .szx .SZX .tap .TAP .trd .TRD .tzx .TZX .udi .UDI .z80 .Z80 .7z .7Z .zip .ZIP</extension>
+        <command label="Fuse">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fuse_libretro.so %ROM%</command>
+        <!-- <command label="Fuse (Standalone)">%EMULATOR_FUSE% %ROM%</command> -->
         <platform>zxspectrum</platform>
         <theme>zxspectrum</theme>
     </system>
@@ -1619,4 +1865,4 @@
         <platform>tools</platform>
         <theme>tools</theme>
     </system>
-</systemList>
+</systemList>
\ No newline at end of file

From 40beffb2c56eb8416958a59f09d99f0d38dd71ff Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 31 Mar 2023 08:36:44 +0000
Subject: [PATCH 28/35] ES-DE: updated themes

---
 net.retrodeck.retrodeck.yml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 5e532d3c..c6d73749 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -259,41 +259,41 @@ modules:
 
   # ES-DE Themes - START
 
-  - name: art-book-next
+  - name: art-book-next-es-de
     buildsystem: simple
     build-commands:
-      - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next/
-      - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next/
+      - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/
+      - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/
     sources:
       - type: git
-        url:  https://github.com/anthonycaccese/art-book-next-retropie.git
-        commit: 5b2e44ab18007e42b581df57bd5d2a82255b9c14
+        url:  https://github.com/anthonycaccese/art-book-next-es-de.git
+        commit: a0dc0cccaa3f1475feb58e551fe732d982e161c0
 
-  - name: alekfull-nx-light
+  - name: alekfull-nx-es-de
     buildsystem: simple
     build-commands:
-      - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-light/
-      - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-light/
+      - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-es-de/
+      - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-es-de/
     sources:
       - type: git
-        url:  https://github.com/anthonycaccese/alekfull-nx-retropie.git
-        commit: 8d9aa2a992ab31cbe6dc3dc1c155dfb78e7a9732
+        url:  https://github.com/anthonycaccese/alekfull-nx-es-de.git
+        commit: 5011e5dca75663ff18602f3af9d17e9e880880ef
 
-  - name: retrofix-revisited
+  - name: retrofix-revisited-es-de
     buildsystem: simple
     build-commands:
-      - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited/
-      - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited/
+      - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited-es-de/
+      - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited-es-de/
     sources:
       - type: git
-        url:  https://github.com/anthonycaccese/retrofix-revisited-retropie.git
-        commit: 07207d20d2b617af336dcf829ae9fb901cc1ce94
+        url:  https://github.com/anthonycaccese/retrofix-revisited-es-de.git
+        commit: 23b80225078d2a3723039a8e94b6147c84065028
 
-  - name: nso-menu-interpreted
+  - name: nso-menu-interpreted-es-de
     buildsystem: simple
     build-commands:
-      - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted/
-      - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted/
+      - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted-es-de/
+      - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted-es-de/
     sources:
       - type: git
         url:  https://github.com/anthonycaccese/nso-menu-interpreted-es-de.git

From ede0fb1b877bd1c27352165642615ee43fff0ad4 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 31 Mar 2023 12:52:29 +0000
Subject: [PATCH 29/35] Updated: Yuzu, Citra, PCSX2, Xemu, RPCS3

---
 net.retrodeck.retrodeck.yml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index c6d73749..a0bacb8c 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -498,8 +498,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-1369/yuzu-mainline-20230312-54c359d1e.AppImage
-        sha256: 219874f72ea09856c8f1349d7bf744ecbd2823a469bd29f036b386924f5c5a97
+        url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1388/yuzu-mainline-20230330-03db6543e.AppImage
+        sha256: aca7c691f74b0cf74c1801d9960266bc1ce818bca9c242945b95545d22b04d80
 
   # Yuzu - END
 
@@ -532,8 +532,8 @@ modules:
     sources:
       - type: archive
         url: >-
-          https://github.com/citra-emu/citra-nightly/releases/download/nightly-1854/citra-unified-source-20230312-2cbf6fb.tar.xz
-        sha256: 018cb7dce3aa29a548a6e4cbad65d97babd98d2cdd1a4848a7c95c117f92fdf5
+          https://github.com/citra-emu/citra-nightly/releases/download/nightly-1872/citra-unified-source-20230330-f96047f.tar.xz
+        sha256: 3c49b691d46a1253df7477d1e9d771b7d15b967459851c096150e9952e160bfa
         x-checker-data:
           type: json
           url: https://api.github.com/repos/citra-emu/citra-nightly/releases/latest
@@ -562,8 +562,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.4225/pcsx2-v1.7.4225-linux-AppImage-64bit-Qt.AppImage
-        sha256: e8ed326851941b212193c2bd193ca87efdcc70c18971f45749273a32893fec68
+        url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.4303/pcsx2-v1.7.4303-linux-AppImage-64bit-Qt.AppImage
+        sha256: 5680bcc510f0898e6078c60ef2ef1d987b8414e1296c5ff88bd87933e4a314b3
 
   # PCSX2 - END
 
@@ -747,8 +747,8 @@ modules:
     sources:
       - type: git
         url: https://github.com/xemu-project/xemu.git
-        tag: v0.7.85
-        commit: 065c74a00fe402f65147e9b0d1a1eeac1b4b609f
+        tag: v0.7.86
+        commit: 4a99fd0f1855fc52e15885812abd3ee4bb2b3847
         x-checker-data:
           type: json
           url: https://api.github.com/repos/xemu-project/xemu/releases/latest
@@ -829,10 +829,12 @@ modules:
     sources:
       - type: git
         url: https://github.com/RPCS3/rpcs3.git
-        commit: cf5346c263111760752cabb94767c07c501207c4
+        branch: master
+        commit: 0c051a83a70ff548b750a92489350cfbb0c1881c
       - type: git
         url: https://github.com/intel/ittapi.git
-        commit: 2de8a23f6130036dcd4d1b78d05df3187951d298
+        branch: master
+        commit: 4a3762fbc517475bfb0586efc513e51c164108c9
         dest: ittapi/ittapi
         disable-shallow-clone: true
       # remove git-lfs hook

From 0a16ff327ef7319581d3906cf784ebb71efe0b13 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 31 Mar 2023 13:43:21 +0000
Subject: [PATCH 30/35] ES-DE: updated config for ES-DE 2.0

---
 es-configs/es_settings.xml | 59 ++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml
index 15a842eb..61b6edaa 100644
--- a/es-configs/es_settings.xml
+++ b/es-configs/es_settings.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0"?>
 <bool name="AlternativeEmulatorPerGame" value="true" />
+<bool name="ApplicationUpdaterPrereleases" value="false" />
 <bool name="CollectionShowSystemInfo" value="true" />
 <bool name="CustomEventScripts" value="false" />
 <bool name="DebugSkipInputLogging" value="false" />
-<bool name="DisableComposition" value="true" />
+<bool name="DebugSkipMissingThemeFiles" value="false" />
+<bool name="DebugSkipMissingThemeFilesCustomCollections" value="true" />
+<bool name="DisableComposition" value="false" />
 <bool name="DisplayGPUStatistics" value="false" />
 <bool name="EnableMenuKidMode" value="false" />
 <bool name="FavFirstCustom" value="false" />
@@ -13,12 +16,13 @@
 <bool name="FavoritesStar" value="true" />
 <bool name="FoldersOnTop" value="true" />
 <bool name="GamelistFilters" value="true" />
-<bool name="GamelistVideoAudio" value="true" />
 <bool name="GamelistVideoPillarbox" value="false" />
 <bool name="GamelistVideoScanlines" value="false" />
-<bool name="IgnoreGamelist" value="false" />
+<bool name="InputIgnoreKeyboard" value="false" />
 <bool name="InputOnlyFirstController" value="false" />
+<bool name="LegacyGamelistFileLocation" value="false" />
 <bool name="ListScrollOverlay" value="false" />
+<bool name="MAMENameStripExtraInfo" value="true" />
 <bool name="MediaViewerKeepVideoRunning" value="true" />
 <bool name="MediaViewerScreenshotScanlines" value="true" />
 <bool name="MediaViewerStretchVideos" value="false" />
@@ -44,8 +48,8 @@
 <bool name="RunInBackground" value="false" />
 <bool name="Scrape3DBoxes" value="false" />
 <bool name="ScrapeBackCovers" value="false" />
-<bool name="ScrapeControllers" value="false" />
 <bool name="ScrapeCovers" value="true" />
+<bool name="ScrapeFanArt" value="false" />
 <bool name="ScrapeGameNames" value="true" />
 <bool name="ScrapeMarquees" value="true" />
 <bool name="ScrapeMetadata" value="true" />
@@ -54,13 +58,15 @@
 <bool name="ScrapeScreenshots" value="true" />
 <bool name="ScrapeTitleScreens" value="false" />
 <bool name="ScrapeVideos" value="true" />
+<bool name="ScraperAutomaticRemoveDots" value="true" />
+<bool name="ScraperConvertUnderscores" value="true" />
 <bool name="ScraperExcludeRecursively" value="true" />
 <bool name="ScraperHaltOnInvalidMedia" value="false" />
-<bool name="ScraperIncludeFolders" value="false" />
+<bool name="ScraperIncludeFolders" value="true" />
 <bool name="ScraperInteractive" value="false" />
 <bool name="ScraperOverwriteData" value="false" />
+<bool name="ScraperRegionFallback" value="true" />
 <bool name="ScraperRespectExclusions" value="true" />
-<bool name="ScraperRetryPeerVerification" value="false" />
 <bool name="ScraperSearchMetadataName" value="true" />
 <bool name="ScraperSemiautomatic" value="true" />
 <bool name="ScraperUseAccountScreenScraper" value="true" />
@@ -71,41 +77,55 @@
 <bool name="ScreensaverSlideshowScanlines" value="true" />
 <bool name="ScreensaverStretchImages" value="false" />
 <bool name="ScreensaverStretchVideos" value="false" />
-<bool name="ScreensaverVideoAudio" value="false" />
+<bool name="ScreensaverVideoAudio" value="true" />
 <bool name="ScreensaverVideoBlur" value="false" />
 <bool name="ScreensaverVideoGameInfo" value="true" />
 <bool name="ScreensaverVideoScanlines" value="true" />
-<bool name="ScrollIndicators" value="true" />
 <bool name="ShowHelpPrompts" value="true" />
 <bool name="ShowHiddenFiles" value="true" />
 <bool name="ShowHiddenGames" value="true" />
 <bool name="ShowQuitMenu" value="false" />
-<bool name="SpecialCharsASCII" value="false" />
-<bool name="UseCustomCollectionsSystem" value="true" />
+<bool name="ThemeVariantTriggers" value="true" />
 <bool name="VideoUpscaleFrameRate" value="false" />
+<bool name="ViewsVideoAudio" value="true" />
 <bool name="VirtualKeyboard" value="true" />
+<int name="AntiAliasing" value="0" />
 <int name="DisplayIndex" value="1" />
-<int name="MaxVRAM" value="256" />
+<int name="LottieMaxFileCache" value="150" />
+<int name="LottieMaxTotalCache" value="1024" />
+<int name="MaxVRAM" value="512" />
+<int name="ScraperConnectionTimeout" value="30" />
+<int name="ScraperRetryOnErrorCount" value="3" />
+<int name="ScraperRetryOnErrorTimer" value="3" />
+<int name="ScraperTransferTimeout" value="120" />
+<int name="ScreenRotate" value="0" />
 <int name="ScreensaverSwapImageTimeout" value="10000" />
 <int name="ScreensaverSwapVideoTimeout" value="0" />
 <int name="ScreensaverTimer" value="300000" />
 <int name="SoundVolumeNavigation" value="70" />
 <int name="SoundVolumeVideos" value="80" />
-<string name="ApplicationVersion" value="1.2.1" />
-<string name="CollectionSystemsAuto" value="all" />
+<string name="ApplicationUpdaterFrequency" value="always" />
+<string name="ApplicationUpdaterLastCheck" value="20230331T153206" />
+<string name="ApplicationVersion" value="2.0.0" />
+<string name="CollectionCustomGrouping" value="unthemed" />
+<string name="CollectionSystemsAuto" value="" />
 <string name="CollectionSystemsCustom" value="" />
 <string name="DefaultSortOrder" value="filename, ascending" />
-<string name="ExitButtonCombo" value="F4" />
 <string name="GamelistViewStyle" value="automatic" />
 <string name="InputControllerType" value="xbox" />
+<string name="KeyboardQuitShortcut" value="AltF4" />
 <string name="LaunchScreenDuration" value="normal" />
+<string name="LegacyThemeTransitions" value="builtin-instant" />
 <string name="MediaDirectory" value="" />
 <string name="MenuOpeningEffect" value="scale-up" />
-<string name="MiximageBoxSize" value="small" />
+<string name="MiximageBoxSize" value="medium" />
 <string name="MiximagePhysicalMediaSize" value="medium" />
 <string name="MiximageResolution" value="1280x800" />
 <string name="MiximageScreenshotScaling" value="sharp" />
+<string name="OpenGLVersion" value="" />
+<string name="QuickSystemSelect" value="leftrightshoulders" />
 <string name="ROMDirectory" value="~/ROMs" />
+<string name="RandomEntryButton" value="games" />
 <string name="SaveGamelistsMode" value="always" />
 <string name="Scraper" value="screenscraper" />
 <string name="ScraperLanguage" value="en" />
@@ -115,7 +135,10 @@
 <string name="ScreensaverSlideshowImageDir" value="~/.emulationstation/slideshow/custom_images" />
 <string name="ScreensaverType" value="video" />
 <string name="StartupSystem" value="" />
-<string name="ThemeSet" value="art-book-next" />
-<string name="TransitionStyle" value="slide" />
+<string name="ThemeAspectRatio" value="" />
+<string name="ThemeColorScheme" value="" />
+<string name="ThemeSet" value="art-book-next-de" />
+<string name="ThemeTransitions" value="automatic" />
+<string name="ThemeVariant" value="" />
 <string name="UIMode" value="full" />
-<string name="UIMode_passkey" value="uuddlrlrba" />
+<string name="UIMode_passkey" value="uuddlrlrba" />
\ No newline at end of file

From 47880253926f9024cfae57f2451f00b68c0be52f Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 31 Mar 2023 15:09:03 +0000
Subject: [PATCH 31/35] FIXES: rpcs3, es_settings

---
 es-configs/es_settings.xml  | 2 +-
 net.retrodeck.retrodeck.yml | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml
index 61b6edaa..0c31775c 100644
--- a/es-configs/es_settings.xml
+++ b/es-configs/es_settings.xml
@@ -16,7 +16,7 @@
 <bool name="FavoritesStar" value="true" />
 <bool name="FoldersOnTop" value="true" />
 <bool name="GamelistFilters" value="true" />
-<bool name="GamelistVideoPillarbox" value="false" />
+<bool name="GamelistVideoPillarbox" value="true" />
 <bool name="GamelistVideoScanlines" value="false" />
 <bool name="InputIgnoreKeyboard" value="false" />
 <bool name="InputOnlyFirstController" value="false" />
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index a0bacb8c..7342b293 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -829,11 +829,9 @@ modules:
     sources:
       - type: git
         url: https://github.com/RPCS3/rpcs3.git
-        branch: master
-        commit: 0c051a83a70ff548b750a92489350cfbb0c1881c
+        commit: 3e556c710b3256d23b9e524e44d45ba8bbf63814
       - type: git
         url: https://github.com/intel/ittapi.git
-        branch: master
         commit: 4a3762fbc517475bfb0586efc513e51c164108c9
         dest: ittapi/ittapi
         disable-shallow-clone: true

From b38aae8031e90df72bb2b53102399a02bf8018f9 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Fri, 31 Mar 2023 13:30:10 -0400
Subject: [PATCH 32/35] Remove extra dialog at the end of first setup

---
 functions.sh                 | 18 ++++++------------
 rd-submodules/retroarch      |  2 +-
 rd-submodules/shared-modules |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/functions.sh b/functions.sh
index c3eacb90..b0da3604 100644
--- a/functions.sh
+++ b/functions.sh
@@ -1283,18 +1283,19 @@ finit() {
 
   mkdir -pv $roms_folder
 
-  zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue."
+  zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
+  --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \
+  --text="RetroDECK will now install the needed files, which can take up to one minute.\nRetroDECK will start once the process is completed.\n\nPress OK to continue."
 
+  (
   # Recreating the folder
-  rm -rfv /var/config/emulationstation/
-  mkdir -pv /var/config/emulationstation/
+  rm -rf /var/config/emulationstation/
+  mkdir -p /var/config/emulationstation/
 
   # Initializing ES-DE
   # TODO: after the next update of ES-DE this will not be needed - let's test it
   emulationstation --home /var/config/emulationstation --create-system-dirs
 
-  #zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue."
-
   # Initializing ROMs folder - Original in retrodeck home (or SD Card)
   dir_prep $roms_folder "/var/config/emulationstation/ROMs"
 
@@ -1315,7 +1316,6 @@ finit() {
   dir_prep "$roms_folder/pico8" "$bios_folder/pico-8/carts" # Symlink default game location to RD roms for cleanliness (this location is overridden anyway by the --root_path launch argument anyway)
   dir_prep "$saves_folder/pico-8" "$bios_folder/pico-8/cdata"  # PICO-8 saves folder
 
-  (
   ra_init
   standalones_init
   ) |
@@ -1325,12 +1325,6 @@ finit() {
   --text="RetroDECK is finishing the initial setup process, please wait."
 
   create_lock
-
-  zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
-  --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
-  --title "RetroDECK" \
-  --text="Installation completed.\nPlease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n$bios_folder\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIMPORTANT NOTES:\n- RetroDECK must be manually added and launched from your Steam Library in order to work correctly.\n- It's recommended to use the 'RetroDECK Offical Controller Config' from Steam (under community layouts).\n- It's suggested to use BoilR to automatically add the SteamGridDB images to Steam (this will be automated soon).\nhttps://github.com/PhilipK/BoilR"
-  # TODO: Replace the stuff above with BoilR code when ready
 }
 
 #=========================
diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch
index 717b7809..0b1cfb79 160000
--- a/rd-submodules/retroarch
+++ b/rd-submodules/retroarch
@@ -1 +1 @@
-Subproject commit 717b78093797270877ec416e58082f1c71d435d8
+Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules
index a2441b96..ae5d7192 160000
--- a/rd-submodules/shared-modules
+++ b/rd-submodules/shared-modules
@@ -1 +1 @@
-Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42
+Subproject commit ae5d7192c6a37f2c754fd92685a72d514931131a

From ebcc5c5bfe3b69f992f0baf68286e436a3598666 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Fri, 31 Mar 2023 14:34:24 -0400
Subject: [PATCH 33/35] Patch engine fixes and upgrades

---
 functions.sh | 86 ++++++++++++++++++++++++++++------------------------
 1 file changed, 47 insertions(+), 39 deletions(-)

diff --git a/functions.sh b/functions.sh
index b0da3604..cf91b693 100644
--- a/functions.sh
+++ b/functions.sh
@@ -224,14 +224,14 @@ desktop_mode_warning() {
       --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
       --title "RetroDECK Desktop Mode Warning" \
       --text="You appear to be running RetroDECK in the Steam Deck's Desktop mode!\n\nSome functions of RetroDECK may not work properly in Desktop mode, such as the Steam Deck's normal controls.\n\nRetroDECK is best enjoyed in Game mode!\n\nDo you still want to proceed?")
-    fi
-  fi
-  rc=$? # Capture return code, as "Yes" button has no text value
-  if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked
-    if [[ $choice == "No" ]]; then
-      exit 1
-    elif [[ $choice == "Never show this again" ]]; then
-      set_setting_value $rd_conf "desktop_mode_warning" "false" retrodeck # Store desktop mode warning variable for future checks
+      rc=$? # Capture return code, as "Yes" button has no text value
+      if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked
+        if [[ $choice == "No" ]]; then
+          exit 1
+        elif [[ $choice == "Never show this again" ]]; then
+          set_setting_value $rd_conf "desktop_mode_warning" "false" retrodeck # Store desktop mode warning variable for future checks
+        fi
+      fi
     fi
   fi
 }
@@ -248,38 +248,38 @@ set_setting_value() {
 
     "retrodeck" | "citra" | "melonds" | "yuzu" )
       if [[ -z $current_section_name ]]; then
-        sed -i 's^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' $1
+        sed -i 's^\^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' $1
       else
-        sed -i '\^\['"$current_section_name"'\]^,\^'"$setting_name_to_change"'.*^s^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' $1
+        sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'.*^s^\^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' $1
       fi
       ;;
 
     "retroarch" )
       if [[ -z $current_section_name ]]; then
-        sed -i 's^'"$setting_name_to_change"' = \".*\"^'"$setting_name_to_change"' = \"'"$setting_value_to_change"'\"^' $1
+        sed -i 's^\^'"$setting_name_to_change"' = \".*\"^'"$setting_name_to_change"' = \"'"$setting_value_to_change"'\"^' $1
       else
-        sed -i '\^\['"$current_section_name"'\]^,\^'"$setting_name_to_change"'.*^s^'"$setting_name_to_change"' = \".*\"^'"$setting_name_to_change"' = \"'"$setting_value_to_change"'\"^' $1
+        sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'.*^s^\^'"$setting_name_to_change"' = \".*\"^'"$setting_name_to_change"' = \"'"$setting_value_to_change"'\"^' $1
       fi
       ;;
 
-    "dolphin" | "duckstation" | "pcsx2" | "ppsspp" | "xemu" )
+    "dolphin" | "duckstation" | "pcsx2" | "ppsspp" | "primehack" | "xemu" )
       if [[ -z $current_section_name ]]; then
-        sed -i 's^'"$setting_name_to_change"' =.*^'"$setting_name_to_change"' = '"$setting_value_to_change"'^' $1
+        sed -i 's^\^'"$setting_name_to_change"' =.*^'"$setting_name_to_change"' = '"$setting_value_to_change"'^' $1
       else
-        sed -i '\^\['"$current_section_name"'\]^,\^'"$setting_name_to_change"'.*^s^'"$setting_name_to_change"' =.*^'"$setting_name_to_change"' = '"$setting_value_to_change"'^' $1
+        sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'.*^s^\^'"$setting_name_to_change"' =.*^'"$setting_name_to_change"' = '"$setting_value_to_change"'^' $1
       fi
       ;;
 
     "rpcs3" ) # This does not currently work for settings with a $ in them
       if [[ -z $current_section_name ]]; then
-        sed -i 's^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' $1
+        sed -i 's^\^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' $1
       else
-        sed -i '\^\['"$current_section_name"'\]^,\^'"$setting_name_to_change"'.*^s^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' $1
+        sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'.*^s^\^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' $1
       fi
       ;;
 
     "emulationstation" )
-      sed -i "s%$setting_name_to_change\" \" value=\".*\"%$setting_name_to_change\" \" value=\"$setting_value_to_change\"" $1
+      sed -i "s%^$setting_name_to_change\" \" value=\".*\"%$setting_name_to_change\" \" value=\"$setting_value_to_change\"" $1
       ;;
 
   esac
@@ -321,7 +321,7 @@ get_setting_value() {
     if [[ -z $current_section_name ]]; then
       echo $(grep -o -P "(?<=^$current_setting_name=).*" $1)
     else
-      sed -n '\^\['"$current_section_name"'\]^,\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name=).*"
+      sed -n '\^\['"$current_section_name"'\]^,\^\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^\^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name=).*"
     fi
   ;;
 
@@ -329,15 +329,15 @@ get_setting_value() {
     if [[ -z $current_section_name ]]; then
       echo $(grep -o -P "(?<=^$current_setting_name = \").*(?=\")" $1)
     else
-      sed -n '\^\['"$current_section_name"'\]^,\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name = \").*(?=\")"
+      sed -n '\^\['"$current_section_name"'\]^,\^\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^\^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name = \").*(?=\")"
     fi
   ;;
 
-  "dolphin" | "duckstation" | "pcsx2" | "ppsspp" | "xemu" ) # For files with this syntax - setting_name = setting_value
+  "dolphin" | "duckstation" | "pcsx2" | "ppsspp" | "primehack" | "xemu" ) # For files with this syntax - setting_name = setting_value
     if [[ -z $current_section_name ]]; then
       echo $(grep -o -P "(?<=^$current_setting_name = ).*" $1)
     else
-      sed -n '\^\['"$current_section_name"'\]^,\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name = ).*"
+      sed -n '\^\['"$current_section_name"'\]^,\^\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^\^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name = ).*"
     fi
   ;;
 
@@ -345,7 +345,7 @@ get_setting_value() {
     if [[ -z $current_section_name ]]; then
       echo $(grep -o -P "(?<=$current_setting_name: ).*" $1)
     else
-      sed -n '\^\['"$current_section_name"'\]^,\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=$current_setting_name: ).*"
+      sed -n '\^\['"$current_section_name"'\]^,\^\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^\^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=$current_setting_name: ).*"
     fi
   ;;
 
@@ -380,7 +380,7 @@ disable_setting() {
   # This function will add a '#' to the beginning of a defined setting line, disabling it.
   # USAGE: disable_setting $setting_file $setting_line $system $section (optional)
 
-  local current_setting_line"$2"
+  local current_setting_line="$2"
   local current_section_name="$4"
 
   case $3 in
@@ -400,7 +400,7 @@ enable_setting() {
   # This function will remove a '#' to the beginning of a defined setting line, enabling it.
   # USAGE: enable_setting $setting_file $setting_line $system $section (optional)
 
-  local current_setting_line"$2"
+  local current_setting_line="$2"
   local current_section_name="$4"
 
   case $3 in
@@ -545,31 +545,35 @@ do
   case $action in
 
 	"disable_file" )
-    disable_file $setting_name
+    eval disable_file $setting_name
 	;;
 
 	"enable_file" )
-    enable_file $setting_name
+    eval enable_file $setting_name
 	;;
 
 	"add_setting" )
-    add_setting $3 "$setting_name" $system_name $current_section
+    eval add_setting $3 "$setting_name" $system_name $current_section
 	;;
 
 	"disable_setting" )
-    disable_setting $3 "$setting_name" $system_name $current_section
+    eval disable_setting $3 "$setting_name" $system_name $current_section
 	;;
 
 	"enable_setting" )
-    enable_setting $3 "$setting_name" $system_name $current_section
+    eval enable_setting $3 "$setting_name" $system_name $current_section
 	;;
 
 	"change" )
-    set_setting_value $3 "$setting_name" "$setting_value" $system_name $current_section
+    eval set_setting_value $3 "$setting_name" "$setting_value" $system_name $current_section
   ;;
 
+  *"#"* )
+	  # Comment line in patch file
+	;;
+
 	* )
-	  echo "Config file malformed"
+	  echo "Config line malformed: $action"
 	;;
 
   esac
@@ -588,31 +592,35 @@ do
   case $action in
 
 	"disable_file" )
-    disable_file $config_file
+    eval disable_file $config_file
 	;;
 
 	"enable_file" )
-    enable_file $config_file
+    eval enable_file $config_file
 	;;
 
 	"add_setting" )
-    add_setting $config_file "$setting_name" $system_name $current_section
+    eval add_setting $config_file "$setting_name" $system_name $current_section
 	;;
 
 	"disable_setting" )
-    disable_setting $config_file "$setting_name" $system_name $current_section
+    eval disable_setting $config_file "$setting_name" $system_name $current_section
 	;;
 
 	"enable_setting" )
-    enable_setting $config_file "$setting_name" $system_name $current_section
+    eval enable_setting $config_file "$setting_name" $system_name $current_section
 	;;
 
 	"change" )
-    set_setting_value $config_file "$setting_name" "$setting_value" $system_name $current_section
+    eval set_setting_value $config_file "$setting_name" "$setting_value" $system_name $current_section
   ;;
 
+  *"#"* )
+	  # Comment line in patch file
+	;;
+
 	* )
-	  echo "Config file malformed"
+	  echo "Config line malformed: $action"
 	;;
 
   esac

From 1f4f19bae057d9b1c0f2bba1431b39da032f16b3 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Fri, 31 Mar 2023 14:34:48 -0400
Subject: [PATCH 34/35] Primehack: Fix default AR and audio output

---
 emu-configs/primehack/Dolphin.ini | 2 +-
 emu-configs/primehack/GFX.ini     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emu-configs/primehack/Dolphin.ini b/emu-configs/primehack/Dolphin.ini
index 7731928e..5ecd48e0 100644
--- a/emu-configs/primehack/Dolphin.ini
+++ b/emu-configs/primehack/Dolphin.ini
@@ -59,7 +59,7 @@ ThemeName = Clean
 DebugModeEnabled = False
 CursorVisibility = 2
 [DSP]
-Backend = No Audio Output
+Backend = Pulse
 EnableJIT = False
 DSPThread = True
 [GBA]
diff --git a/emu-configs/primehack/GFX.ini b/emu-configs/primehack/GFX.ini
index 4ffbf202..73e36e2e 100644
--- a/emu-configs/primehack/GFX.ini
+++ b/emu-configs/primehack/GFX.ini
@@ -16,7 +16,7 @@ Lock Camera in Motion Puzzles = True
 ReduceBloom = True
 ToggleArmRePosition = True
 [Settings]
-AspectRatio = 3
+AspectRatio = 1
 BackendMultithreading = True
 DumpBaseTextures = True
 DumpMipTextures = True

From c0059ec3a44de3979fa00224c5b0a77144e09b7a Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Fri, 31 Mar 2023 15:45:46 -0400
Subject: [PATCH 35/35] Create update script for 0.6.4b config changes

---
 emu-configs/PCSX2-QT/PCSX2.ini                |  2 +-
 emu-configs/PCSX2/PCSX2.ini                   |  1 +
 emu-configs/patches/updates/064b_update.patch |  6 ++++++
 emu-configs/primehack/Dolphin.ini             |  2 +-
 post_update.sh                                | 10 +++++++++-
 5 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 emu-configs/patches/updates/064b_update.patch

diff --git a/emu-configs/PCSX2-QT/PCSX2.ini b/emu-configs/PCSX2-QT/PCSX2.ini
index 5ed8407b..7e428798 100644
--- a/emu-configs/PCSX2-QT/PCSX2.ini
+++ b/emu-configs/PCSX2-QT/PCSX2.ini
@@ -1,7 +1,7 @@
 [UI]
 SettingsVersion = 1
 InhibitScreensaver = true
-ConfirmShutdown = true
+ConfirmShutdown = false
 StartPaused = false
 PauseOnFocusLoss = false
 StartFullscreen = true
diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini
index e1d8bec8..abeccf07 100644
--- a/emu-configs/PCSX2/PCSX2.ini
+++ b/emu-configs/PCSX2/PCSX2.ini
@@ -4,6 +4,7 @@ MainWindowGeometry = AdnQywADAAAAAAAAAAAAAAAAA7UAAAJ/AAAAAAAAAAAAAAO1AAACfwAAAAA
 MainWindowState = AAAA/wAAAAD9AAAAAAAAA7YAAAJXAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAA==
 PauseOnFocusLoss = true
 StartFullscreen = true
+ConfirmShutdown = false
 
 
 [EmuCore]
diff --git a/emu-configs/patches/updates/064b_update.patch b/emu-configs/patches/updates/064b_update.patch
new file mode 100644
index 00000000..3502b91d
--- /dev/null
+++ b/emu-configs/patches/updates/064b_update.patch
@@ -0,0 +1,6 @@
+# Primehack Changes: Assign audio output, change AR to "Force 16:9"
+change^DSP^Backend^Pulse^primehack^$primehackconf
+change^Settings^AspectRatio^1^primehack^$primehackgfxconf
+# Update "ask on quit" and "save on quit" on supported emulators (PCSX2, Duckstation)
+change^UI^ConfirmShutdown^false^pcsx2^$pcsx2qtconf
+change^Main^ConfirmPowerOff^false^duckstation^$duckstationconf
\ No newline at end of file
diff --git a/emu-configs/primehack/Dolphin.ini b/emu-configs/primehack/Dolphin.ini
index 5ecd48e0..89358dd0 100644
--- a/emu-configs/primehack/Dolphin.ini
+++ b/emu-configs/primehack/Dolphin.ini
@@ -48,7 +48,7 @@ DisableScreenSaver = True
 KeepWindowOnTop = False
 Fullscreen = True
 [Interface]
-ConfirmStop = False
+ConfirmStop = True
 LanguageCode =
 OnScreenDisplayMessages = True
 PauseOnFocusLost = False
diff --git a/post_update.sh b/post_update.sh
index 8b79912c..361d15f4 100644
--- a/post_update.sh
+++ b/post_update.sh
@@ -200,7 +200,7 @@ post_update() {
     dir_prep "$bios_folder/pico-8/cdata" "$saves_folder/pico-8" # PICO-8 saves folder
   fi
   if [[ $prev_version -le "063" ]]; then
-    # In version 0.6.2b, the following changes were made that required config file updates/reset:
+    # In version 0.6.3b, the following changes were made that required config file updates/reset:
     # - Put Dolphin and Primehack save states in different folders inside $rd_home/states
     # - Fix symlink to hard-coded PICO-8 config folder (dir_prep doesn't like ~)
     # - Overwrite Citra and Yuzu configs, as controller mapping was broken due to emulator updates.
@@ -221,6 +221,14 @@ post_update() {
     # Remove unneeded tools folder, as location has changed to RO space
     rm -rfv /var/config/retrodeck/tools/
   fi
+  if [[ $prev_version -le "064" ]]; then
+    # In version 0.6.4b, the following changes were made:
+    # Changed settings in Primehack: The audio output was not selected by default, default AR was also incorrect.
+    # Changed settings in Duckstation and PCSX2: The "ask on exit" was disabled and "save on exit" was enabled.
+    # The default configs have been updated for new installs and resets, a patch was created to address existing installs.
+
+    deploy_multi_patch "emu-configs/patches/updates/064b_update.patch"
+  fi
 
   # The following commands are run every time.