Merge branch 'cooker-0.8.0b' into feat/steam-sync

.github/workflows/cooker-selfhosted-persistent.yml

@@ -46,6 +46,33 @@ jobs:
       - name: Generate cooker build ID
         run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/cooker_build_id.sh"
 
+      - name: Get branch name
+        id: branch_name
+        run: echo "BRANCH_NAME=$(echo $GITHUB_REF | sed 's|refs/heads/||')" >> $GITHUB_ENV
+
+      # if it's a feature branch it will not marked as "latest" cooker version
+      - name: "Set makeLatest (cooker only)"
+        run: |
+          if [[ "$BRANCH_NAME" == 'feat/'* || "$BRANCH_NAME" == 'refs/'* ]]; then
+            echo "MAKE_LATEST=false" >> $GITHUB_ENV
+          else
+            echo "MAKE_LATEST=true" >> $GITHUB_ENV
+          fi
+
+      # if the branch is coming from a PR the tag should be manually built
+      - name: "Generate version tag"
+        run: |
+          if [[ "$BRANCH_NAME" == 'refs/'* ]]; then
+            pr_number=$(echo ${{env.BRANCH_NAME}} | awk -F'/' '{print $3}')
+            source_branch=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK/pulls/$pr_number" | jq -r '.head.ref')
+            source_branch=${source_branch//\//-}
+            echo "[DEBUG] source branch is: $source_branch"
+            echo "TAG=PR-$pr_number-$source_branch-${{ env.buildid }}" >> $GITHUB_ENV
+          else
+            echo "TAG=${{env.BRANCH_NAME}}-${{ env.buildid }}" >> $GITHUB_ENV
+          fi
+          echo "Version TAG: ${{ env.TAG }}"
+
       # backing up manifest in case download fails and hashes must be recalculated
       - name: Manifest backup
         run: "cp ${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml ${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml.bak"
@@ -106,23 +133,10 @@ jobs:
         id: commits
         continue-on-error: true
 
-      - name: Get branch name
-        id: branch_name
-        run: echo "BRANCH_NAME=$(echo $GITHUB_REF | sed 's|refs/heads/||')" >> $GITHUB_ENV
-
-      # if it's a feature branch it will not marked as "latest" cooker version
-      - name: "Set makeLatest (cooker only)"
-        run: |
-          if [[ "$BRANCH_NAME" == 'feat/'* ]]; then
-            echo "MAKE_LATEST=false" >> $GITHUB_ENV
-          else
-            echo "MAKE_LATEST=true" >> $GITHUB_ENV
-          fi
-
       - name: Publish the flatpak in a new cooker release
         uses: ncipollo/release-action@v1
         with:
-          tag: "${{env.BRANCH_NAME}}-${{ env.buildid }}"
+          tag: "${{env.TAG}}"
           body: |
             # Release Notes (Cooker)
             This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.

automation_tools/install_dependencies.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # This scritp is installing the required dependencies to correctly run the pipeline and buold the flatpak
 
-sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2 curl
+sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2 curl jq
 flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo

emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg

@@ -40,3 +40,4 @@ sega32xjp
 sega32xna
 snes
 snesna
+tg16

emu-configs/defaults/retrodeck/reference_lists/easter_egg_checklist.cfg

@@ -2,3 +2,4 @@
 0209^0212^0000^2359^rd-lunar-dragon-splash.svg
 0214^0214^0001^2359^rd-valentines-splash.svg
 0317^0317^0000^2359^rd-stpatricks-splash.svg
+0429^0505^0000^2359^rd-kodomo-golden.svg

emu-configs/defaults/retrodeck/reference_lists/finit_options_list.cfg

@@ -1,2 +1,3 @@
 false^RPCS3 Firmware Install^Install firmware needed for PS3 emulation^rpcs3_firmware
+false^Vita3K Firmware Install^Install firmware needed for Vita3K emulation^vita3k_firmware
 false^RetroDECK Controller Profile^Install custom RetroDECK controller profile^rd_controller_profile

emu-configs/defaults/retrodeck/reference_lists/zip_compressable_extensions.cfg

@@ -40,7 +40,9 @@
 .msa
 .nds
 .nes
+.ngc
 .o
+.pce
 .prg
 .rom
 .sfc
@@ -58,3 +60,4 @@
 .unif
 .xex
 .xfd
+.z64

emu-configs/defaults/retrodeck/retrodeck.cfg

@@ -21,6 +21,7 @@ desktop_mode_warning=true
 low_space_warning=true
 update_check=false
 update_repo=RetroDECK
+branch=
 update_ignore=
 cloud_saves=false
 multi_user_mode=false

emu-configs/mame/mame-rdwrapper.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+mame -inipath /var/config/mame

emu-configs/mame/mame.ini

@@ -7,31 +7,31 @@ writeconfig               0
 #
 # CORE SEARCH PATH OPTIONS
 #
-homepath                  /var/config/mame
+homepath                  /var/data/mame/plugin-data
-rompath                   RETRODECKROMSDIR
+rompath                   RETRODECKROMSDIR/mame/;RETRODECKROMSDIR/arcade/;RETRODECKROMSDIR/bbcmicro/
-hashpath                  /app/share/mame/hash
+hashpath                  /var/data/mame/hash
-samplepath                /app/share/mame/samples
+samplepath                /var/data/mame/assets/samples
-artpath                   RETRODECKHOMEDIR/downloaded_media/arcade/screenshots/
+artpath                   /var/data/mame/assets/artwork
-ctrlrpath                 /app/share/mame/ctrlr
+ctrlrpath                 /var/config/ctrlr
-inipath                   /var/config/mame
+inipath                   /var/config/mame/ini
-fontpath                  /app/bin/
+fontpath                  /var/data/mame/assets/fonts
-cheatpath                 /app/share/mame/cheat
+cheatpath                 /var/data/mame/cheat
-crosshairpath             /app/share/mame/crosshair
+crosshairpath             /var/data/mame/assets/crosshair
-pluginspath               /app/share/mame/plugins
+pluginspath               /var/data/mame/plugins
-languagepath              /app/share/mame/language
+languagepath              /var/data/mame/assets/language
-swpath                    /app/share/mame/software
+swpath                    /var/data/mame/assets/software
 
 #
 # CORE OUTPUT DIRECTORY OPTIONS
 #
 cfg_directory             /var/config/mame/cfg
-nvram_directory           /var/config/mame/nvram
+nvram_directory           RETRODECKSAVESDIR/mame-sa/nvram
 input_directory           /var/config/mame/inp
-state_directory           RETRODECKSAVESDIR/mame-sa/states
+state_directory           RETRODECKSTATESDIR/mame-sa
-snapshot_directory        RETRODECKHOMEDIR/screenshots
+snapshot_directory        RETRODECKHOMEDIR/screenshots/mame-sa
-diff_directory            /var/config/mame/diff
+diff_directory            RETRODECKSAVESDIR/mame-sa/diff
-comment_directory         /var/config/mame/comments
+comment_directory         /var/data/mame/assets/comments
-share_directory           /var/config/mame/share
+share_directory           /var/data/mame/assets/share
 
 #
 # CORE STATE/PLAYBACK OPTIONS
@@ -234,7 +234,7 @@ output                    auto
 keyboardprovider          auto
 mouseprovider             auto
 lightgunprovider          auto
-joystickprovider          auto
+joystickprovider          sdljoy
 
 #
 # OSD DEBUGGING OPTIONS
@@ -353,7 +353,7 @@ networkprovider           auto
 #
 # BGFX POST-PROCESSING OPTIONS
 #
-bgfx_path                 bgfx
+bgfx_path                 /app/share/mame/bgfx
 bgfx_backend              auto
 bgfx_debug                0
 bgfx_screen_chains        

emu-configs/mame/ui.ini

@@ -1,26 +1,26 @@
 #
 # UI SEARCH PATH OPTIONS
 #
-historypath               history;dats;.
+historypath               /var/data/mame/dats
-categorypath              folders
+categorypath              /var/data/mame/folders
-cabinets_directory        cabinets;cabdevs
+cabinets_directory        /var/data/mame/assets/cabinets
-cpanels_directory         cpanel
+cpanels_directory         /var/data/mame/assets/cpanel
-pcbs_directory            pcb
+pcbs_directory            /var/data/mame/assets/pcb
-flyers_directory          flyers
+flyers_directory          /var/data/mame/assets/flyers
-titles_directory          titles
+titles_directory          /var/data/mame/assets/titles
-ends_directory            ends
+ends_directory            /var/data/mame/assets/ends
-marquees_directory        marquees;RETRODECKHOMEDIR/downloaded_media/arcade/marquees
+marquees_directory        /var/data/mame/assets/marquees
-artwork_preview_directory "artwork preview;artpreview"
+artwork_preview_directory /var/data/mame/assets/artwork-preview
-bosses_directory          bosses
+bosses_directory          /var/data/mame/assets/bosses
-logos_directory           logo
+logos_directory           /var/data/mame/assets/logo
-scores_directory          scores
+scores_directory          /var/data/mame/assets/scores
-versus_directory          versus
+versus_directory          /var/data/mame/assets/versus
-gameover_directory        gameover
+gameover_directory        /var/data/mame/assets/gameover
-howto_directory           howto
+howto_directory           /var/data/mame/assets/howto
-select_directory          select
+select_directory          /var/data/mame/assets/select
-icons_directory           icons
+icons_directory           /var/data/mame/assets/icons
-covers_directory          covers;RETRODECKHOMEDIR/downloaded_media/arcade/covers
+covers_directory          /var/data/mame/assets/covers
-ui_path                   ui
+ui_path                   /var/data/mame/assets/ui
 
 #
 # UI MISC OPTIONS
@@ -62,7 +62,7 @@ remember_last             0
 last_used_filter          Available
 system_right_panel        image
 software_right_panel      image
-system_right_image        cover
+system_right_image        snap
 software_right_image      snap
 enlarge_snaps             1
 forced4x3                 1

emu-configs/ryujinx/Config.json

@@ -1,5 +1,5 @@
 {
-  "version": 48,
+  "version": 49,
   "enable_file_log": true,
   "backend_threading": "Auto",
   "res_scale": 1,
@@ -12,7 +12,7 @@
   "graphics_shaders_dump_path": "",
   "logging_enable_debug": false,
   "logging_enable_stub": false,
-  "logging_enable_info": true,
+  "logging_enable_info": false,
   "logging_enable_warn": true,
   "logging_enable_error": true,
   "logging_enable_trace": false,
@@ -91,13 +91,13 @@
   "enable_keyboard": false,
   "enable_mouse": false,
   "hotkeys": {
-    "toggle_vsync": "F1",
+    "toggle_vsync": "Unknown",
-    "screenshot": "F8",
+    "screenshot": "Unknown",
-    "show_ui": "F4",
+    "show_ui": "F1",
-    "pause": "F5",
+    "pause": "F4",
-    "toggle_mute": "F2",
+    "toggle_mute": "Unknown",
-    "res_scale_up": "Unbound",
+    "res_scale_up": "F7",
-    "res_scale_down": "Unbound",
+    "res_scale_down": "F8",
     "volume_up": "Unbound",
     "volume_down": "Unbound"
   },
@@ -121,22 +121,27 @@
       },
       "deadzone_left": 0,
       "deadzone_right": 0,
-      "range_left": 1,
+      "range_left": 1.2,
       "range_right": 1,
-      "trigger_threshold": 0.5,
+      "trigger_threshold": 0,
       "motion": {
-        "motion_backend": "GamepadDriver",
+        "slot": 0,
+        "alt_slot": 0,
+        "mirror_input": false,
+        "dsu_server_host": "127.0.0.1",
+        "dsu_server_port": 26760,
+        "motion_backend": "CemuHook",
         "sensitivity": 100,
         "gyro_deadzone": 1,
         "enable_motion": true
       },
       "rumble": {
-        "strong_rumble": 1,
+        "strong_rumble": 2.1,
         "weak_rumble": 1,
         "enable_rumble": true
       },
       "left_joycon": {
-        "button_minus": "Minus",
+        "button_minus": "Back",
         "button_l": "LeftShoulder",
         "button_zl": "LeftTrigger",
         "button_sl": "Unbound",
@@ -147,7 +152,7 @@
         "dpad_right": "DpadRight"
       },
       "right_joycon": {
-        "button_plus": "Plus",
+        "button_plus": "Start",
         "button_r": "RightShoulder",
         "button_zr": "RightTrigger",
         "button_sl": "Unbound",
@@ -160,12 +165,190 @@
       "version": 1,
       "backend": "GamepadSDL2",
       "id": "0-f6790003-28de-0000-ff11-000001000000",
-      "controller_type": "Handheld",
+      "controller_type": "ProController",
-      "player_index": "Handheld"
+      "player_index": "Player1"
+    },
+    {
+      "left_joycon_stick": {
+        "joystick": "Left",
+        "invert_stick_x": false,
+        "invert_stick_y": false,
+        "rotate90_cw": false,
+        "stick_button": "LeftStick"
+      },
+      "right_joycon_stick": {
+        "joystick": "Right",
+        "invert_stick_x": false,
+        "invert_stick_y": false,
+        "rotate90_cw": false,
+        "stick_button": "RightStick"
+      },
+      "deadzone_left": 0,
+      "deadzone_right": 0,
+      "range_left": 1.2,
+      "range_right": 1,
+      "trigger_threshold": 0,
+      "motion": {
+        "motion_backend": "GamepadDriver",
+        "sensitivity": 100,
+        "gyro_deadzone": 1,
+        "enable_motion": false
+      },
+      "rumble": {
+        "strong_rumble": 1,
+        "weak_rumble": 1,
+        "enable_rumble": true
+      },
+      "left_joycon": {
+        "button_minus": "Back",
+        "button_l": "LeftShoulder",
+        "button_zl": "LeftTrigger",
+        "button_sl": "Unbound",
+        "button_sr": "Unbound",
+        "dpad_up": "DpadUp",
+        "dpad_down": "DpadDown",
+        "dpad_left": "DpadLeft",
+        "dpad_right": "DpadRight"
+      },
+      "right_joycon": {
+        "button_plus": "Start",
+        "button_r": "RightShoulder",
+        "button_zr": "RightTrigger",
+        "button_sl": "Unbound",
+        "button_sr": "Unbound",
+        "button_x": "Y",
+        "button_b": "A",
+        "button_y": "X",
+        "button_a": "B"
+      },
+      "version": 1,
+      "backend": "GamepadSDL2",
+      "id": "1-00000003-28de-0000-ff11-000001000000",
+      "controller_type": "ProController",
+      "player_index": "Player2"
+    },
+    {
+      "left_joycon_stick": {
+        "joystick": "Left",
+        "invert_stick_x": false,
+        "invert_stick_y": false,
+        "rotate90_cw": false,
+        "stick_button": "LeftStick"
+      },
+      "right_joycon_stick": {
+        "joystick": "Right",
+        "invert_stick_x": false,
+        "invert_stick_y": false,
+        "rotate90_cw": false,
+        "stick_button": "RightStick"
+      },
+      "deadzone_left": 0,
+      "deadzone_right": 0,
+      "range_left": 1.2,
+      "range_right": 1,
+      "trigger_threshold": 0,
+      "motion": {
+        "motion_backend": "GamepadDriver",
+        "sensitivity": 100,
+        "gyro_deadzone": 1,
+        "enable_motion": false
+      },
+      "rumble": {
+        "strong_rumble": 1,
+        "weak_rumble": 1,
+        "enable_rumble": true
+      },
+      "left_joycon": {
+        "button_minus": "Back",
+        "button_l": "LeftShoulder",
+        "button_zl": "LeftTrigger",
+        "button_sl": "Unbound",
+        "button_sr": "Unbound",
+        "dpad_up": "DpadUp",
+        "dpad_down": "DpadDown",
+        "dpad_left": "DpadLeft",
+        "dpad_right": "DpadRight"
+      },
+      "right_joycon": {
+        "button_plus": "Start",
+        "button_r": "RightShoulder",
+        "button_zr": "RightTrigger",
+        "button_sl": "Unbound",
+        "button_sr": "Unbound",
+        "button_x": "Y",
+        "button_b": "A",
+        "button_y": "X",
+        "button_a": "B"
+      },
+      "version": 1,
+      "backend": "GamepadSDL2",
+      "id": "2-00000003-28de-0000-ff11-000001000000",
+      "controller_type": "ProController",
+      "player_index": "Player3"
+    },
+    {
+      "left_joycon_stick": {
+        "joystick": "Left",
+        "invert_stick_x": false,
+        "invert_stick_y": false,
+        "rotate90_cw": false,
+        "stick_button": "LeftStick"
+      },
+      "right_joycon_stick": {
+        "joystick": "Right",
+        "invert_stick_x": false,
+        "invert_stick_y": false,
+        "rotate90_cw": false,
+        "stick_button": "RightStick"
+      },
+      "deadzone_left": 0,
+      "deadzone_right": 0,
+      "range_left": 1.2,
+      "range_right": 1,
+      "trigger_threshold": 0,
+      "motion": {
+        "motion_backend": "GamepadDriver",
+        "sensitivity": 100,
+        "gyro_deadzone": 1,
+        "enable_motion": false
+      },
+      "rumble": {
+        "strong_rumble": 1,
+        "weak_rumble": 1,
+        "enable_rumble": true
+      },
+      "left_joycon": {
+        "button_minus": "Back",
+        "button_l": "LeftShoulder",
+        "button_zl": "LeftTrigger",
+        "button_sl": "Unbound",
+        "button_sr": "Unbound",
+        "dpad_up": "DpadUp",
+        "dpad_down": "DpadDown",
+        "dpad_left": "DpadLeft",
+        "dpad_right": "DpadRight"
+      },
+      "right_joycon": {
+        "button_plus": "Start",
+        "button_r": "RightShoulder",
+        "button_zr": "RightTrigger",
+        "button_sl": "Unbound",
+        "button_sr": "Unbound",
+        "button_x": "Y",
+        "button_b": "A",
+        "button_y": "X",
+        "button_a": "B"
+      },
+      "version": 1,
+      "backend": "GamepadSDL2",
+      "id": "3-00000003-28de-0000-ff11-000001000000",
+      "controller_type": "ProController",
+      "player_index": "Player4"
     }
   ],
   "graphics_backend": "Vulkan",
   "preferred_gpu": "0x1002_0x163F",
+  "multiplayer_mode": 0,
   "multiplayer_lan_interface_id": "0",
   "use_hypervisor": true
 }

emu-configs/yuzu/qt-config.ini

@@ -815,9 +815,9 @@ gamecard_path=
 gamecard_path\default=true
 load_directory=/var/data/yuzu/load
 load_directory\default=true
-nand_directory=RETRODECKHOMEDIR/saves/switch/yuzu/nand
+nand_directory=RETRODECKHOMEDIR/saves/switch/nand
 nand_directory\default=true
-sdmc_directory=RETRODECKHOMEDIR/saves/switch/yuzu/sdmc
+sdmc_directory=RETRODECKHOMEDIR/saves/switch/sdmc
 sdmc_directory\default=true
 tas_directory=/var/data/yuzu/tas
 tas_directory\default=true

es-configs/es_find_rules.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- This is the ES-DE find rules configuration file for Unix -->
+<!-- This is the ES-DE find rules configuration file for Linux -->
 <ruleList>
     <emulator name="OS-SHELL">
         <!-- Operating system shell -->
@@ -42,10 +42,6 @@
             <entry>/usr/lib64/libretro</entry>
             <!-- Manjaro repository -->
             <entry>/usr/lib/libretro</entry>
-            <!-- FreeBSD and OpenBSD repository -->
-            <entry>/usr/local/lib/libretro</entry>
-            <!-- NetBSD repository -->
-            <entry>/usr/pkg/lib/libretro</entry>
         </rule>
     </core>
     <emulator name="3DSEN-WINDOWS">
@@ -69,6 +65,18 @@
             <entry>~/bin/advancemame/advmame</entry>
         </rule>
     </emulator>
+    <emulator name="AMIBERRY">
+        <!-- Commodore Amiga emulator Amiberry -->
+        <rule type="systempath">
+            <entry>amiberry</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/amiberry/amiberry</entry>
+            <entry>~/.local/share/applications/amiberry/amiberry</entry>
+            <entry>~/.local/bin/amiberry/amiberry</entry>
+            <entry>~/bin/amiberry/amiberry</entry>
+        </rule>
+    </emulator>
     <emulator name="ARES">
         <!-- Multi-system emulator ares -->
         <rule type="systempath">
@@ -318,24 +326,35 @@
             <entry>org.flycast.Flycast</entry>
         </rule>
         <rule type="staticpath">
-            <entry>~/Applications/flycast*.AppImage</entry>
+            <entry>~/Applications/flycast-x86*.AppImage</entry>
-            <entry>~/.local/share/applications/flycast*.AppImage</entry>
+            <entry>~/.local/share/applications/flycast-x86*.AppImage</entry>
-            <entry>~/.local/bin/flycast*.AppImage</entry>
+            <entry>~/.local/bin/flycast-x86*.AppImage</entry>
-            <entry>~/bin/flycast*.AppImage</entry>
+            <entry>~/bin/flycast-x86*.AppImage</entry>
             <entry>/var/lib/flatpak/exports/bin/org.flycast.Flycast</entry>
             <entry>~/.local/share/flatpak/exports/bin/org.flycast.Flycast</entry>
         </rule>
     </emulator>
+    <emulator name="FLYCAST-DOJO">
+        <!-- Sega Dreamcast emulator Flycast Dojo -->
+        <rule type="systempath">
+            <entry>flycast-dojo</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/flycast-dojo*.AppImage</entry>
+            <entry>~/.local/share/applications/flycast-dojo*.AppImage</entry>
+            <entry>~/.local/bin/flycast-dojo*.AppImage</entry>
+            <entry>~/bin/flycast-dojo*.AppImage</entry>
+        </rule>
+    </emulator>
     <emulator name="FS-UAE">
         <!-- Commodore Amiga emulator FS-UAE -->
         <rule type="systempath">
-            <entry>fs-uae</entry>
+            <entry>fs-uae-launcher</entry>
-            <entry>fsuae.fs-uae</entry>
+            <entry>fsuae.launcher</entry>
-            <entry>net.fsuae.FS-UAE</entry>
         </rule>
         <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/net.fsuae.FS-UAE</entry>
+            <entry>/var/lib/flatpak/exports/bin/net.fsuae.FS-UAE|flatpak run --command=fs-uae-launcher net.fsuae.FS-UAE</entry>
-            <entry>~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE</entry>
+            <entry>~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE|flatpak run --command=fs-uae-launcher net.fsuae.FS-UAE</entry>
         </rule>
     </emulator>
     <emulator name="FUSE">
@@ -444,7 +463,7 @@
     <emulator name="MAME">
         <!-- Arcade emulator MAME -->
         <rule type="systempath">
-            <entry>mame</entry>
+            <entry>mame-rdwrapper.sh</entry>
             <entry>org.mamedev.MAME</entry>
         </rule>
         <rule type="staticpath">
@@ -649,6 +668,8 @@
             <entry>~/.local/share/applications/punes/punes</entry>
             <entry>~/.local/bin/punes/punes</entry>
             <entry>~/bin/punes/punes</entry>
+            <entry>/var/lib/flatpak/exports/bin/io.github.punesemu.puNES</entry>
+            <entry>~/.local/share/flatpak/exports/bin/io.github.punesemu.puNES</entry>
         </rule>
     </emulator>
     <emulator name="QUASI88">
@@ -721,16 +742,22 @@
     <emulator name="RYUJINX">
         <!-- Nintendo Switch emulator Ryujinx -->
         <rule type="systempath">
-            <entry>Ryujinx.sh</entry>
+	    <entry>Ryujinx.sh</entry> <!-- RetroDECK -->
+            <entry>Ryujinx</entry>
+            <entry>Ryujinx.Ava</entry>
             <entry>org.ryujinx.Ryujinx</entry>
         </rule>
         <rule type="staticpath">
             <entry>/var/lib/flatpak/exports/bin/org.ryujinx.Ryujinx</entry>
             <entry>~/.local/share/flatpak/exports/bin/org.ryujinx.Ryujinx</entry>
-            <entry>~/Applications/publish/Ryujinx.sh</entry>
+            <entry>~/Applications/publish/Ryujinx</entry>
-            <entry>~/.local/share/applications/publish/Ryujinx.sh</entry>
+            <entry>~/.local/share/applications/publish/Ryujinx</entry>
-            <entry>~/.local/bin/publish/Ryujinx.sh</entry>
+            <entry>~/.local/bin/publish/Ryujinx</entry>
-            <entry>~/bin/publish/Ryujinx.sh</entry>
+            <entry>~/bin/publish/Ryujinx</entry>
+            <entry>~/Applications/publish/Ryujinx.Ava</entry>
+            <entry>~/.local/share/applications/publish/Ryujinx.Ava</entry>
+            <entry>~/.local/bin/publish/Ryujinx.Ava</entry>
+            <entry>~/bin/publish/Ryujinx.Ava</entry>
         </rule>
     </emulator>
     <emulator name="SAMEBOY">
@@ -868,6 +895,19 @@
             <entry>~/.local/share/applications/Supermodel/supermodel</entry>
             <entry>~/.local/bin/Supermodel/supermodel</entry>
             <entry>~/bin/Supermodel/supermodel</entry>
+            <entry>/var/lib/flatpak/exports/bin/com.supermodel3.Supermodel</entry>
+            <entry>~/.local/share/flatpak/exports/bin/com.supermodel3.Supermodel</entry>
+        </rule>
+    </emulator>
+    <emulator name="TIC-80">
+        <!-- TIC-80 Fantasy Computer (game engine) -->
+        <rule type="systempath">
+            <entry>tic80</entry>
+            <entry>com.tic80.TIC_80</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/com.tic80.TIC_80</entry>
+            <entry>~/.local/share/flatpak/exports/bin/com.tic80.TIC_80</entry>
         </rule>
     </emulator>
     <emulator name="TRIFORCE">
@@ -950,6 +990,10 @@
             <entry>Vita3K</entry>
         </rule>
         <rule type="staticpath">
+            <entry>~/Applications/Vita3K*.AppImage</entry>
+            <entry>~/.local/share/applications/Vita3K*.AppImage</entry>
+            <entry>~/.local/bin/Vita3K*.AppImage</entry>
+            <entry>~/bin/Vita3K*.AppImage</entry>
             <entry>~/Applications/Vita3K/Vita3K</entry>
             <entry>~/.local/share/applications/Vita3K/Vita3K</entry>
             <entry>~/.local/bin/Vita3K/Vita3K</entry>

es-configs/es_settings.xml

@@ -2,6 +2,7 @@
 <bool name="AlternativeEmulatorPerGame" value="true" />
 <bool name="ApplicationUpdaterPrereleases" value="false" />
 <bool name="CollectionShowSystemInfo" value="true" />
+<bool name="CreatePlaceholderSystemDirectories" value="false" />
 <bool name="CustomEventScripts" value="false" />
 <bool name="DebugMode" value="false" />
 <bool name="DebugSkipInputLogging" value="false" />
@@ -21,6 +22,7 @@
 <bool name="GamelistVideoScanlines" value="false" />
 <bool name="InputIgnoreKeyboard" value="false" />
 <bool name="InputOnlyFirstController" value="false" />
+<bool name="InputSwapButtons" value="false" />
 <bool name="LegacyGamelistFileLocation" value="false" />
 <bool name="ListScrollOverlay" value="false" />
 <bool name="MAMENameStripExtraInfo" value="true" />
@@ -65,6 +67,7 @@
 <bool name="ScraperConvertUnderscores" value="true" />
 <bool name="ScraperExcludeRecursively" value="true" />
 <bool name="ScraperHaltOnInvalidMedia" value="false" />
+<bool name="ScraperIgnoreHTTP404Errors" value="true" />
 <bool name="ScraperIncludeFolders" value="true" />
 <bool name="ScraperInteractive" value="false" />
 <bool name="ScraperOverwriteData" value="false" />
@@ -145,13 +148,15 @@
 <string name="ScraperPasswordScreenScraper" value="" />
 <string name="ScraperRegion" value="eu" />
 <string name="ScraperUsernameScreenScraper" value="" />
-<string name="ScreensaverSlideshowImageDir" value="~/.emulationstation/slideshow/custom_images" />
+<string name="ScreensaverSlideshowCustomDir" value="" />
+<string name="ScreensaverSlideshowImageDir" value="/var/config/ES-DE/slideshow/custom_images" />
 <string name="ScreensaverType" value="video" />
 <string name="StartupSystem" value="" />
 <string name="SystemsSorting" value="default" />
 <string name="Theme" value="art-book-next-es-de" />
 <string name="ThemeAspectRatio" value="automatic" />
 <string name="ThemeColorScheme" value="art-book-next" />
+<string name="ThemeFontSize" value="" />
 <string name="ThemeSet" value="art-book-next-es-de" />
 <string name="ThemeTransitions" value="automatic" />
 <string name="ThemeVariant" value="system-multi-gamelist-list-immersive" />

es-configs/es_systems.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- This is the ES-DE game systems configuration file for Unix -->
+<!-- This is the ES-DE game systems configuration file for Linux -->
 <systemList>
     <system>
         <name>3do</name>
@@ -30,8 +30,8 @@
         <fullname>Adventure Game Studio Game Engine</fullname>
         <path>%ROMPATH%/ags</path>
         <extension>.desktop .sh</extension>
-        <command label="Native binary">%STARTDIR%=%GAMEDIR% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Shortcut or script">%STARTDIR%=%GAMEDIR% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
-        <platform>ags</platform>
+        <platform>pcwindows</platform>
         <theme>ags</theme>
     </system>
 -->
@@ -39,9 +39,11 @@
         <name>amiga</name>
         <fullname>Commodore Amiga</fullname>
         <path>%ROMPATH%/amiga</path>
-        <extension>.adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .rp9 .RP9 .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .uae .UAE .7z .7Z .zip .ZIP</extension>
+        <extension>.adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .rp9 .RP9 .uae .UAE .7z .7Z .zip .ZIP</extension>
         <command label="PUAE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM%</command>
         <command label="PUAE 2021">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM%</command>
+        <command label="FS-UAE (Standalone)">%EMULATOR_FS-UAE% %ROM%</command>
+        <command label="Amiberry (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_AMIBERRY% --autoload %ROM%</command>
         <platform>amiga</platform>
         <theme>amiga</theme>
     </system>
@@ -49,9 +51,11 @@
         <name>amiga1200</name>
         <fullname>Commodore Amiga 1200</fullname>
         <path>%ROMPATH%/amiga1200</path>
-        <extension>.adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .rp9 .RP9 .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .uae .UAE .7z .7Z .zip .ZIP</extension>
+        <extension>.adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .rp9 .RP9 .uae .UAE .7z .7Z .zip .ZIP</extension>
         <command label="PUAE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM%</command>
         <command label="PUAE 2021">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM%</command>
+        <command label="FS-UAE (Standalone)">%EMULATOR_FS-UAE% %ROM%</command>
+        <command label="Amiberry (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_AMIBERRY% --autoload %ROM%</command>
         <platform>amiga</platform>
         <theme>amiga1200</theme>
     </system>
@@ -59,9 +63,11 @@
         <name>amiga600</name>
         <fullname>Commodore Amiga 600</fullname>
         <path>%ROMPATH%/amiga600</path>
-        <extension>.adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .rp9 .RP9 .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .uae .UAE .7z .7Z .zip .ZIP</extension>
+        <extension>.adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .rp9 .RP9 .uae .UAE .7z .7Z .zip .ZIP</extension>
         <command label="PUAE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM%</command>
         <command label="PUAE 2021">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM%</command>
+        <command label="FS-UAE (Standalone)">%EMULATOR_FS-UAE% %ROM%</command>
+        <command label="Amiberry (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_AMIBERRY% --autoload %ROM%</command>
         <platform>amiga</platform>
         <theme>amiga600</theme>
     </system>
@@ -69,9 +75,11 @@
         <name>amigacd32</name>
         <fullname>Commodore Amiga CD32</fullname>
         <path>%ROMPATH%/amigacd32</path>
-        <extension>.adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .rp9 .RP9 .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .uae .UAE .7z .7Z .zip .ZIP</extension>
+        <extension>.adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .rp9 .RP9 .uae .UAE .7z .7Z .zip .ZIP</extension>
         <command label="PUAE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM%</command>
         <command label="PUAE 2021">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM%</command>
+        <command label="FS-UAE (Standalone)">%EMULATOR_FS-UAE% --config:amiga-model=CD32 %ROM%</command>
+        <command label="Amiberry (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_AMIBERRY% --model CD32 --autoload %ROM%</command>
         <platform>amigacd32</platform>
         <theme>amigacd32</theme>
     </system>
@@ -104,6 +112,7 @@
         <extension>.do .DO .dsk .DSK .nib .NIB .po .PO</extension>
         <!-- <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 - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "apple2e -rompath \"%GAMEDIRRAW%;%ROMPATH%/apple2\" -flop1 \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/apple2 apple2e -flop1 %ROM%</command>
         <platform>apple2</platform>
         <theme>apple2</theme>
@@ -114,7 +123,7 @@
         <fullname>Apple IIGS</fullname>
         <path>%ROMPATH%/apple2gs</path>
         <extension>.2mg .2MG .7z .7z .zip .ZIP</extension>
-        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "apple2gs -rompath %GAMEDIR%\;%ROMPATH%/apple2gs -flop3 \"%ROMRAW%\""</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "apple2gs -rompath \"%GAMEDIRRAW%;%ROMPATH%/apple2gs\" -flop3 \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/apple2gs apple2gs -flop3 %ROM%</command>
         <platform>apple2gs</platform>
         <theme>apple2gs</theme>
@@ -135,9 +144,9 @@
         <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 Dojo (Standalone)">%EMULATOR_FLYCAST-DOJO% %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 (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log %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>
@@ -148,7 +157,7 @@
         <fullname>Emerson Arcadia 2001</fullname>
         <path>%ROMPATH%/arcadia</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "arcadia -rompath %GAMEDIR%\;%ROMPATH%/arcadia -cart \"%ROMRAW%\""</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "arcadia -rompath \"%GAMEDIRRAW%;%ROMPATH%/arcadia\" -cart \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/arcadia arcadia -cart %ROM%</command>
         <platform>arcadia</platform>
         <theme>arcadia</theme>
@@ -181,7 +190,7 @@
         <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 - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "astrocde -rompath \"%GAMEDIRRAW%;%ROMPATH%/astrocde\" -cart \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/astrocde astrocde -cart %BASENAME%</command>
         <platform>astrocde</platform>
         <theme>astrocade</theme>
@@ -216,6 +225,7 @@
         <path>%ROMPATH%/atari7800</path>
         <extension>.a78 .A78 .bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="ProSystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM%</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "a7800 -rompath \"%GAMEDIRRAW%;%ROMPATH%/atari7800\" -cart \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/atari7800 a7800 -cart %ROM%</command>
         <platform>atari7800</platform>
         <theme>atari7800</theme>
@@ -289,9 +299,10 @@
         <name>atomiswave</name>
         <fullname>Sammy Corporation Atomiswave</fullname>
         <path>%ROMPATH%/atomiswave</path>
-        <extension>.bin .BIN .cdi .CDI .cue .CUE .dat .DAT .elf .ELF .gdi .GDI .iso .ISO .lst .LST .m3u .M3U .7z .7Z .zip .ZIP</extension>
+        <extension>.bin .BIN .dat .DAT .elf .ELF .lst .LST .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> -->
+        <!-- <command label="Flycast Dojo (Standalone)">%EMULATOR_FLYCAST-DOJO% %ROM%</command> -->
         <platform>arcade</platform>
         <theme>atomiswave</theme>
     </system>
@@ -320,15 +331,6 @@
         <platform>c64</platform>
         <theme>c64</theme>
     </system>
-    <system>
-        <name>cavestory</name>
-        <fullname>Cave Story (NXEngine)</fullname>
-        <path>%ROMPATH%/cavestory</path>
-        <extension>.exe .EXE .7z .7Z .zip .ZIP</extension>
-        <command label="NXEngine">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.so %ROM%</command>
-        <platform>cavestory</platform>
-        <theme>cavestory</theme>
-    </system>
     <system>
         <name>cdimono1</name>
         <fullname>Philips CD-i</fullname>
@@ -347,6 +349,8 @@
         <extension>.ccd .CCD .chd .CHD .cue .CUE .iso .ISO .m3u .M3U .mds .MDS .nrg .NRG .rp9 .RP9 .7z .7Z .zip .ZIP</extension>
         <command label="PUAE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM%</command>
         <command label="PUAE 2021">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM%</command>
+        <!-- <command label="FS-UAE (Standalone)">%EMULATOR_FS-UAE% &ndash;&ndashconfig:amiga-model=CDTV %ROM%</command> -->
+        <!-- <command label="Amiberry (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_AMIBERRY% &ndash;&ndashmodel CDTV &ndash;&ndash;autoload %ROM%</command> -->
         <platform>cdtv</platform>
         <theme>cdtv</theme>
     </system>
@@ -365,6 +369,8 @@
         <path>%ROMPATH%/channelf</path>
         <extension>.bin .BIN .chf .CHF .7z .7Z .zip .ZIP</extension>
         <command label="FreeChaF">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.so %ROM%</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "channelf -rompath \"%GAMEDIRRAW%;%ROMPATH%/channelf\" -cart \"%ROMRAW%\""</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/channelf channelf -cart %ROM%</command>
         <platform>channelf</platform>
         <theme>channelf</theme>
     </system>
@@ -401,6 +407,7 @@
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/consolearcade %BASENAME%</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 Dojo (Standalone)">%EMULATOR_FLYCAST-DOJO% %ROM%</command>-->
         <command label="Kronos">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM%</command>
         <!--<command label="Mednafen [Sega Saturn] (Standalone)">%EMULATOR_MEDNAFEN% -force_module ss %ROM%</command>-->
         <!--<command label="Play! (Standalone)">%EMULATOR_PLAY!% &ndash;&ndash;disc %ROM%</command>-->
@@ -498,11 +505,12 @@
         <name>daphne</name>
         <fullname>Daphne Arcade LaserDisc Emulator</fullname>
         <path>%ROMPATH%/daphne</path>
-        <extension>.daphne .singe .7z .7Z .zip .ZIP</extension>
+        <extension>.daphne .dirksimple .ogv .OGV .singe .7z .7Z .zip .ZIP</extension>
         <!--<command label="Hypseus [Daphne] (Standalone)">%EMULATOR_HYPSEUS-SINGE% %BASENAME% vldp -framefile %GAMEDIR%/%BASENAME%.txt %INJECT%=%BASENAME%.commands</command>-->
         <!--<command label="Hypseus [Singe] (Standalone)">%EMULATOR_HYPSEUS-SINGE% singe vldp -framefile %GAMEDIR%/%BASENAME%.txt -script %GAMEDIR%/%BASENAME%.singe %INJECT%=%BASENAME%.commands</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%/daphne %BASENAME%</command>
+        <command label="DirkSimple">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dirksimple_libretro.so %ROM%</command>
         <platform>daphne, arcade</platform>
         <theme>daphne</theme>
     </system>
@@ -511,7 +519,7 @@
         <name>doom</name>
         <fullname>Doom</fullname>
         <path>%ROMPATH%/doom</path>
-        <extension>.doom .DOOM .desktop .iwad .IWAD .pk4 .PK4 .pk3 .PK3 .pwad .PWAD .sh .wad .WAD .ipk3 .IPK3</extension>
+        <extension>.doom .DOOM .desktop .ipk3 .IPK3 .iwad .IWAD .pk3 .PK3 .pk4 .PK4 .pwad .PWAD .sh .wad .WAD</extension>
         <command label="GZDoom (Standalone)">gzdoom.sh %ROM%</command>
         <command label="PrBoom">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prboom_libretro.so %ROM%</command>
         <!-- <command label="PrBoom+ (Standalone)">%EMULATOR_PRBOOM-PLUS% -iwad %ROM%</command> -->
@@ -550,9 +558,10 @@
         <name>dreamcast</name>
         <fullname>Sega Dreamcast</fullname>
         <path>%ROMPATH%/dreamcast</path>
-        <extension>.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
+        <extension>.cdi .CDI .chd .CHD .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> -->
+        <!-- <command label="Flycast Dojo (Standalone)">%EMULATOR_FLYCAST-DOJO% %ROM%</command> -->
         <!-- <command label="Redream (Standalone)">%EMULATOR_REDREAM% %ROM%</command> -->
         <platform>dreamcast</platform>
         <theme>dreamcast</theme>
@@ -609,6 +618,8 @@
         <!-- <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> -->
+        <!-- <command label="3dSen (Wine)">%STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_3DSEN-WINDOWS% -id=%INJECT%=%BASENAME%.3dsen</command> -->
+        <!-- <command label="3dSen (Proton)">%STARTDIR%=%EMUDIR% %PRECOMMAND_PROTON% %EMULATOR_3DSEN-WINDOWS% -id=%INJECT%=%BASENAME%.3dsen</command> -->
         <platform>famicom</platform>
         <theme>famicom</theme>
     </system>
@@ -683,9 +694,10 @@
         <name>fmtowns</name>
         <fullname>Fujitsu FM Towns</fullname>
         <path>%ROMPATH%/fmtowns</path>
-        <extension>.cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
+	<extension>.cdr .CDR .chd .CHD .cue .CUE .gdi .GDI .iso .ISO</extension>
+	<command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "fmtownshr -rompath \"%GAMEDIRRAW%;%ROMPATH%/fmtowns\" -cdrom \"%ROMRAW%\""</command>
+	<command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fmtowns fmtowns %BASENAME%</command>
         <!--<command label="Tsugaru (Standalone)">%EMULATOR_TSUGARU% %EMUDIR%/roms -HOSTSHORTCUT ESC 0 0 FORCEQUIT -FULLSCREEN -CD %ROM% %INJECT%=%BASENAME%.cfg</command>-->
-        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fmtowns fmtowns %BASENAME%</command>
         <platform>fmtowns</platform>
         <theme>fmtowns</theme>
     </system>
@@ -707,7 +719,7 @@
         <fullname>Bit Corporation Gamate</fullname>
         <path>%ROMPATH%/gamate</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gamate -rompath %GAMEDIR%\;%ROMPATH%/gamate -cart \"%ROMRAW%\""</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gamate -rompath \"%GAMEDIRRAW%;%ROMPATH%/gamate\" -cart \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gamate gamate -cart %ROM%</command>
         <platform>gamate</platform>
         <theme>gamate</theme>
@@ -718,6 +730,7 @@
         <fullname>Nintendo Game and Watch</fullname>
         <path>%ROMPATH%/gameandwatch</path>
         <extension>.mgw .MGW .7z .7Z .zip .ZIP</extension>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_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>
@@ -730,7 +743,7 @@
         <fullname>Tiger Electronics Game.com</fullname>
         <path>%ROMPATH%/gamecom</path>
         <extension>.tgc .TGC .7z .7Z .zip .ZIP</extension>
-        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gamecom -rompath %GAMEDIR%\;%ROMPATH%/gamecom -cartridge1 \"%ROMRAW%\""</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gamecom -rompath \"%GAMEDIRRAW%;%ROMPATH%/gamecom\" -cartridge1 \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gamecom gamecom -cartridge1 %ROM%</command>
         <platform>gamecom</platform>
         <theme>gamecom</theme>
@@ -747,6 +760,7 @@
         <command label="SMS Plus GX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM%</command>
 	<!--<command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command> -->
 	<!--<command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module gg %ROM%</command> -->
+	<!--<command label="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command> -->
 	<!--<command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Game Gear" %ROM%</command>-->
         <platform>gamegear</platform>
         <theme>gamegear</theme>
@@ -762,6 +776,7 @@
         <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="DoubleCherryGB">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/DoubleCherryGB_libretro.so %ROM%</command>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
         <!--<command label="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command>-->
         <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
@@ -769,6 +784,9 @@
         <!-- <command label="mGBA (Standalone)">%EMULATOR_MGBA% -f %ROM%</command> -->
         <command label="VBA-M">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vbam_libretro.so %ROM%</command>
         <!-- <command label="VBA-M (Standalone)">%EMULATOR_VBA-M% -f %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module gb %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Game Boy" %ROM%</command> -->
+        <!-- <command label="SkyEmu (Standalone)">%EMULATOR_SKYEMU% %ROM%</command> -->
         <platform>gb</platform>
         <theme>gb</theme>
     </system>
@@ -783,6 +801,7 @@
         <!-- <command label="VBA-M (Standalone)">%EMULATOR_VBA-M% -f %ROM%</command> -->
         <command label="VBA Next">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vba_next_libretro.so %ROM%</command>
         <command label="gpSP">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gpsp_libretro.so %ROM%</command>
+        <!--<command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module gba %ROM%</command> -->
         <!--<command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Game Boy Advance" %ROM%</command>-->
         <!--<command label="SkyEmu (Standalone)">%EMULATOR_SKYEMU% %ROM%</command>-->
         <platform>gba</platform>
@@ -799,6 +818,7 @@
         <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="DoubleCherryGB">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/DoubleCherryGB_libretro.so %ROM%</command>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
         <!--<command label="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command>-->
         <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
@@ -806,6 +826,9 @@
         <!-- <command label="mGBA (Standalone)">%EMULATOR_MGBA% -f %ROM%</command> -->
         <command label="VBA-M">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vbam_libretro.so %ROM%</command>
         <!-- <command label="VBA-M (Standalone)">%EMULATOR_VBA-M% -f %ROM%</command> -->
+        <!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module gb %ROM%</command> -->
+        <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Game Boy Color" %ROM%</command>-->
+        <!-- <command label="SkyEmu (Standalone)">%EMULATOR_SKYEMU% %ROM%</command>-->
         <platform>gbc</platform>
         <theme>gbc</theme>
     </system>
@@ -842,7 +865,7 @@
         <fullname>Hartung Game Master</fullname>
         <path>%ROMPATH%/gmaster</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gmaster -rompath %GAMEDIR%\;%ROMPATH%/gmaster -cart \"%ROMRAW%\""</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gmaster -rompath \"%GAMEDIRRAW%;%ROMPATH%/gmaster\" -cart \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gmaster gmaster -cart %ROM%</command>
         <platform>gmaster</platform>
         <theme>gmaster</theme>
@@ -863,8 +886,10 @@
         <name>intellivision</name>
         <fullname>Mattel Electronics Intellivision</fullname>
         <path>%ROMPATH%/intellivision</path>
-        <extension>.int .INT .bin .BIN .rom .ROM .7z .7Z .zip .ZIP</extension>
+        <extension>.bin .BIN .int .INT .rom .ROM .7z .7Z .zip .ZIP</extension>
         <command label="FreeIntv">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.so %ROM%</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "intv -rompath \"%GAMEDIRRAW%;%ROMPATH%/intellivision\" -cart \"%ROMRAW%\""</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/intellivision intv -cart %ROM%</command>
         <platform>intellivision</platform>
         <theme>intellivision</theme>
     </system>
@@ -877,22 +902,11 @@
         <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>laserdisc</name>
         <fullname>LaserDisc Games</fullname>
         <path>%ROMPATH%/laserdisc</path>
-        <extension>.daphne .singe .7z .7Z .zip .ZIP</extension>
+        <extension>.daphne .dirksimple .ogv .OGV .singe .7z .7Z .zip .ZIP</extension>
         <!--<command label="Hypseus [Daphne] (Standalone)">%EMULATOR_HYPSEUS-SINGE% %BASENAME% vldp -framefile %GAMEDIR%/%BASENAME%.txt %INJECT%=%BASENAME%.commands</command>-->
         <!--<command label="Hypseus [Singe] (Standalone)">%EMULATOR_HYPSEUS-SINGE% singe vldp -framefile %GAMEDIR%/%BASENAME%.txt -script %GAMEDIR%/%BASENAME%.singe %INJECT%=%BASENAME%.commands</command>-->
         <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
@@ -905,6 +919,7 @@
         <fullname>LCD Handheld Games</fullname>
         <path>%ROMPATH%/lcdgames</path>
         <extension>.mgw .MGW .7z .7Z .zip .ZIP</extension>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
         <!-- <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>
@@ -946,9 +961,9 @@
         <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 Dojo (Standalone)">%EMULATOR_FLYCAST-DOJO% %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>
@@ -975,6 +990,7 @@
         <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="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command> -->
         <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Master System" %ROM%</command> -->
         <platform>mastersystem</platform>
         <theme>mastersystem</theme>
@@ -1024,6 +1040,8 @@
         <path>%ROMPATH%/megaduck</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="SameDuck">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameduck_libretro.so %ROM%</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "megaduck -rompath \"%GAMEDIRRAW%;%ROMPATH%/megaduck\" -cart \"%ROMRAW%\""</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/megaduck megaduck -cart %ROM%</command>
         <platform>megaduck</platform>
         <theme>megaduck</theme>
     </system>
@@ -1056,7 +1074,6 @@
         <path>%ROMPATH%/model3</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <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>
@@ -1074,7 +1091,7 @@
         <name>moto</name>
         <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>
+        <extension>.fd .FD .k7 .K7 .m5 .M5 .m7 .M7 .rom .ROM .sap .SAP .7z .7Z .zip .ZIP</extension>
         <command label="Theodore">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM%</command>
         <platform>moto</platform>
         <theme>moto</theme>
@@ -1146,6 +1163,7 @@
         <path>%ROMPATH%/multivision</path>
         <extension>.bin .BIN .gg .GG .rom .ROM .sg .SG .sms .SMS .7z .7Z .zip .ZIP</extension>
         <command label="Gearsystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM%</command>
+        <!--<command label="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command>-->
         <platform>sg-1000</platform>
         <theme>multivision</theme>
     </system>
@@ -1182,6 +1200,7 @@
         <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> -->
+        <!--<command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Nintendo 64DD" %ROM%</command>-->
         <platform>n64</platform>
         <theme>n64dd</theme>
     </system>
@@ -1189,9 +1208,10 @@
         <name>naomi</name>
         <fullname>Sega NAOMI</fullname>
         <path>%ROMPATH%/naomi</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 .dat .DAT .elf .ELF .lst .LST .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> -->
+        <!--<command label="Flycast Dojo (Standalone)">%EMULATOR_FLYCAST-DOJO% %ROM%</command>-->
         <platform>arcade</platform>
         <theme>naomi</theme>
     </system>
@@ -1202,6 +1222,7 @@
         <extension>.bin .BIN .dat .DAT .elf .ELF .lst .LST .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>-->
+        <!--<command label="Flycast Dojo (Standalone)">%EMULATOR_FLYCAST-DOJO% %ROM%</command>-->
         <platform>arcade</platform>
         <theme>naomi2</theme>
     </system>
@@ -1212,6 +1233,7 @@
         <extension>.bin .BIN .dat .DAT .elf .ELF .lst .LST .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> -->
+        <!--<command label="Flycast Dojo (Standalone)">%EMULATOR_FLYCAST-DOJO% %ROM%</command>-->
         <platform>arcade</platform>
         <theme>naomigd</theme>
     </system>
@@ -1224,6 +1246,7 @@
         <command label="DeSmuME 2015">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume2015_libretro.so %ROM%</command>
         <!-- <command label="DeSmuME (Standalone)">%EMULATOR_DESMUME% %ROM%</command> -->
         <command label="melonDS">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melonds_libretro.so %ROM%</command>
+        <command label="melonDS DS">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melondsds_libretro.so %ROM%</command>
         <command label="melonDS (Standalone)">%EMULATOR_MELONDS% %ROM%</command>
         <!--<command label="SkyEmu (Standalone)">%EMULATOR_SKYEMU% %ROM%</command>-->
         <platform>nds</platform>
@@ -1268,7 +1291,7 @@
         <name>nes</name>
         <fullname>Nintendo Entertainment System</fullname>
         <path>%ROMPATH%/nes</path>
-        <extension>.fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
+        <extension>.3dsen .3DSEN .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="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command>-->
         <command label="Nestopia UE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
@@ -1300,7 +1323,7 @@
         <name>ngp</name>
         <fullname>SNK Neo Geo Pocket</fullname>
         <path>%ROMPATH%/ngp</path>
-        <extension>.ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP</extension>
+        <extension>.ngc .NGC .ngp .NGP .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> -->
@@ -1312,7 +1335,7 @@
         <name>ngpc</name>
         <fullname>SNK Neo Geo Pocket Color</fullname>
         <path>%ROMPATH%/ngpc</path>
-        <extension>.ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP</extension>
+        <extension>.ngc .NGC .ngp .NGP .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> -->
@@ -1322,10 +1345,12 @@
     </system>
     <system>
         <name>odyssey2</name>
-        <fullname>Magnavox Odyssey2</fullname>
+        <fullname>Magnavox Odyssey 2</fullname>
         <path>%ROMPATH%/odyssey2</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "odyssey2 -rompath \"%GAMEDIRRAW%;%ROMPATH%/odyssey2\" -cart \"%ROMRAW%\""</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/odyssey2 odyssey2 -cart %ROM%</command>
         <platform>odyssey2</platform>
         <theme>odyssey2</theme>
     </system>
@@ -1355,7 +1380,7 @@
         <name>palm</name>
         <fullname>Palm OS</fullname>
         <path>%ROMPATH%/palm</path>
-        <extension>.prc .PRC .pqa .PQA .img .IMG .7z .7Z .zip .ZIP</extension>
+        <extension>.img .IMG .pqa .PQA .prc .PRC .7z .7Z .zip .ZIP</extension>
         <command label="Mu">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mu_libretro.so %ROM%</command>
         <platform>palm</platform>
         <theme>palm</theme>
@@ -1374,7 +1399,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 .m3u .M3U .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">%STARTDIR%=%GAMEDIR% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nekop2_libretro.so %ROM%</command>
         <platform>pc98</platform>
@@ -1388,6 +1413,7 @@
         <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="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command> -->
         <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "PC Engine" %ROM%</command> -->
         <platform>pcengine</platform>
         <theme>pcengine</theme>
@@ -1400,6 +1426,7 @@
         <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="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %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>
@@ -1421,6 +1448,7 @@
         <extension>.p8 .P8 .png .PNG</extension>
         <command label="PICO-8 (Standalone)">%EMULATOR_PICO-8% -desktop_path ~/retrodeck/screenshots -root_path %GAMEDIR% -run %ROM%</command>
         <command label="PICO-8 Splore (Standalone)">%EMULATOR_PICO-8% -desktop_path ~/retrodeck/screenshots -root_path %GAMEDIR% -splore</command>
+        <command label="Retro8">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/retro8_libretro.so %ROM%</command>
         <platform>pico8</platform>
         <theme>pico8</theme>
     </system>
@@ -1447,9 +1475,13 @@
         <name>ports</name>
         <fullname>Ports</fullname>
         <path>%ROMPATH%/ports</path>
-        <extension>.AppImage .desktop .sh</extension>
+        <extension>.AppImage .desktop .exe .EXE .game .GAME .phd .PHD .psx .PSX .sh</extension>
         <command label="Shortcut or script">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <command label="AppImage">%EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <!--<command label="ECWolf (Wolfenstein 3D)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/ecwolf_libretro.so %ROM%</command>-->
+        <!--<command label="NXEngine (Cave Story)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.so %ROM%</command>-->
+        <!--<command label="OpenLara (Tomb Raider)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/openlara_libretro.so %ROM%</command>-->
+        <!--<command label="Super Bros War">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/superbroswar_libretro.so %ROM%</command>-->
         <platform>pc, pcwindows</platform>
         <theme>ports</theme>
     </system>
@@ -1457,7 +1489,7 @@
         <name>ps2</name>
         <fullname>Sony PlayStation 2</fullname>
         <path>%ROMPATH%/ps2</path>
-        <extension>.arcadedef .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>
+        <extension>.arcadedef .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 .zso .ZSO</extension>
 	<command label="PCSX2 (Standalone)">%EMULATOR_PCSX2% -batch %ROM%</command>
         <command label="LRPS2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%</command>
         <command label="PCSX2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%</command>
@@ -1491,7 +1523,7 @@
         <name>psp</name>
         <fullname>Sony PlayStation Portable</fullname>
         <path>%ROMPATH%/psp</path>
-        <extension>.elf .ELF .iso .ISO .cso .CSO .prx .PRX .pbp .PBP .7z .7Z .zip .ZIP</extension>
+        <extension>.chd .CHD .cso .CSO .elf .ELF .iso .ISO .pbp .PBP .prx .PRX .7z .7Z .zip .ZIP</extension>
         <command label="PPSSPP (Standalone)">%EMULATOR_PPSSPP% %ROM%</command>
         <command label="PPSSPP">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/ppsspp_libretro.so %ROM%</command>
         <platform>psp</platform>
@@ -1519,6 +1551,7 @@
         <command label="PCSX ReARMed">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx_rearmed_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>
@@ -1528,6 +1561,7 @@
         <fullname>Casio PV-1000</fullname>
         <path>%ROMPATH%/pv1000</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "pv1000 -rompath \"%GAMEDIRRAW%;%ROMPATH%/pv1000\" -cart \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/pv1000 pv1000 -cart %ROM%</command>
         <platform>pv1000</platform>
         <theme>pv1000</theme>
@@ -1553,7 +1587,7 @@
         <name>samcoupe</name>
         <fullname>MGT SAM Coupé</fullname>
         <path>%ROMPATH%/samcoupe</path>
-        <extension>.dsk .DSK .mgt .MGT .sbt .SBT .sad .SAD .7z .7Z .zip .ZIP</extension>
+        <extension>.dsk .DSK .mgt .MGT .sad .SAD .sbt .SBT .7z .7Z .zip .ZIP</extension>
         <command label="SimCoupé (Standalone)">%EMULATOR_SIMCOUPE% %ROM%</command>
         <platform>samcoupe</platform>
         <theme>samcoupe</theme>
@@ -1581,7 +1615,7 @@
         <name>saturn</name>
         <fullname>Sega Saturn</fullname>
         <path>%ROMPATH%/saturn</path>
-        <extension>.bin .BIN .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .mds .MDS .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP</extension>
+        <extension>.bin .BIN .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .m3u .M3U .mds .MDS .toc .TOC .7z .7Z .zip .ZIP</extension>
         <command label="Beetle Saturn">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_saturn_libretro.so %ROM%</command>
         <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>
@@ -1594,7 +1628,7 @@
         <name>saturnjp</name>
         <fullname>Sega Saturn</fullname>
         <path>%ROMPATH%/saturnjp</path>
-        <extension>.bin .BIN .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .mds .MDS .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP</extension>
+        <extension>.bin .BIN .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .m3u .M3U .mds .MDS .toc .TOC .7z .7Z .zip .ZIP</extension>
         <command label="Beetle Saturn">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_saturn_libretro.so %ROM%</command>
         <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>
@@ -1619,7 +1653,7 @@
         <fullname>Epoch Super Cassette Vision</fullname>
         <path>%ROMPATH%/scv</path>
         <extension>.0 .bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "scv -rompath %GAMEDIR%\;%ROMPATH%/scv -cart \"%ROMRAW%\""</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "scv -rompath \"%GAMEDIRRAW%;%ROMPATH%/scv\" -cart \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/scv scv -cart %ROM%</command>
         <platform>scv</platform>
         <theme>scv</theme>
@@ -1629,7 +1663,7 @@
         <name>sega32x</name>
         <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>
+        <extension>.32x .32X .68k .68K .bin .BIN .cue .CUE .gen .GEN .iso .ISO .md .MD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP</extension>
         <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>
@@ -1639,7 +1673,7 @@
         <name>sega32xjp</name>
         <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>
+        <extension>.32x .32X .68k .68K .bin .BIN .cue .CUE .gen .GEN .iso .ISO .md .MD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP</extension>
         <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>
@@ -1649,7 +1683,7 @@
         <name>sega32xna</name>
         <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>
+        <extension>.32x .32X .68k .68K .bin .BIN .cue .CUE .gen .GEN .iso .ISO .md .MD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP</extension>
         <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>
@@ -1681,6 +1715,7 @@
         <!-- <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="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %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>
@@ -1695,6 +1730,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="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %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>
@@ -1705,9 +1741,11 @@
         <path>%ROMPATH%/sgb</path>
         <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="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command> -->
+        <command label="SameBoy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_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> -->
-        <platform>gb</platform>
+        <platform>sgb</platform>
         <theme>sgb</theme>
     </system>
     <system>
@@ -1724,6 +1762,7 @@
         <!-- <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="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %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>
@@ -1743,6 +1782,7 @@
         <!-- <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="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %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>
@@ -1763,20 +1803,11 @@
         <name>spectravideo</name>
         <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>
+        <extension>.cas .CAS .col .COL .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>
         <platform>spectravideo</platform>
         <theme>spectravideo</theme>
     </system>
-    <system>
-        <name>stratagus</name>
-        <fullname>Stratagus Game Engine</fullname>
-        <path>%ROMPATH%/stratagus</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
-        <platform>stratagus</platform>
-        <theme>stratagus</theme>
-    </system>
     <system>
         <name>stv</name>
         <fullname>Sega Titan Video Game System</fullname>
@@ -1809,9 +1840,11 @@
         <name>supergrafx</name>
         <fullname>NEC SuperGrafx</fullname>
         <path>%ROMPATH%/supergrafx</path>
-        <extension>.pce .PCE .sgx .SGX .cue .CUE .ccd .CCD .chd .CHD .7z .7Z .zip .ZIP</extension>
+        <extension>.ccd .CCD .chd .CHD .cue .CUE .pce .PCE .sgx .SGX .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="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module pce %ROM%</command>-->
+        <!--<command label="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command>-->
         <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "SuperGrafx" %ROM%</command> -->
         <platform>supergrafx</platform>
         <theme>supergrafx</theme>
@@ -1822,6 +1855,8 @@
         <path>%ROMPATH%/supervision</path>
         <extension>.bin .BIN .sv .SV .7z .7Z .zip .ZIP</extension>
         <command label="Potator">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/potator_libretro.so %ROM%</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "svision -rompath \"%GAMEDIRRAW%;%ROMPATH%/supervision\" -cart \"%ROMRAW%\""</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/supervision svision -cart %ROM%</command>
         <platform>supervision</platform>
         <theme>supervision</theme>
     </system>
@@ -1831,7 +1866,7 @@
         <fullname>Funtech Super A'Can</fullname>
         <path>%ROMPATH%/supracan</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "supracan -rompath %GAMEDIR%\;%ROMPATH%/supracan -cart \"%ROMRAW%\""</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "supracan -rompath \"%GAMEDIRRAW%;%ROMPATH%/supracan\" -cart \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/supracan supracan -cart %ROM%</command>
         <platform>supracan</platform>
         <theme>supracan</theme>
@@ -1879,6 +1914,7 @@
         <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="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command>-->
         <!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "PC Engine" %ROM%</command> -->
         <platform>pcengine</platform>
         <theme>tg16</theme>
@@ -1891,6 +1927,7 @@
         <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="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %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>
@@ -1908,10 +1945,11 @@
 
     <system>
         <name>tic80</name>
-        <fullname>TIC-80 Game Engine</fullname>
+        <fullname>TIC-80 Fantasy Computer</fullname>
         <path>%ROMPATH%/tic80</path>
         <extension>.tic .TIC</extension>
         <command label="TIC-80">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tic80_libretro.so %ROM%</command>
+        <!--<command label="TIC-80 (Standalone)">%EMULATOR_TIC-80% %ROM% &ndash;&ndash;fullscreen</command>-->
         <platform>tic80</platform>
         <theme>tic80</theme>
     </system>
@@ -1919,7 +1957,7 @@
         <name>to8</name>
         <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>
+        <extension>.fd .FD .k7 .K7 .m5 .M5 .m7 .M7 .rom .ROM .sap .SAP .7z .7Z .zip .ZIP</extension>
         <command label="Theodore">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM%</command>
         <platform>moto</platform>
         <theme>to8</theme>
@@ -1969,10 +2007,12 @@
     </system>
     <system>
         <name>vectrex</name>
-        <fullname>Smith Engineering Vectrex</fullname>
+        <fullname>GCE Vectrex</fullname>
         <path>%ROMPATH%/vectrex</path>
-        <extension>.bin .BIN .vec .VEC .gam .GAM .vc .VC .7z .7Z .zip .ZIP</extension>
+        <extension>.bin .BIN .gam .GAM .vc .VC .vec .VEC .7z .7Z .zip .ZIP</extension>
         <command label="vecx">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.so %ROM%</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "vectrex -rompath \"%GAMEDIRRAW%;%ROMPATH%/vectrex\" -cart \"%ROMRAW%\""</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/vectrex vectrex -cart %ROM%</command>
         <platform>vectrex</platform>
         <theme>vectrex</theme>
     </system>
@@ -1992,14 +2032,16 @@
         <path>%ROMPATH%/videopac</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
-        <platform>videopac</platform>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "videopac -rompath \"%GAMEDIRRAW%;%ROMPATH%/videopac\" -cart \"%ROMRAW%\""</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/videopac videopac -cart %ROM%</command>
+        <platform>odyssey2</platform>
         <theme>videopac</theme>
     </system>
     <system>
         <name>virtualboy</name>
         <fullname>Nintendo Virtual Boy</fullname>
         <path>%ROMPATH%/virtualboy</path>
-        <extension>.vb .VB .vboy .VBOY .bin .BIN .7z .7Z .zip .ZIP</extension>
+        <extension>.bin .BIN .vb .VB .vboy .VBOY .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> -->
         <platform>virtualboy</platform>
@@ -2011,7 +2053,7 @@
         <fullname>Visual Pinball</fullname>
         <path>%ROMPATH%/vpinball</path>
         <extension>.vpt .VPT .vpx .VPX</extension>
-        <command label="Visual Pinball (Standalone)">%EMULATOR_VISUAL-PINBALL% -Minimized -Play %ROM%</command>
+        <command label="Visual Pinball (Standalone)">%EMULATOR_VISUAL-PINBALL% -play %ROM%</command>
         <platform>vpinball</platform>
         <theme>vpinball</theme>
     </system>
@@ -2022,7 +2064,7 @@
         <fullname>VTech V.Smile</fullname>
         <path>%ROMPATH%/vsmile</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "vsmile -rompath %GAMEDIR%\;%ROMPATH%/vsmile -cart \"%ROMRAW%\""</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "vsmile -rompath \"%GAMEDIRRAW%;%ROMPATH%/vsmile\" -cart \"%ROMRAW%\""</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/vsmile vsmile -cart %ROM%</command>
         <platform>vsmile</platform>
         <theme>vsmile</theme>
@@ -2057,14 +2099,55 @@
         <platform>wiiu</platform>
         <theme>wiiu</theme>
     </system>
+    <system>
+        <name>windows</name>
+        <fullname>Microsoft Windows</fullname>
+        <path>%ROMPATH%/windows</path>
+        <extension>.AppImage .desktop .sh</extension>
+        <command label="Suspend ES-DE">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Keep ES-DE running">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="AppImage (Suspend ES-DE)">%EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <command label="AppImage (Keep ES-DE running)">%RUNINBACKGROUND% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <platform>pcwindows</platform>
+        <theme>windows</theme>
+    </system>
+    <system>
+        <name>windows3x</name>
+        <fullname>Microsoft Windows 3.x</fullname>
+        <path>%ROMPATH%/windows3x</path>
+        <extension>.AppImage .bat .BAT .desktop .dosz .DOSZ .sh .7z .7Z .zip .ZIP</extension>
+        <command label="DOSBox-X (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_DOSBOX-X% -defaultdir %GAMEDIR% %ROM%</command>
+        <command label="DOSBox-Pure">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM%</command>
+        <command label="Shortcut or script (Suspend ES-DE)">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Shortcut or script (Keep ES-DE running)">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="AppImage (Suspend ES-DE)">%EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <command label="AppImage (Keep ES-DE running)">%RUNINBACKGROUND% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <platform>windows3x</platform>
+        <theme>windows3x</theme>
+    </system>
+    <system>
+        <name>windows9x</name>
+        <fullname>Microsoft Windows 9x</fullname>
+        <path>%ROMPATH%/windows9x</path>
+        <extension>.AppImage .bat .BAT .desktop .dosz .DOSZ .sh .7z .7Z .zip .ZIP</extension>
+        <command label="DOSBox-X (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_DOSBOX-X% -defaultdir %GAMEDIR% %ROM%</command>
+        <command label="DOSBox-Pure">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM%</command>
+        <command label="Shortcut or script (Suspend ES-DE)">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Shortcut or script (Keep ES-DE running)">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="AppImage (Suspend ES-DE)">%EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <command label="AppImage (Keep ES-DE running)">%RUNINBACKGROUND% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <platform>pcwindows</platform>
+        <theme>windows9x</theme>
+    </system>
     <system>
         <name>wonderswan</name>
         <fullname>Bandai WonderSwan</fullname>
         <path>%ROMPATH%/wonderswan</path>
-        <extension>.ws .WS .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
+        <extension>.pc2 .PC2 .ws .WS .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="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "WonderSwan" %ROM%</command> -->
+        <!--<command label="ares [Benesse Pocket Challenge V2] (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Pocket Challenge V2" %ROM%</command>-->
         <platform>wonderswan</platform>
         <theme>wonderswan</theme>
     </system>
@@ -2072,7 +2155,7 @@
         <name>wonderswancolor</name>
         <fullname>Bandai WonderSwan Color</fullname>
         <path>%ROMPATH%/wonderswancolor</path>
-        <extension>.ws .WS .wsc .WSC .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
+        <extension>.pc2 .PC2 .ws .WS .wsc .WSC .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="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "WonderSwan Color" %ROM%</command> -->
@@ -2083,7 +2166,7 @@
         <name>x1</name>
         <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>
+        <extension>.2d .2D .2hd .2HD .88d .88D .cmd .CMD .d88 .D88 .dup .DUP .dx1 .DX1 .hdm .HDM .tap .TAP .tfd .TFD .xdf .XDF .7z .7Z .zip .ZIP</extension>
         <command label="x1">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.so %ROM%</command>
         <platform>x1</platform>
         <theme>x1</theme>
@@ -2092,9 +2175,9 @@
         <name>x68000</name>
         <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>
+        <extension>.2hd .2HD .88d .88D .cmd .CMD .d88 .D88 .dim .DIM .dup .DUP .hdf .HDF .hdm .HDM .img .IMG .m3u .M3U .xdf .XDF .7z .7Z .zip .ZIP</extension>
         <command label="PX68k">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.so %ROM%</command>
-	    <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/x68000 x68000 -flop1 %ROM%</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/x68000 x68000 -flop1 %ROM%</command>
         <platform>x68000</platform>
         <theme>x68000</theme>
     </system>
@@ -2112,7 +2195,7 @@
         <name>xbox360</name>
         <fullname>Microsoft Xbox 360</fullname>
         <path>%ROMPATH%/xbox360</path>
-        <extension>. .desktop .iso .ISO .sh .xex .XEX</extension>
+        <extension>. .desktop .iso .ISO .sh .xex .XEX .zar .ZAR</extension>
         <command label="xenia (Wine)">%STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_XENIA-WINDOWS% %ROM%</command>
         <command label="xenia (Proton)">%STARTDIR%=%EMUDIR% %PRECOMMAND_PROTON% %EMULATOR_XENIA-WINDOWS% %ROM%</command>
         <command label="Shortcut or script">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
@@ -2135,7 +2218,7 @@
         <name>zx81</name>
         <fullname>Sinclair ZX81</fullname>
         <path>%ROMPATH%/zx81</path>
-        <extension>.tzx .TZX .p .P .7z .7Z .zip .ZIP</extension>
+        <extension>.p .P .tzx .TZX .7z .7Z .zip .ZIP</extension>
         <command label="EightyOne">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.so %ROM%</command>
         <platform>zx81</platform>
         <theme>zx81</theme>

functions/050_save_migration.sh

@@ -28,12 +28,12 @@ save_migration() {
   fi
 
   # Doing the dir prep as we don't know from which version we came
-  dir_prep "$media_folder" "/var/config/emulationstation/.emulationstation/downloaded_media"
+  dir_prep "$media_folder" "/var/config/ES-DE/downloaded_media"
-  dir_prep "$themes_folder" "/var/config/emulationstation/.emulationstation/themes"
+  dir_prep "$themes_folder" "/var/config/ES-DE/themes"
   mkdir -pv $rdhome/logs #this was added later, maybe safe to remove in a few versions
 
   # Resetting es_settings, now we need it but in the future I should think a better solution, maybe with sed
-  cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml
+  cp -fv /app/retrodeck/es_settings.xml /var/config/ES-DE/settings/es_settings.xml
 
   # 0.4 -> 0.5
   # Perform save and state migration if needed

functions/checks.sh

@@ -59,6 +59,7 @@ check_for_version_update() {
         #   configurator_generic_dialog "RetroDECK Online Update" "The update process is now complete!\n\nPlease restart RetroDECK to keep the fun going."
         #   exit 1
         # fi
+        # TODO: add the logic to check and update the branch from the configuration file
         choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="OK" --extra-button="Ignore this version" \
         --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
         --title "RetroDECK Update Available" \

functions/compression.sh

@@ -2,7 +2,7 @@
 
 compress_game() {
   # Function for compressing one or more files to .chd format
-  # USAGE: compress_game $format $full_path_to_input_file
+  # USAGE: compress_game $format $full_path_to_input_file $system(optional)
   local file="$2"
   local filename_no_path=$(basename "$file")
   local filename_no_extension="${filename_no_path%.*}"
@@ -10,7 +10,11 @@ compress_game() {
   local dest_file=$(dirname "$(realpath "$file")")"/""$filename_no_extension"
 
   if [[ "$1" == "chd" ]]; then
-    /app/bin/chdman createcd -i "$source_file" -o "$dest_file".chd
+    if [[ "$3" == "psp" ]]; then
+      echo "Put createdvd or maxcso here" # TODO
+    else
+      /app/bin/chdman createcd -i "$source_file" -o "$dest_file".chd
+    fi
   elif [[ "$1" == "zip" ]]; then
     zip -jq9 "$dest_file".zip "$source_file"
   elif [[ "$1" == "rvz" ]]; then
@@ -93,11 +97,11 @@ cli_compress_single_game() {
   read -p "RetroDECK will now attempt to compress your selected game. Press Enter key to continue..."
 	if [[ ! -z "$file" ]]; then
 		if [[ -f "$file" ]]; then
-      check_system=$(echo "$file" | grep -oE "$roms_folder/[^/]+" | grep -oE "[^/]+$")
+      local system=$(echo "$file" | grep -oE "$roms_folder/[^/]+" | grep -oE "[^/]+$")
       local compatible_compression_format=$(find_compatible_compression_format "$file")
       if [[ ! $compatible_compression_format == "none" ]]; then
         echo "$(basename "$file") can be compressed to $compatible_compression_format"
-        compress_game "$compatible_compression_format" "$file"
+        compress_game "$compatible_compression_format" "$file" "$system"
         if [[ $post_compression_cleanup == [yY] ]]; then # Remove file(s) if requested
           if [[ $(basename "$file") == *".cue" ]]; then
             local cue_bin_files=$(grep -o -P "(?<=FILE \").*(?=\".*$)" "$file")
@@ -155,7 +159,7 @@ cli_compress_all_games() {
         local compatible_compression_format=$(find_compatible_compression_format "$file")
         if [[ ! "$compatible_compression_format" == "none" ]]; then
           echo "$(basename "$file") can be compressed to $compatible_compression_format"
-          compress_game "$compatible_compression_format" "$file"
+          compress_game "$compatible_compression_format" "$file" "$system"
           if [[ $post_compression_cleanup == [yY] ]]; then # Remove file(s) if requested
             if [[ "$file" == *".cue" ]]; then
               local cue_bin_files=$(grep -o -P "(?<=FILE \").*(?=\".*$)" "$file")

functions/functions.sh

@@ -107,34 +107,14 @@ download_file() {
   # file_dest is the destination the file should be in the filesystem, needs filename included!
   # file_name is a user-readable file name or description to be put in the Zenity dialog
 
-  # Run wget in the background and redirect the progress to a temporary file
   (
-    wget "$1" -O "$2" -q --show-progress --progress=dot 2>&1 | sed -n -e 's/^.* \([0-9]*\)%.*$/\1/p' > "/var/cache/tmp/download_progress" &
+    wget "$1" -O "$2" -q
-    wget_pid=$!
-
-        progress="0"
-        echo "$progress" # Initial progress value. sent to Zenity
-        while true; do
-            progress=$(tail -n 2 "/var/cache/tmp/download_progress" | head -1) # Read the second-to-last value written to the pipe, to avoid reading data that is half written
-            echo "$progress" # Send value to Zenity
-            if [[ "$(tail -n 1 "/var/cache/tmp/download_progress")" == "100" ]]; then # Read last line every time to check for download completion
-                echo "100"
-                break
-            fi
-            sleep 0.5
-        done
-
-    # Wait for wget process to finish
-    wait "$wget_pid"
   ) |
   zenity --progress \
     --title="Downloading File" \
     --text="Downloading $3..." \
-    --percentage=0 \
+    --pulsate \
     --auto-close
-
-  # Cleanup temp file
-  rm -f "/var/cache/tmp/download_progress"
 }
 
 update_rd_conf() {
@@ -275,7 +255,7 @@ dir_prep() {
   if [ -d "$symlink.old" ];
   then
     echo "Moving the data from $symlink.old to $real" #DEBUG
-    mv -f "$symlink.old"/{.[!.],}* $real
+    mv -f "$symlink.old"/{.[!.],}* "$real"
     echo "Removing $symlink.old" #DEBUG
     rm -rf "$symlink.old"
   fi
@@ -283,6 +263,29 @@ dir_prep() {
   echo -e "$symlink is now $real\n"
 }
 
+check_bios_files() {
+  # This function validates all the BIOS files listed in the $bios_checklist and adds the results to an array called bios_checked_list which can be used elsewhere
+  
+  rm -f "$godot_bios_files_checked" # Godot data transfer temp files
+  touch "$godot_bios_files_checked"
+
+  while IFS="^" read -r bios_file bios_subdir bios_hash bios_system bios_desc
+    do
+      bios_file_found="No"
+      bios_hash_matched="No"
+      if [[ -f "$bios_folder/$bios_subdir$bios_file" ]]; then
+        bios_file_found="Yes"
+        if [[ $bios_hash == "Unknown" ]]; then
+          bios_hash_matched="Unknown"
+        elif [[ $(md5sum "$bios_folder/$bios_subdir$bios_file" | awk '{ print $1 }') == "$bios_hash" ]]; then
+          bios_hash_matched="Yes"
+        fi
+      fi
+      bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc")
+      echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc" >> "$godot_bios_files_checked" # Godot data transfer temp file
+  done < $bios_checklist
+}
+
 update_rpcs3_firmware() {
   mkdir -p "$roms_folder/ps3/tmp"
   chmod 777 "$roms_folder/ps3/tmp"
@@ -291,6 +294,13 @@ update_rpcs3_firmware() {
   rm -rf "$roms_folder/ps3/tmp"
 }
 
+update_vita3k_firmware() {
+  download_file "http://dus01.psv.update.playstation.net/update/psv/image/2022_0209/rel_f2c7b12fe85496ec88a0391b514d6e3b/PSVUPDAT.PUP" "/tmp/PSVUPDAT.PUP" "Vita3K Firmware file: PSVUPDAT.PUP"
+  download_file "http://dus01.psp2.update.playstation.net/update/psp2/image/2019_0924/sd_8b5f60b56c3da8365b973dba570c53a5/PSP2UPDAT.PUP?dest=us" "/tmp/PSP2UPDAT.PUP" "Vita3K Firmware file: PSP2UPDAT.PUP"
+  Vita3K --firmware /tmp/PSVUPDAT.PUP
+  Vita3K --firmware /tmp/PSP2UPDAT.PUP
+}
+
 backup_retrodeck_userdata() {
   mkdir -p "$backups_folder"
   zip -rq9 "$backups_folder/$(date +"%0m%0d")_retrodeck_userdata.zip" "$saves_folder" "$states_folder" "$bios_folder" "$media_folder" "$themes_folder" "$logs_folder" "$screenshots_folder" "$mods_folder" "$texture_packs_folder" "$borders_folder" > $logs_folder/$(date +"%0m%0d")_backup_log.log
@@ -368,9 +378,6 @@ finit() {
 
   echo "Executing finit"
 
-  # Placing the default retrodeck.cfg
-  cp -vf $rd_defaults $rd_conf
-
   # Internal or SD Card?
   local finit_dest_choice=$(configurator_destination_choice_dialog "RetroDECK data" "Welcome to the first configuration of RetroDECK.\nThe setup will be quick but please READ CAREFULLY each message in order to avoid misconfigurations.\n\nWhere do you want your RetroDECK data folder to be located?\n\nThis folder will contain all ROMs, BIOSs and scraped data." )
   echo "Choice is $finit_dest_choice"
@@ -449,6 +456,10 @@ finit() {
     configurator_generic_dialog "RPCS3 Firmware Install" "You have chosen to install the RPCS3 firmware during the RetroDECK first setup.\n\nThis process will take several minutes and requires network access.\n\nRPCS3 will be launched automatically at the end of the RetroDECK setup process.\nOnce the firmware is installed, please close the emulator to finish the process."
   fi
 
+  if [[ "$finit_options_choices" =~ (vita3k_firmware|Enable All) ]]; then # Additional information on the firmware install process, as the emulator needs to be manually closed
+    configurator_generic_dialog "Vita3K Firmware Install" "You have chosen to install the Vita3K firmware during the RetroDECK first setup.\n\nThis process will take several minutes and requires network access.\n\nVita3K will be launched automatically at the end of the RetroDECK setup process.\nOnce the firmware is installed, please close the emulator to finish the process."
+  fi
+
   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."
@@ -464,6 +475,11 @@ finit() {
       update_rpcs3_firmware
     fi
   fi
+  if [[ "$finit_options_choices" =~ (vita3k_firmware|Enable All) ]]; then
+    if [[ $(check_network_connectivity) == "true" ]]; then
+      update_vita3k_firmware
+    fi
+  fi
   if [[ "$finit_options_choices" =~ (rd_controller_profile|Enable All) ]]; then
     install_retrodeck_controller_profile
   fi
@@ -486,9 +502,9 @@ install_retrodeck_starterpack() {
 
   ## DOOM section ##
   cp /app/retrodeck/extras/doom1.wad "$roms_folder/doom/doom1.wad" # No -f in case the user already has it
-  mkdir -p "/var/config/emulationstation/.emulationstation/gamelists/doom"
+  mkdir -p "/var/config/ES-DE/gamelists/doom"
-  if [[ ! -f "/var/config/emulationstation/.emulationstation/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist
+  if [[ ! -f "/var/config/ES-DE/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist
-    cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/emulationstation/.emulationstation/gamelists/doom/gamelist.xml"
+    cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/ES-DE/gamelists/doom/gamelist.xml"
   fi
   mkdir -p "$media_folder/doom"
   unzip -oq "/app/retrodeck/rd_prepacks/doom/doom.zip" -d "$media_folder/doom/"
@@ -519,8 +535,9 @@ update_splashscreens() {
   # This script will purge any existing ES graphics and reload them from RO space into somewhere ES will look for it
   # USAGE: update_splashscreens
 
-  rm -rf /var/config/emulationstation/.emulationstation/resources/graphics
+  rm -rf /var/config/ES-DE/resources/graphics
-  rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/emulationstation/.emulationstation/resources/graphics/"
+  rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/ES-DE/resources/graphics/"
+
 }
 
 deploy_helper_files() {
@@ -562,14 +579,111 @@ easter_eggs() {
   cp -f "$new_splash_file" "$current_splash_file" # Deploy assigned splash screen
 }
 
+manage_ryujinx_keys() {
+  # This function checks if Switch keys are existing and symlinks them inside the Ryujinx system folder
+  # If the symlinks are broken it recreates them
+
+  echo "Checking Ryujinx Switch keys." #TODO logging
+  local ryujinx_system="/var/config/Ryujinx/system"  # Set the path to the Ryujinx system folder
+  # Check if the keys folder exists
+  if [ -d "$bios_folder/switch/keys" ]; then
+      # Check if there are files in the keys folder
+      if [ -n "$(find "$bios_folder/switch/keys" -maxdepth 1 -type f)" ]; then
+          # Iterate over each file in the keys folder
+          for file in "$bios_folder/switch/keys"/*; do
+              local filename=$(basename "$file")
+              local symlink="$ryujinx_system/$filename"
+              
+              # Check if the symlink exists and is valid
+              if [ -L "$symlink" ] && [ "$(readlink -f "$symlink")" = "$file" ]; then
+                  echo "Found \"$symlink\" and it's a valid symlink." #TODO logging
+                  continue  # Skip if the symlink is already valid
+              fi
+              
+              # Remove broken symlink or non-symlink file
+              echo "Found \"$symlink\" but it's not a valid symlink. Repairing it" #TODO logging
+              [ -e "$symlink" ] && rm "$symlink"
+
+              # Create symlink
+              ln -s "$file" "$symlink"
+              echo "Created symlink: \"$symlink\""
+          done
+      else
+          echo "No files found in $bios_folder/switch/keys. Continuing" #TODO logging
+      fi
+  else
+      echo "Directory $bios_folder/switch/keys does not exist. Maybe Ryujinx was never run. Continuing" #TODO logging
+  fi
+}
+
+# TODO: this function is not yet used
+branch_selector() {
+    # Fetch branches from GitHub API excluding "main"
+    branches=$(curl -s https://api.github.com/repos/XargonWan/RetroDECK/branches | grep '"name":' | awk -F '"' '$4 != "main" {print $4}')
+    # TODO: logging - Fetching branches from GitHub API
+
+    # Create an array to store branch names
+    branch_array=()
+
+    # Loop through each branch and add it to the array
+    while IFS= read -r branch; do
+        branch_array+=("$branch")
+    done <<< "$branches"
+    # TODO: logging - Creating array of branch names
+
+    # Display branches in a Zenity list dialog
+    selected_branch=$(
+      zenity --list \
+        --icon-name=net.retrodeck.retrodeck \
+        --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+        --title "RetroDECK Configurator Cooker Branch - Select Branch" \
+        --column="Branch" --width=1280 --height=800 "${branch_array[@]}"
+    )
+    # TODO: logging - Displaying branches in Zenity list dialog
+
+    # Display warning message
+    if [ $selected_branch ]; then
+        zenity --question --icon-name=net.retrodeck.retrodeck --no-wrap \
+          --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+          --title "RetroDECK Configurator Cooker Branch - Switch Branch" \
+          --text="Are you sure you want to move to \"$selected_branch\" branch?"
+        # Output selected branch
+        echo "Selected branch: $selected_branch" # TODO: logging - Outputting selected branch
+        set_setting_value "$rd_conf" "branch" "$selected_branch" "retrodeck" "options"
+        branch="feat/sftp"
+        # Get the latest release for the specified branch
+        latest_release=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases" | jq ".[] | select(.target_commitish == \"$branch_name\") | .tag_name" | head -n 1)
+        # TODO: this will fail because the builds coming from the PRs are not published yet, we should fix them
+        # TODO: form a proper url: $flatpak_file_url
+        configurator_generic_dialog "RetroDECK Online Update" "The update process may take several minutes.\n\nAfter the update is complete, RetroDECK will close. When you run it again you will be using the latest version."
+          (
+          local desired_flatpak_file=$(curl --silent $flatpak_file_url | grep '"browser_download_url":' | sed -E 's/.*"([^"]+)".*/\1/')
+          mkdir -p "$rdhome/RetroDECK_Updates"
+          wget -P "$rdhome/RetroDECK_Updates" $desired_flatpak_file
+          flatpak-spawn --host flatpak remove --noninteractive -y net.retrodeck.retrodeck # Remove current version before installing new one, to avoid duplicates
+          flatpak-spawn --host flatpak install --user --bundle --noninteractive -y "$rdhome/RetroDECK_Updates/RetroDECK-cooker.flatpak"
+          rm -rf "$rdhome/RetroDECK_Updates" # Cleanup old bundles to save space
+          ) |
+          zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \
+          --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+          --title "RetroDECK Updater" \
+          --text="RetroDECK is updating to the latest \"$selected_branch\" version, please wait."
+          configurator_generic_dialog "RetroDECK Online Update" "The update process is now complete!\n\nPlease restart RetroDECK to keep the fun going."
+          exit 1
+    else
+        configurator_generic_dialog "No branch selected, exiting."
+        # TODO: logging
+    fi
+}
+
 quit_retrodeck() {
   pkill -f retrodeck
-  pkill -f emulationstation
+  pkill -f es-de
 }
 
 start_retrodeck() {
   easter_eggs # Check if today has a surprise splashscreen and load it if so
   # normal startup
   echo "Starting RetroDECK v$version"
-  emulationstation --home /var/config/emulationstation
+  es-de --home /var/config/
 }

functions/global.sh

@@ -25,11 +25,11 @@ zip_compressable_extensions="$emuconfigs/defaults/retrodeck/reference_lists/zip_
 easter_egg_checklist="$emuconfigs/defaults/retrodeck/reference_lists/easter_egg_checklist.cfg"                        # A config file listing days and times when special splash screens should show up
 input_validation="$emuconfigs/defaults/retrodeck/reference_lists/input_validation.cfg"                                # A config file listing valid CLI inputs
 finit_options_list="$emuconfigs/defaults/retrodeck/reference_lists/finit_options_list.cfg"                            # A config file listing available optional installs during finit
-splashscreen_dir="/var/config/emulationstation/.emulationstation/resources/graphics/extra_splashes"                   # The default location of extra splash screens
+splashscreen_dir="/var/config/ES-DE/resources/graphics/extra_splashes"                   # The default location of extra splash screens
-current_splash_file="/var/config/emulationstation/.emulationstation/resources/graphics/splash.svg"                    # The active splash file that will be shown on boot
+current_splash_file="/var/config/ES-DE/resources/graphics/splash.svg"                    # The active splash file that will be shown on boot
-default_splash_file="/var/config/emulationstation/.emulationstation/resources/graphics/splash-orig.svg"               # The default RetroDECK splash screen
+default_splash_file="/var/config/ES-DE/resources/graphics/splash-orig.svg"               # The default RetroDECK splash screen
 multi_user_emulator_config_dirs="$emuconfigs/defaults/retrodeck/reference_lists/multi_user_emulator_config_dirs.cfg"  # A list of emulator config folders that can be safely linked/unlinked entirely in multi-user mode
-rd_es_themes="/app/share/emulationstation/themes"                                                                     # The directory where themes packaged with RetroDECK are stored
+rd_es_themes="/app/share/es-de/themes"                                                                     # The directory where themes packaged with RetroDECK are stored
 lockfile="/var/config/retrodeck/.lock"                                                                                # where the lockfile is located
 default_sd="/run/media/mmcblk0p1"                                                                                     # Steam Deck SD default path
 hard_version="$(cat '/app/retrodeck/version')"                                                                        # hardcoded version (in the readonly filesystem)
@@ -47,6 +47,10 @@ presets_dir="$emuconfigs/defaults/retrodeck/presets"
 incompatible_presets_reference_list="$emuconfigs/defaults/retrodeck/reference_lists/incompatible_presets.cfg"         # A config file listing all incompatible presets for reference (eg. cannot have borders and widescreen enabled simultaniously)
 pretty_system_names_reference_list="$emuconfigs/defaults/retrodeck/reference_lists/pretty_system_names.cfg"           # An internal translation list for turning internal names (eg. gbc) to "pretty" names (Nintendo GameBoy Color)
 
+# Godot data transfer temp files
+
+godot_bios_files_checked="var/config/retrodeck/godot/godot_bios_files_checked.tmp"
+
 # Config files for emulators with single config files
 
 citraconf="/var/config/citra-emu/qt-config.ini"
@@ -58,7 +62,7 @@ yuzuconf="/var/config/yuzu/qt-config.ini"
 
 # ES-DE config files
 
-es_settings="/var/config/emulationstation/.emulationstation/es_settings.xml"
+es_settings="/var/config/ES-DE/settings/es_settings.xml"
 
 # RetroArch config files
 
@@ -109,8 +113,7 @@ vita3kconf="/var/data/Vita3K/config.yml"
 vita3kusrconfdir="$bios_folder/Vita3K/Vita3K"
 
 # We moved the lockfile in /var/config/retrodeck in order to solve issue #53 - Remove in a few versions
-if [ -f "$HOME/retrodeck/.lock" ]
+if [[ -f "$HOME/retrodeck/.lock" ]]; then
-then
   mv "$HOME/retrodeck/.lock" $lockfile
 fi
 
@@ -121,10 +124,12 @@ if [[ ! -f "$rd_conf" ]]; then
   echo "Initializing"
   # if we are here means that the we are in a new installation, so the version is valorized with the hardcoded one
   # Initializing the variables
-  if [ -z $version]; then
+  if [[ -z "$version" ]]; then
-    if [[ $(cat $lockfile) == *"0.4."* ]] || [[ $(cat $lockfile) == *"0.3."* ]] || [[ $(cat $lockfile) == *"0.2."* ]] || [[ $(cat $lockfile) == *"0.1."* ]]; then # If the previous version is very out of date, pre-rd_conf
+    if [[ -f "$lockfile" ]]; then
-      echo "Running version workaround"
+      if [[ $(cat $lockfile) == *"0.4."* ]] || [[ $(cat $lockfile) == *"0.3."* ]] || [[ $(cat $lockfile) == *"0.2."* ]] || [[ $(cat $lockfile) == *"0.1."* ]]; then # If the previous version is very out of date, pre-rd_conf
-      version=$(cat $lockfile)
+        echo "Running version workaround"
+        version=$(cat $lockfile)
+      fi
     else
       version="$hard_version"
     fi
@@ -132,10 +137,10 @@ if [[ ! -f "$rd_conf" ]]; then
 
   # Check if SD card path has changed from SteamOS update
   if [[ ! -d "$default_sd" && "$(ls -A /run/media/deck/)" ]]; then
-    if [[ $(find media/deck/* -maxdepth 0 -type d -print | wc -l) -eq 1 ]]; then # If there is only one SD card found in the new Steam OS 3.5 location, assign it as the default
+    if [[ $(find /run/media/deck/* -maxdepth 0 -type d -print | wc -l) -eq 1 ]]; then # If there is only one SD card found in the new SteamOS 3.5 location, assign it as the default
-      default_sd="$(find media/deck/* -maxdepth 0 -type d -print)"
+      default_sd="$(find /run/media/deck/* -maxdepth 0 -type d -print)"
     else # If the default legacy path cannot be found, and there are multiple entries in the new Steam OS 3.5 SD card path, let the user pick which one to use
-      configurator_generic_dialog "RetroDECK Setup" "The SD card was not found in the expected location.\nThis may happen when SteamOS is updated.\n\nPlease browse to the current location of the SD card.\n\nIf you are not using an SD card, please click \"Cancel\"."
+      configurator_generic_dialog "RetroDECK Setup" "The SD card was not found in the default location, and multiple drives were detected.\nPlease browse to the location of the desired SD card.\n\nIf you are not using an SD card, please click \"Cancel\"."
       default_sd="$(directory_browse "SD Card Location")"
     fi
   fi
@@ -171,8 +176,8 @@ else
   conf_read
 
   # Verify rdhome is where it is supposed to be.
-  if [[ ! -d $rdhome ]]; then
+  if [[ ! -d "$rdhome" ]]; then
-    prev_home_path=$rdhome
+    prev_home_path="$rdhome"
     configurator_generic_dialog "RetroDECK Setup" "The RetroDECK data folder was not found in the expected location.\nThis may happen when SteamOS is updated.\n\nPlease browse to the current location of the \"retrodeck\" folder."
     new_home_path=$(directory_browse "RetroDECK folder location")
     set_setting_value $rd_conf "rdhome" "$new_home_path" retrodeck "paths"

functions/patching.sh

@@ -53,6 +53,11 @@ set_setting_value() {
       fi
       ;;
     
+    "mame" ) # This only works for mame .ini files, not the .cfg XML files
+      local mame_current_value=$(get_setting_value $1 "$setting_name_to_change" $4)
+      sed -i '\^\^'"$setting_name_to_change"'\s^s^'"$mame_current_value"'^'"$setting_value_to_change"'^' "$1"
+      ;;
+
     "es_settings" )
       sed -i 's^'"$setting_name_to_change"'" value=".*"^'"$setting_name_to_change"'" value="'"$setting_value_to_change"'"^' "$1"
       ;;
@@ -76,6 +81,10 @@ get_setting_name() {
     echo "$current_setting_line" | grep -o -P "^\s*?.*?(?=\s?:\s?)" | sed -e 's/^[ \t]*//;s^\\ ^ ^g'
     ;;
 
+  "mame" ) # This only works for mame .ini files, not the .cfg XML files
+    echo "$current_setting_line" | awk '{print $1}'
+    ;;
+
   * )
     echo "$current_setting_line" | grep -o -P "^\s*?.*?(?=\s?=\s?)" | sed -e 's/^[ \t]*//;s^\\ ^ ^g;s^\\$^^'
     ;;
@@ -132,6 +141,10 @@ get_setting_value() {
     fi
   ;;
 
+  "mame" ) # This only works for mame .ini files, not the .cfg XML files
+    echo $(sed -n '\^\^'"$current_setting_name"'\s^p' "$1" | awk '{print $2}')
+  ;;
+
   "es_settings" )
     echo $(grep -o -P "(?<=$current_setting_name\" value=\").*(?=\")" "$1")
   ;;

functions/post_update.sh

@@ -124,7 +124,7 @@ post_update() {
     dir_prep "$texture_packs_folder/RetroArch-Mupen64Plus/hires_texture" "/var/config/retroarch/system/Mupen64plus/hires_texture"
     dir_prep "$texture_packs_folder/Duckstation" "/var/config/duckstation/textures"
 
-    dir_prep "$rdhome/gamelists" "/var/config/emulationstation/.emulationstation/gamelists"
+    dir_prep "$rdhome/gamelists" "/var/config/emulationstation/ES-DE/gamelists"
 
     dir_prep "$borders_folder" "/var/config/retroarch/overlays/borders"
     rsync -rlD --mkpath "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/overlays/borders/"
@@ -172,7 +172,7 @@ post_update() {
     dir_prep "$states_folder/psx/duckstation" "/var/config/duckstation/savestates"
 
     rm -rf /var/config/retrodeck/tools
-    rm -rf /var/config/emulationstation/.emulationstation/gamelists/tools/
+    rm -rf /var/config/emulationstation/ES-DE/gamelists/tools/
 
     mv "$saves_folder/gc/dolphin/EUR" "$saves_folder/gc/dolphin/EU"
     mv "$saves_folder/gc/dolphin/USA" "$saves_folder/gc/dolphin/US"
@@ -195,8 +195,8 @@ post_update() {
     sed -i '$ a <string name="UserThemeDirectory" value="" />' "$es_settings" # Add new default line to existing file
     set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings"
     unlink "/var/config/emulationstation/ROMs"
-    unlink "/var/config/emulationstation/.emulationstation/downloaded_media"
+    unlink "/var/config/emulationstation/ES-DE/downloaded_media"
-    unlink "/var/config/emulationstation/.emulationstation/themes"
+    unlink "/var/config/emulationstation/ES-DE/themes"
 
     set_setting_value "$raconf" "savestate_auto_load" "false" "retroarch"
     set_setting_value "$raconf" "savestate_auto_save" "false" "retroarch"
@@ -241,8 +241,25 @@ post_update() {
     # - Install RetroDECK controller profile in desired location TODO
     # - Change section name in retrodeck.cfg for ABXY button swap preset
     sed -i 's^nintendo_button_layout^abxy_button_swap^' "$rd_conf" # This is a one-off sed statement as there are no functions for replacing section names
+    
+    # in 3.0 .emulationstation was moved into ES-DE
+    mv -f /var/config/emulationstation /var/config/ES-DE
+    mv -f /var/config/ES-DE/.emulationstation/* /var/config/ES-DE
+    rm -rf /var/config/ES-DE/.emulationstation
+    rm -f /var/config/ES-DE/es_settings.xml
+
+    prepare_component "reset" "es-de"
+    prepare_component "reset" "mame"
+    prepare_component "reset" "vita3k"
+    prepare_component "reset" "gzdoom"
+    
   fi
 
+  # if [[ $prev_version -le "090" ]]; then
+  #   # Placeholder for version 0.9.0b
+  #   rm /var/config/emulationstation/.emulationstation # remving the old symlink to .emulationstation as it might be not needed anymore
+  # fi
+
   # The following commands are run every time.
 
   if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled

functions/prepare_component.sh

@@ -23,6 +23,7 @@ prepare_component() {
           mkdir -p "$rdhome/$(basename $current_setting_value)"
         fi
       done < <(grep -v '^\s*$' $rd_conf | awk '/^\[paths\]/{f=1;next} /^\[/{f=0} f')
+      mkdir -p "/var/config/retrodeck/godot"
     fi
     if [[ "$action" == "postmove" ]]; then # Update the paths of any folders that came with the retrodeck folder during a move
       while read -r config_line; do
@@ -39,21 +40,21 @@ prepare_component() {
 
   if [[ "$component" =~ ^(es-de|ES-DE|all)$ ]]; then # For use after ESDE-related folders are moved or a reset
     if [[ "$action" == "reset" ]]; then
-      rm -rf /var/config/emulationstation/
+      rm -rf /var/config/ES-DE
-      mkdir -p /var/config/emulationstation/.emulationstation/
+      mkdir -p /var/config/ES-DE/settings
-      cp -f /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml
+      cp -f /app/retrodeck/es_settings.xml /var/config/ES-DE/settings/es_settings.xml
       set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings"
       set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings"
       set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings"
-      dir_prep "$rdhome/gamelists" "/var/config/emulationstation/.emulationstation/gamelists"
+      dir_prep "$rdhome/gamelists" "/var/config/ES-DE/gamelists"
-      emulationstation --home /var/config/emulationstation --create-system-dirs
+      es-de --home /var/config/ES-DE --create-system-dirs
       update_splashscreens
     fi
     if [[ "$action" == "postmove" ]]; then
       set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings"
       set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings"
       set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings"
-      dir_prep "$rdhome/gamelists" "/var/config/emulationstation/.emulationstation/gamelists"
+      dir_prep "$rdhome/gamelists" "/var/config/ES-DE/gamelists"
     fi
   fi
 
@@ -541,27 +542,38 @@ prepare_component() {
   fi
 
   if [[ "$component" =~ ^(ryujunx|Ryujinx|all)$ ]]; then
+    # NOTE: for techincal reasons the system folder of Ryujinx IS NOT a sumlink of the bios/switch/keys as not only the keys are located there
+    # When RetroDECK starts there is a "manage_ryujinx_keys" function that symlinks the keys only in Rryujinx/system.
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
       echo "------------------------"
       echo "Initializing RYUJINX"
       echo "------------------------"
       if [[ $multi_user_mode == "true" ]]; then
         rm -rf "$multi_user_data_folder/$SteamAppUser/config/Ryujinx"
-        mkdir -p "$multi_user_data_folder/$SteamAppUser/config/Ryujinx/system"
+        #mkdir -p "$multi_user_data_folder/$SteamAppUser/config/Ryujinx/system"
+        # TODO: add /var/config/Ryujinx/system system folder management
         cp -fv $emuconfigs/ryujinx/* "$multi_user_data_folder/$SteamAppUser/config/Ryujinx"
-        sed -i 's#/home/deck/retrodeck#'$rdhome'#g' "$multi_user_data_folder/$SteamAppUser/config/Ryujinx/Config.json"
+        sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$multi_user_data_folder/$SteamAppUser/config/Ryujinx/Config.json"
         dir_prep "$multi_user_data_folder/$SteamAppUser/config/Ryujinx" "/var/config/Ryujinx"
+        # TODO: add nand (saves) folder management
+        # TODO: add nand (saves) folder management
+        # TODO: add "registered" folder management
       else
         # removing config directory to wipe legacy files
         rm -rf /var/config/Ryujinx
         mkdir -p /var/config/Ryujinx/system
         cp -fv $emuconfigs/ryujinx/* /var/config/Ryujinx
-        sed -i 's#/home/deck/retrodeck#'$rdhome'#g' "$ryujinxconf"
+        sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$ryujinxconf"
+        # Linking switch nand/saves folder
+        rm -rf /var/config/Ryujinx/bis
+        dir_prep "$saves_folder/switch/ryujinx/nand" "/var/config/Ryujinx/bis"
+        dir_prep "$saves_folder/switch/ryujinx/sdcard" "/var/config/Ryujinx/sdcard"
+        dir_prep "$bios_folder/switch/ryujinx/registered" "/var/config/Ryujinx/bis/system/Contents/registered"
       fi
     fi
-    if [[ "$action" == "reset" ]] || [[ "$action" == "postmove" ]]; then # Run commands that apply to both resets and moves
+    # if [[ "$action" == "reset" ]] || [[ "$action" == "postmove" ]]; then # Run commands that apply to both resets and moves
-      dir_prep "$bios_folder/switch/keys" "/var/config/Ryujinx/system"
+    #   dir_prep "$bios_folder/switch/keys" "/var/config/Ryujinx/system"
-    fi
+    # fi
     if [[ "$action" == "postmove" ]]; then # Run only post-move commands
       sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$ryujinxconf" # This is an unfortunate one-off because set_setting_value does not currently support JSON
     fi
@@ -678,23 +690,13 @@ prepare_component() {
       else # Single-user actions
         # NOTE: the component is writing in "." so it must be placed in the rw filesystem. A symlink of the binary is already placed in /app/bin/Vita3K
         rm -rf "/var/data/Vita3K"
-        mkdir -p "/var/data/Vita3K"
+        mkdir -p "/var/data/Vita3K/Vita3K"
-        unzip "/app/retrodeck/vita3k.zip" -d "/var/data/Vita3K"
-        chmod +x "/var/data/Vita3K/Vita3K"
-        rm -f "/var/data/Vita3K/update-vita3k.sh"
         cp -fvr "$emuconfigs/vita3k/config.yml" "/var/data/Vita3K" # component config
         cp -fvr "$emuconfigs/vita3k/ux0" "$bios_folder/Vita3K/Vita3K" # User config
         set_setting_value "$vita3kconf" "pref-path" "$rdhome/bios/Vita3K/Vita3K/" "vita3k"
       fi
       # Shared actions
       dir_prep "$saves_folder/psvita/vita3k" "$bios_folder/Vita3K/Vita3K/ux0/user/00/savedata" # Multi-user safe?
-
-      # Installing firmware
-      # TODO: at the moment this is here instead of a tool because it seems like it cannot run without Firmware
-      curl "http://dus01.psv.update.playstation.net/update/psv/image/2022_0209/rel_f2c7b12fe85496ec88a0391b514d6e3b/PSVUPDAT.PUP" -po /tmp/PSVUPDAT.PUP
-      curl "http://dus01.psp2.update.playstation.net/update/psp2/image/2019_0924/sd_8b5f60b56c3da8365b973dba570c53a5/PSP2UPDAT.PUP?dest=us" -po /tmp/PSP2UPDAT.PUP
-      Vita3K --firmware /tmp/PSVUPDAT.PUP
-      Vita3K --firmware /tmp/PSP2UPDAT.PUP
     fi
     if [[ "$action" == "postmove" ]]; then # Run only post-move commands
       dir_prep "$saves_folder/psvita/vita3k" "$bios_folder/Vita3K/Vita3K/ux0/user/00/savedata" # Multi-user safe?
@@ -709,14 +711,65 @@ prepare_component() {
     echo "Initializing MAME"
     echo "----------------------"
 
+    # TODO: probably some of these needs to be put elsewhere
     mkdir -p $saves_folder/mame-sa
-    mkdir -p "/var/config/mame"
+    mkdir -p "$saves_folder/mame-sa/nvram"
-    dir_prep "$saves_folder/mame-sa/hiscore" "/var/config/mame/hiscore"
+    mkdir -p "$states_folder/mame-sa"
-    cp -fvr "$emuconfigs/mame/**" "/var/config/mame"
+    mkdir -p "$rdhome/screenshots/mame-sa"
-    sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "/var/config/mame/*.ini"
+    mkdir -p "$saves_folder/mame-sa/diff"
-    sed -i 's#RETRODECKHOMESDIR#'$rdhome'#g' "/var/config/mame/*.ini"
-    sed -i 's#RETRODECKSAVESDIR#'$rdhome'#g' "/var/config/mame/*.ini"
 
+    mkdir -p "/var/config/ctrlr"
+    mkdir -p "/var/config/mame/ini"
+    mkdir -p "/var/config/mame/cfg"
+    mkdir -p "/var/config/mame/inp"
+
+    mkdir -p "/var/data/mame/plugin-data"
+    mkdir -p "/var/data/mame/hash"
+    mkdir -p "/var/data/mame/assets/samples"
+    mkdir -p "/var/data/mame/assets/artwork"
+    mkdir -p "/var/data/mame/assets/fonts"
+    mkdir -p "/var/data/mame/cheat"
+    mkdir -p "/var/data/mame/assets/crosshair"
+    mkdir -p "/var/data/mame/plugins"
+    mkdir -p "/var/data/mame/assets/language"
+    mkdir -p "/var/data/mame/assets/software"
+    mkdir -p "/var/data/mame/assets/comments"
+    mkdir -p "/var/data/mame/assets/share"
+    mkdir -p "/var/data/mame/dats"
+    mkdir -p "/var/data/mame/folders"
+    mkdir -p "/var/data/mame/assets/cabinets"
+    mkdir -p "/var/data/mame/assets/cpanel"
+    mkdir -p "/var/data/mame/assets/pcb"
+    mkdir -p "/var/data/mame/assets/flyers"
+    mkdir -p "/var/data/mame/assets/titles"
+    mkdir -p "/var/data/mame/assets/ends"
+    mkdir -p "/var/data/mame/assets/marquees"
+    mkdir -p "/var/data/mame/assets/artwork-preview"
+    mkdir -p "/var/data/mame/assets/bosses"
+    mkdir -p "/var/data/mame/assets/logo"
+    mkdir -p "/var/data/mame/assets/scores"
+    mkdir -p "/var/data/mame/assets/versus"
+    mkdir -p "/var/data/mame/assets/gameover"
+    mkdir -p "/var/data/mame/assets/howto"
+    mkdir -p "/var/data/mame/assets/select"
+    mkdir -p "/var/data/mame/assets/icons"
+    mkdir -p "/var/data/mame/assets/covers"
+    mkdir -p "/var/data/mame/assets/ui"
+
+    dir_prep "$saves_folder/mame-sa/hiscore" "/var/config/mame/hiscore"
+    cp -fvr "$emuconfigs/mame/mame.ini" "/var/config/mame"
+    cp -fvr "$emuconfigs/mame/ui.ini" "/var/config/mame"
+    cp -fvr "$emuconfigs/mame/default.cfg" "/var/config/mame"
+
+    sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "/var/config/mame/mame.ini"
+    sed -i 's#RETRODECKHOMESDIR#'$rdhome'#g' "/var/config/mame/mame.ini"
+    sed -i 's#RETRODECKSAVESDIR#'$rdhome'#g' "/var/config/mame/mame.ini"
+    sed -i 's#RETRODECKSTATESDIR#'$rdhome'#g' "/var/config/mame/mame.ini"
+
+    sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "/var/config/mame/ui.ini"
+    sed -i 's#RETRODECKHOMESDIR#'$rdhome'#g' "/var/config/mame/ui.ini"
+    sed -i 's#RETRODECKSAVESDIR#'$rdhome'#g' "/var/config/mame/ui.ini"
+    sed -i 's#RETRODECKSTATESDIR#'$rdhome'#g' "/var/config/mame/ui.ini"
   fi
 
   if [[ "$component" =~ ^(gzdoom|GZDOOM|all)$ ]]; then

functions/presets.sh

@@ -112,11 +112,11 @@ build_preset_config() {
           "change" )
             if [[ "$read_preset" == "$current_preset" ]]; then
               if [[ "$target_file" = \$* ]]; then # Read current target file and resolve if it is a variable
-                declare -g "target_file=$target_file"
+                eval target_file=$target_file
               fi
               local read_target_file="$target_file"
               if [[ "$defaults_file" = \$* ]]; then #Read current defaults file and resolve if it is a variable
-                declare -g "defaults_file=$defaults_file"
+                eval defaults_file=$defaults_file
               fi
               local read_defaults_file="$defaults_file"
               if [[ "$read_system_enabled" == "true" ]]; then

net.retrodeck.retrodeck.appdata.xml

@@ -8,7 +8,7 @@
    <developer_name>RetroDECK Team</developer_name>
    <url type="homepage">https://retrodeck.net</url>
    <url type="bugtracker">https://github.com/XargonWan/RetroDECK/issues</url>
-   <url type="help">http://discord.gg/Dz3szYsP8g</url>
+   <url type="help">https://retrodeck.readthedocs.io</url>
    <url type="faq">https://github.com/XargonWan/RetroDECK/wiki/FAQs---Frequently-asked-questions</url>
    <url type="donation">https://www.patreon.com/RetroDECK</url>
    <content_rating type="oars-1.0" />

net.retrodeck.retrodeck.yml

@@ -407,7 +407,7 @@ modules:
       - '*.la'
 
   # When updating this module remember to check those:
-  # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/unix/es_find_rules.xml
+  # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/linux/es_find_rules.xml
   # But we don't include them 1:1 as RetroDECK got some specific configs in some cases
   - name: ES-DE
     buildsystem: cmake-ninja
@@ -419,12 +419,8 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK-ES-DE
-        branch: cebbeff3b5f834fd9adaeb1f5dc9e0da6b106599
+        branch: update/3.0
       - type: shell
-        commands:
-          - sed -i 's#"EMULATIONSTATION-DE  V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK
-            v'$(cat ${FLATPAK_DEST}/retrodeck/version)', ES-DE  v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g'
-            es-app/src/guis/GuiMenu.cpp
 
   # ES-DE - END
 
@@ -433,8 +429,8 @@ modules:
   - name: art-book-next-es-de
     buildsystem: simple
     build-commands:
-      - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/
+      - mkdir -p ${FLATPAK_DEST}/share/es-de/themes/art-book-next-es-de/
-      - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/
+      - mv -f * ${FLATPAK_DEST}/share/es-de/themes/art-book-next-es-de/
     sources:
       - type: git
         url:  https://github.com/anthonycaccese/art-book-next-es-de.git
@@ -1310,6 +1306,23 @@ modules:
 
   # MAME - End
 
+  # Ryujinx Appimage - START
+  # https://ryujinx.org/download
+
+  - name: Ryujinx
+    buildsystem: simple
+    build-commands:
+      - |
+        tar -zxvf *.tar.gz
+        mv -v publish ${FLATPAK_DEST}/ryujinx
+        ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx.sh
+    sources:
+      - type: file
+        url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1192/ryujinx-1.1.1192-linux_x64.tar.gz
+        sha256: 41716233f5745a7df1e411af6bac9d828f0b6b6feb63b5ef87445b81b01dee54
+
+  # Ryujinx Appimage - END
+
   # External manifests end
 
   - name: retrodeck
@@ -1320,16 +1333,16 @@ modules:
       - mkdir -p ${FLATPAK_DEST}/retrodeck
 
       # Prep the ES-DE and RetroArch config files - I will have to SED/XMLSTARLET them soon
-      - rm -rf /app/share/emulationstation/resources/systems/unix/es_find_rules.xml
+      - rm -rf /app/share/es-de/resources/systems/linux/es_find_rules.xml
-      - cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/unix/
+      - cp es-configs/es_find_rules.xml /app/share/es-de/resources/systems/linux/
-      - rm -rf /app/share/emulationstation/resources/systems/unix/es_systems.xml
+      - rm -rf /app/share/es-de/resources/systems/linux/es_systems.xml
-      - cp es-configs/es_systems.xml /app/share/emulationstation/resources/systems/unix/
+      - cp es-configs/es_systems.xml /app/share/es-de/resources/systems/linux/
       # These must be put in home folder, managed by retrodeck.sh
       - cp es-configs/es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml
       - mv -f -t ${FLATPAK_DEST}/retrodeck es-configs/rd_prepacks
 
       # Logo, res, move graphics directory away from default location so splash can be changed after build
-      - mv -f -t ${FLATPAK_DEST}/retrodeck /app/share/emulationstation/resources/graphics
+      - mv -f -t ${FLATPAK_DEST}/retrodeck /app/share/es-de/resources/graphics
       - cp -f res/splash.svg ${FLATPAK_DEST}/retrodeck/graphics/splash.svg
       - cp -f res/splash.svg ${FLATPAK_DEST}/retrodeck/graphics/splash-orig.svg
       - cp -rf res/extra_splashes/ ${FLATPAK_DEST}/retrodeck/graphics
@@ -1343,7 +1356,7 @@ modules:
       # Tools
       - mkdir -p /app/tools
       - cp -r tools/** /app/tools
-      - find /app/tools -name '*.py|*.sh' -exec chmod +x {} \;
+      - find /app/tools -type f \( -name "*.sh" -o -name "*.py" \) -exec chmod +x {} \;
 
       # Function libraries
       - mkdir -p /app/libexec
@@ -1376,6 +1389,10 @@ modules:
       - cp emu-configs/gzdoom/gzdoom.sh ${FLATPAK_DEST}/bin/gzdoom.sh
       - chmod +x ${FLATPAK_DEST}/bin/gzdoom.sh
 
+      # MAME wrapper
+      - cp emu-configs/mame/mame-rdwrapper.sh ${FLATPAK_DEST}/bin/mame-rdwrapper.sh
+      - chmod +x ${FLATPAK_DEST}/bin/mame-rdwrapper.sh
+
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git

old/removed-modules.yml

@@ -112,24 +112,7 @@
 
   # Duckstation-DontUpdate - END
 
-    # Ryujinx Appimage - START
+  # Ryujinx - START
-  # https://ryujinx.org/download
-
-  # - name: Ryujinx
-  #   buildsystem: simple
-  #   build-commands:
-  #     - |
-  #       tar -zxvf ryujinx-1.1.685-linux_x64.tar.gz
-  #       mv -v publish ${FLATPAK_DEST}/ryujinx
-  #       ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx
-  #   sources:
-  #     - type: file
-  #       url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.685/ryujinx-1.1.685-linux_x64.tar.gz
-  #       sha256: bc4d7076106d7aa59c3a3ea22b83c553e5fa1a897815831adcf18cc13d729e15
-
-  # Ryujinx Appimage - END
-
-    # Ryujinx - START
   # https://github.com/flathub/org.ryujinx.Ryujinx
 
   - name: Ryujinx

rd-submodules/es-de/GuiMenu.cpp.patch

@@ -1,38 +0,0 @@
-diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp
---- emulationstation-de/es-app/src/guis/GuiMenu.cpp	2023-08-23 13:12:15.617292576 +0200
-+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp	2023-08-23 13:44:10.736412006 +0200
-@@ -67,2 +67,4 @@
- 
-+    addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); });
-+
-     if (!Settings::getInstance()->getBool("ForceKiosk") &&
-@@ -70,3 +72,3 @@
- #if defined(__APPLE__)
--        addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); });
-+        addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); });
- #else
-@@ -75,3 +77,3 @@
-         else
--            addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); });
-+            addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); });
- #endif
-@@ -1758,3 +1760,3 @@
-         auto quitText = std::make_shared<TextComponent>(
--            "QUIT EMULATIONSTATION", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary);
-+            "QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary);
-         quitText->setSelectable(true);
-@@ -1910 +1912,14 @@
- }
-+
-+void GuiMenu::openRetroDeckConfigurator()
-+{
-+    // Launch the configurator.sh script
-+    std::string command;
-+    std::string startDirectory;
-+    bool runInBackground;
-+    command = "bash /app/tools/configurator.sh";
-+    startDirectory = "/app/tools";
-+    runInBackground = false;
-+    int result = Utils::Platform::launchGameUnix(command, startDirectory, runInBackground);
-+    // You can add any checks for the script's outcome here.
-+}

rd-submodules/es-de/GuiMenu.h.patch

@@ -1,10 +0,0 @@
-diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h
---- emulationstation-de/es-app/src/guis/GuiMenu.h	2023-08-23 13:12:15.617292576 +0200
-+++ emulationstation-de/es-app/src/guis/GuiMenu.h	2023-08-23 13:50:20.978700234 +0200
-@@ -46,2 +46,3 @@
-     void openOtherOptions();
-+    void openRetroDeckConfigurator();
-     void openQuitMenu();
-@@ -54 +55,2 @@
- #endif // ES_APP_GUIS_GUI_MENU_H
-+

rd-submodules/es-de/GuiThemeDownloader.cpp.patch

@@ -1,10 +0,0 @@
-diff -au1r emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp
---- emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp	2023-11-03 16:25:01.115126901 +0100
-+++ emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp	2023-11-03 16:26:18.882607724 +0100
-@@ -602,4 +602,4 @@
-                 getHelpStyle(),
--                "IT SEEMS AS IF YOU'RE NOT RUNNING THE LATEST ES-DE RELEASE, PLEASE UPGRADE BEFORE "
--                "PROCEEDING AS THESE THEMES MAY NOT BE COMPATIBLE WITH YOUR VERSION",
-+                "ES-DE THEME ENGINE WAS UPDATED UPSTREAM. THESE THEMES MAY NOT BE COMPATIBLE WITH THE CURRENT RETRODECK VERSION."
-+                "CHECK IF A NEW RETRODECK UPDATE IS AVAILABLE, ELSE PLEASE WAIT FOR IT OR PROCEED AT YOUR OWN RISK.",
-                 "OK", [] { return; }, "", nullptr, "", nullptr, nullptr, true));

rd-submodules/es-de/ViewController.cpp.patch

@@ -1,101 +0,0 @@
-diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp
---- emulationstation-de/es-app/src/views/ViewController.cpp	2023-11-04 15:09:24.332178777 -0400
-+++ emulationstation-de/es-app/src/views/ViewController.cpp	2023-11-04 15:13:59.015780009 -0400
-@@ -195,91 +195,3 @@
-     mNoGamesMessageBox = new GuiMsgBox(
--        HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY",
--        [this] {
--            std::string currentROMDirectory;
--#if defined(_WIN64)
--            currentROMDirectory = Utils::String::replace(FileData::getROMDirectory(), "/", "\\");
--#else
--            currentROMDirectory = FileData::getROMDirectory();
--#endif
--            if (Settings::getInstance()->getBool("VirtualKeyboard")) {
--                mWindow->pushGui(new GuiTextEditKeyboardPopup(
--                    HelpStyle(), 0.0f, "ENTER ROM DIRECTORY PATH", currentROMDirectory,
--                    [this, currentROMDirectory](const std::string& newROMDirectory) {
--                        if (currentROMDirectory != newROMDirectory) {
--                            Settings::getInstance()->setString(
--                                "ROMDirectory", Utils::String::trim(newROMDirectory));
--                            Settings::getInstance()->saveFile();
--#if defined(_WIN64)
--                            mRomDirectory =
--                                Utils::String::replace(FileData::getROMDirectory(), "/", "\\");
--#else
--                            mRomDirectory = FileData::getROMDirectory();
--#endif
--                            mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory);
--                            mWindow->pushGui(new GuiMsgBox(HelpStyle(),
--                                                           "ROM DIRECTORY SETTING SAVED, RESTART\n"
--                                                           "THE APPLICATION TO RESCAN THE SYSTEMS",
--                                                           "OK", nullptr, "", nullptr, "", nullptr,
--                                                           nullptr, true, true));
--                        }
--                    },
--                    false, "SAVE", "SAVE CHANGES?", "Currently configured path:",
--                    currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH",
--                    "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)"));
--            }
--            else {
--                mWindow->pushGui(new GuiTextEditPopup(
--                    HelpStyle(), "ENTER ROM DIRECTORY PATH", currentROMDirectory,
--                    [this](const std::string& newROMDirectory) {
--                        Settings::getInstance()->setString("ROMDirectory",
--                                                           Utils::String::trim(newROMDirectory));
--                        Settings::getInstance()->saveFile();
--#if defined(_WIN64)
--                        mRomDirectory =
--                            Utils::String::replace(FileData::getROMDirectory(), "/", "\\");
--#else
--                        mRomDirectory = FileData::getROMDirectory();
--#endif
--                        mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory);
--                        mWindow->pushGui(new GuiMsgBox(HelpStyle(),
--                                                       "ROM DIRECTORY SETTING SAVED, RESTART\n"
--                                                       "THE APPLICATION TO RESCAN THE SYSTEMS",
--                                                       "OK", nullptr, "", nullptr, "", nullptr,
--                                                       nullptr, true));
--                    },
--                    false, "SAVE", "SAVE CHANGES?", "Currently configured path:",
--                    currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH",
--                    "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)"));
--            }
--        },
--        "CREATE DIRECTORIES",
--        [this] {
--            mWindow->pushGui(new GuiMsgBox(
--                HelpStyle(),
--                "THIS WILL CREATE DIRECTORIES FOR ALL THE\n"
--                "GAME SYSTEMS DEFINED IN es_systems.xml\n\n"
--                "THIS MAY CREATE A LOT OF FOLDERS SO IT'S\n"
--                "ADVICED TO REMOVE THE ONES YOU DON'T NEED",
--                "PROCEED",
--                [this] {
--                    if (!SystemData::createSystemDirectories()) {
--                        mWindow->pushGui(new GuiMsgBox(HelpStyle(),
--                                                       "THE SYSTEM DIRECTORIES WERE SUCCESSFULLY\n"
--                                                       "GENERATED, EXIT THE APPLICATION AND PLACE\n"
--                                                       "YOUR GAMES IN THE NEWLY CREATED FOLDERS",
--                                                       "OK", nullptr, "", nullptr, "", nullptr,
--                                                       nullptr, true));
--                    }
--                    else {
--                        mWindow->pushGui(new GuiMsgBox(HelpStyle(),
--                                                       "ERROR CREATING THE SYSTEM DIRECTORIES,\n"
--                                                       "PERMISSION PROBLEMS OR DISK FULL?\n\n"
--                                                       "SEE THE LOG FILE FOR MORE DETAILS",
--                                                       "OK", nullptr, "", nullptr, "", nullptr,
--                                                       nullptr, true));
--                    }
--                },
--                "CANCEL", nullptr, "", nullptr, nullptr, false));
--        },
--        "QUIT",
-+        HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT",
-         [] {
-@@ -289,3 +201,3 @@
-         },
--        nullptr, true, false,
-+        "", nullptr, "", nullptr, nullptr, true, true,
-         (mRenderer->getIsVerticalOrientation() ?

rd-submodules/es-de/Window.cpp.patch

@@ -1,9 +0,0 @@
-diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp
---- emulationstation-de/es-core/src/Window.cpp	2023-08-29 14:14:17.208301836 +0200
-+++ emulationstation-de/es-core/src/Window.cpp	2023-08-29 14:12:37.307334069 +0200
-
-@@ -181,3 +181,3 @@
-     progressBarRect.barPosY += borderThickness;
--    progressBarRect.color = 0x79010FFF;
-+    progressBarRect.color = 0xC858E6FF;
-     mProgressBarRectangles.emplace_back(progressBarRect);

rd-submodules/es-de/patch_helper.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-
-mkdir /tmp
-
-branch="00a226062fff37209d98e0ab048ac89af50ecacc"
-git clone "https://gitlab.com/es-de/emulationstation-de.git" /tmp/emulationstation-de
-
-pushd .
-cd /tmp/emulationstation-de
-git checkout $branch
-popd
-
-mkdir patches-tmp
-
-cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp             ./patches-tmp
-cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h               ./patches-tmp
-cp /tmp/emulationstation-de/es-app/src/views/ViewController.cpp     ./patches-tmp
-cp /tmp/emulationstation-de/es-core/src/Window.cpp                  ./patches-tmp
-cp /tmp/emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp  ./patches-tmp
-
-read -p "Please edit the files in \"patches-tmp\" and press enter to continue."
-
-diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp             ./patches-tmp/GuiMenu.cpp               > GuiMenu.cpp.patch
-diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h               ./patches-tmp/GuiMenu.h                 > GuiMenu.h.patch 
-diff -au1r /tmp/emulationstation-de/es-app/src/views/ViewController.cpp     ./patches-tmp/ViewController.cpp        > ViewController.cpp.patch            
-diff -au1r /tmp/emulationstation-de/es-core/src/Window.cpp                  ./patches-tmp/Window.cpp                > Window.cpp.patch
-diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp  ./patches-tmp/GuiThemeDownloader.cpp    > GuiThemeDownloader.cpp.patch
-
-rm -rf patches-tmp
-
-echo "Done, now please remeber to edit the headers of the patch files with the correct paths."

retrodeck.sh

@@ -56,9 +56,9 @@ https://retrodeck.net
       ;;
     --reset-component*)
       echo "You are about to reset one or more RetroDECK components or emulators."
-      echo "Available options are: es-de, retroarch, cemu, citra, dolphin, duckstation, melonds, pcsx3, pico8, ppsspp, primehack, rpcs3, xemu, yuzu, vita3k, mame, gzdoom, boilr, all"
+      echo "Available options are: es-de, retroarch, cemu, citra, dolphin, duckstation, melonds, pcsx3, pico8, ppsspp, primehack, ryujinx. rpcs3, ryujinx, xemu, yuzu, vita3k, mame, gzdoom, boilr, all"
       read -p "Please enter the component you would like to reset: " component
-      if [[ "$emulator" =~ ^(es-de|retroarch|cemu|citra|dolphin|duckstation|mame|melonds|pcsx2|ppsspp|primehack|rpcs3|xemu|yuzu|all-emulators)$ ]]; then
+      if [[ "$component" =~ ^(es-de|retroarch|cemu|citra|dolphin|duckstation|mame|melonds|pcsx2|ppsspp|primehack|ryujinx|rpcs3|xemu|yuzu|all)$ ]]; then
         read -p "You are about to reset $component to default settings. Enter 'y' to continue, 'n' to stop: " response
         if [[ $response == [yY] ]]; then
           prepare_component "reset" "$component" "cli"
@@ -79,8 +79,8 @@ https://retrodeck.net
       if [[ $response == [yY] ]]; then
         rm -f "$lockfile"
         rm -f "$rd_conf"
-        read -p "The process has been completed, press Enter key to start the initial RetroDECK setup process."
+        read -p "The process has been completed, press Enter key to exit. Please run RetroDECK again to start the initial setup process."
-        shift # Continue launch after previous command is finished
+        exit 1
       else
         read -p "The process has been cancelled, press Enter key to exit."
         exit
@@ -182,6 +182,9 @@ if [[ -f "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_conf
 fi
 # REMOVE BEFORE NEXT VERSION RELEASE
 
+# Linking switch keys for Ryujinx
+manage_ryujinx_keys
+
 # Normal Startup
 
 if [[ $steam_sync == "true" ]]; then

tools/configurator.sh

@@ -60,6 +60,7 @@ source /app/libexec/global.sh
 #         - Compress All Games
 #       - Install: RetroDECK SD Controller Profile
 #       - Install: PS3 firmware
+#       - Install: PS Vita firmware
 #       - RetroDECK: Change Update Setting
 #     - Troubleshooting
 #       - Backup: RetroDECK Userdata
@@ -475,7 +476,7 @@ configurator_open_emulator_dialog() {
   ;;
 
   "MAME" )
-    mame
+    mame-rdwrapper.sh
   ;;
 
   "MelonDS" )
@@ -499,7 +500,7 @@ configurator_open_emulator_dialog() {
   ;;
 
   "Ryujinx" )
-    ryujinx-wrapper
+    Ryujinx.sh
   ;;
 
   "Vita3K" )
@@ -531,6 +532,7 @@ configurator_retrodeck_tools_dialog() {
   "Tool: Compress Games" "Compress games for systems that support it" \
   "Install: RetroDECK SD Controller Profile" "Install the custom RetroDECK controller layout for the Steam Deck" \
   "Install: PS3 Firmware" "Download and install PS3 firmware for use with the RPCS3 emulator" \
+  "Install: PS Vita Firmware" "Download and install PS Vita firmware for use with the Vita3K emulator" \
   "RetroDECK: Change Update Setting" "Enable or disable online checks for new versions of RetroDECK" )
 
   case $choice in
@@ -571,6 +573,24 @@ configurator_retrodeck_tools_dialog() {
     fi
   ;;
 
+  "Install: PS Vita Firmware" )
+    if [[ $(check_network_connectivity) == "true" ]]; then
+      configurator_generic_dialog "RetroDECK Configurator - Install: PS Vita firmware" "This tool will download firmware required by Vita3K to emulate PS Vita games.\n\nThe process will take several minutes, and the emulator will launch to finish the installation.\nPlease close Vita3K manually once the installation is complete."
+      (
+        update_vita3k_firmware
+      ) |
+        zenity --progress --pulsate \
+        --icon-name=net.retrodeck.retrodeck \
+        --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+        --title="Downloading PS Vita Firmware" \
+        --no-cancel \
+        --auto-close
+    else
+      configurator_generic_dialog "RetroDECK Configurator - Install: PS Vita Firmware" "You do not appear to currently have Internet access, which is required by this tool. Please try again when network access has been restored."
+      configurator_retrodeck_tools_dialog
+    fi
+  ;;
+
   "RetroDECK: Change Update Setting" )
     configurator_online_update_setting_dialog
   ;;
@@ -691,33 +711,24 @@ configurator_compression_tool_dialog() {
 configurator_compress_single_game_dialog() {
   local file=$(file_browse "Game to compress")
   if [[ ! -z "$file" ]]; then
+    local system=$(echo "$file" | grep -oE "$roms_folder/[^/]+" | grep -oE "[^/]+$")
     local compatible_compression_format=$(find_compatible_compression_format "$file")
     if [[ ! $compatible_compression_format == "none" ]]; then
       local post_compression_cleanup=$(configurator_compression_cleanup_dialog)
       (
-      if [[ $compatible_compression_format == "chd" ]]; then
+      echo "# Compressing $(basename "$file") to $compatible_compression_format format"
-        if [[ $(validate_for_chd "$file") == "true" ]]; then
+      compress_game "$compatible_compression_format" "$file" "$system"
-          echo "# Compressing $(basename "$file") to $compatible_compression_format format"
+      if [[ $post_compression_cleanup == "true" ]]; then # Remove file(s) if requested
-          compress_game "chd" "$file"
+        if [[ "$file" == *".cue" ]]; then
-          if [[ $post_compression_cleanup == "true" ]]; then # Remove file(s) if requested
+          local cue_bin_files=$(grep -o -P "(?<=FILE \").*(?=\".*$)" "$file")
-            if [[ "$file" == *".cue" ]]; then
+          local file_path=$(dirname "$(realpath "$file")")
-              local cue_bin_files=$(grep -o -P "(?<=FILE \").*(?=\".*$)" "$file")
+          while IFS= read -r line
-              local file_path=$(dirname "$(realpath "$file")")
+          do
-              while IFS= read -r line
+            rm -f "$file_path/$line"
-              do
+          done < <(printf '%s\n' "$cue_bin_files")
-                rm -f "$file_path/$line"
+          rm -f $(realpath "$file")
-              done < <(printf '%s\n' "$cue_bin_files")
+        else
-              rm -f "$file"
+          rm -f "$(realpath "$file")"
-            else
-              rm -f "$file"
-            fi
-          fi
-        fi
-      else
-        echo "# Compressing $(basename "$file") to $compatible_compression_format format"
-        compress_game "$compatible_compression_format" "$file"
-        if [[ $post_compression_cleanup == "true" ]]; then # Remove file(s) if requested
-          rm -f "$file"
         fi
       fi
       ) |
@@ -817,12 +828,13 @@ configurator_compress_multiple_games_dialog() {
     local post_compression_cleanup=$(configurator_compression_cleanup_dialog)
     (
     for file in "${games_to_compress[@]}"; do
+      local system=$(echo "$file" | grep -oE "$roms_folder/[^/]+" | grep -oE "[^/]+$")
       local compression_format=$(find_compatible_compression_format "$file")
       echo "# Compressing $(basename "$file") into $compression_format format" # Update Zenity dialog text
       progress=$(( 100 - (( 100 / "$total_games_to_compress" ) * "$games_left_to_compress" )))
       echo $progress
       games_left_to_compress=$((games_left_to_compress-1))
-      compress_game "$compression_format" "$file"
+      compress_game "$compression_format" "$file" "$system"
       if [[ $post_compression_cleanup == "true" ]]; then # Remove file(s) if requested
         if [[ "$file" == *".cue" ]]; then
           local cue_bin_files=$(grep -o -P "(?<=FILE \").*(?=\".*$)" "$file")
@@ -940,20 +952,7 @@ configurator_check_bios_files() {
   configurator_generic_dialog "RetroDECK Configurator - Check & Verify: BIOS Files" "This check will look for BIOS files that RetroDECK has identified as working.\n\nNot all BIOS files are required for games to work, please check the BIOS description for more information on its purpose.\n\nThere may be additional BIOS files that will function with the emulators that are not checked.\n\nSome more advanced emulators such as Yuzu will have additional methods for verifiying the BIOS files are in working order."
   bios_checked_list=()
 
-  while IFS="^" read -r bios_file bios_subdir bios_hash bios_system bios_desc
+  check_bios_files
-  do
-    bios_file_found="No"
-    bios_hash_matched="No"
-    if [[ -f "$bios_folder/$bios_subdir$bios_file" ]]; then
-      bios_file_found="Yes"
-      if [[ $bios_hash == "Unknown" ]]; then
-        bios_hash_matched="Unknown"
-      elif [[ $(md5sum "$bios_folder/$bios_subdir$bios_file" | awk '{ print $1 }') == "$bios_hash" ]]; then
-        bios_hash_matched="Yes"
-      fi
-    fi
-    bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc")
-  done < $bios_checklist
 
   zenity --list --title="RetroDECK Configurator Utility - Check & Verify: BIOS Files" --cancel-label="Back" \
   --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \
@@ -1010,6 +1009,7 @@ configurator_reset_dialog() {
     "PPSSPP" "Reset the PSP emulator PPSSPP to default settings" \
     "Primehack" "Reset the Metroid Prime emulator Primehack to default settings" \
     "RPCS3" "Reset the PS3 emulator RPCS3 to default settings" \
+    "Ryujinx" "Reset the Switch emulator Ryujinx to default settings" \
     "Vita3k" "Reset the PS Vita emulator Vita3k to default settings" \
     "XEMU" "Reset the XBOX emulator XEMU to default settings" \
     "Yuzu" "Reset the Switch emulator Yuzu to default settings" )
@@ -1348,8 +1348,8 @@ configurator_usb_import_dialog() {
       "${external_devices[@]}")
 
       if [[ ! -z "$choice" ]]; then
-        emulationstation --home "$choice" --create-system-dirs
+        es-de --home "$choice" --create-system-dirs
-        rm -rf "$choice/.emulationstation" # Cleanup unnecessary folder
+        rm -rf "$choice/ES-DE" # Cleanup unnecessary folder
       fi
     else
       configurator_generic_dialog "RetroDeck Configurator - USB Import" "There were no USB devices found."