Merge branch 'XargonWan:main' into main

2024-11-22 14:05:39 +00:00 · 2022-04-25 15:23:45 -06:00 · 2022-04-25 15:23:45 -06:00 · 8e42674487
parent 5aeb79df03 f913e5d6b1
commit 8e42674487
26 changed files with 1810 additions and 156 deletions
--- a/.github/workflows/cooker.yml
+++ b/.github/workflows/cooker.yml
@ -7,10 +7,10 @@ on:
  # Triggers the workflow on push or pull request events but only for the main branch
  push:
    branches:
-     - cooker
+     - cooker*
  pull_request: 
    branches:
-     - cooker
+     - cooker*

 # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:
@ -35,23 +35,26 @@ jobs:
          sudo apt-get update
          sudo apt install flatpak flatpak-builder p7zip-full
          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08
+          sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
      
-      # Runs a set of commands using the runners shell
      - name: Building flatpak
        run: |
-          sudo flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml
-          sudo flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml
-          sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck
+          sudo flatpak-builder --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml
+          sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck

      - name: Get date for artifacts
        id: date
        run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')"

+      - name: Extract branch name
+        shell: bash
+        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+        id: extract_branch
+
      - name: Publish the flatpak in a new cooker release
        uses: ncipollo/release-action@v1
        with:
-          tag: "${{ steps.date.outputs.date }}"
+          tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}"
          body: |
            # Release Notes (Cooker)
            This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -35,14 +35,14 @@ jobs:
          sudo apt-get update
          sudo apt install flatpak flatpak-builder p7zip-full
          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08
+          sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
      
      # Runs a set of commands using the runners shell
      - name: Building flatpak
        run: |
-          sudo flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml
-          sudo flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml
-          sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck
+          sudo flatpak-builder --user --install --force-clean retrodeck-flatpak net.retrodeck.retrodeck.yml
+          sudo flatpak-builder --repo=local --force-clean localrepo net.retrodeck.retrodeck.yml
+          sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck

      - name: Get date for artifacts
        id: date
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,15 @@
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# RetroDECK specific files #
+############################
+.flatpak-builder/
+retrodeck-flatpak-cooker/
+retrodeck-flatpak/
--- a/README.md
+++ b/README.md
@ -12,8 +12,8 @@ Powered by [EmulationStation Desktop Edition](https://es-de.org), which uses Ret

 Join our [Discord](https://discord.gg/Dz3szYsP8g)!
 <p float="center">
-<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen03.jpg?raw=true" alt="screenshot" width="300"/>
-<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen04.jpg?raw=true" alt="screenshot" width="300"/><br/>
+<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen05.png?raw=true" alt="screenshot" width="300"/>
+<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen04.png?raw=true" alt="screenshot" width="300"/><br/>
 <img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen01.png?raw=true" alt="screenshot" width="300"/>
 <img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen02.png?raw=true" alt="screenshot" width="300"/>
 </p>
@ -28,50 +28,8 @@ No partitioning or formatting is required. RetroDECK (differently from AmberELEC
 ## Is it available on Windows?
 No, RetroDECK doesn't support Windows, but the project is fully open source so you can port it if you wish. As an alternative, [Retrobat](http://www.retrobat.ovh/) offers similar functionality (but may not be compatible with RetroDECK's rom paths).

+## How can I install it?
+Check the [Installation instructions](https://github.com/XargonWan/RetroDECK/wiki#installation-instructions) on the Wiki
+
 ## Can I help?
-Of course, any help is appreciated, and not only byp rogramming, just check out our [Discord](https://discord.gg/Dz3szYsP8g)!
-<br/><br/>
-# Developer notes: build instructions
-
-If you want to build the RetroDECK flatpak on your machine for developing or just testing purposes:
-```
-cd ~
-git clone --recursive https://github.com/XargonWan/RetroDECK.git
-cd RetroDECK
-git submodule init
-git submodule update
-```
-
-install `flatpak flatpak-builder p7zip-full` with your distro's package manager.
-
-```flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
-```
-
-To build the stable release:
-```
-flatpak-builder --user --install --force-clean --repo=local ~/RetroDECK/retrodeck-main ~/RetroDECK/com.xargon.retrodeck.yml
-flatpak build-bundle local ~/RetroDECK.flatpak com.xargon.retrodeck
-```
-
-Or alternatively, to build the cooker (experimental) release:
-```
-git checkout cooker
-flatpak-builder --user --install --force-clean --repo=local ~/RetroDECK/retrodeck-cooker ~/RetroDECK/com.xargon.retrodeck.yml
-flatpak build-bundle local ~/RetroDECK.flatpak com.xargon.retrodeck
-```
-
-Install RetroDECK:
-```
-flatpak install com.xargon.retrodeck
-```
-
-Run RetroDECK:
-```
-flatpak run com.xargon.retrodeck
-```
-
-Uninstall RetroDECK:
-```
-flatpak uninstall com.xargon.retrodeck
-```
+Of course, any help is appreciated, and not only by programming, just check out our [Discord](https://discord.gg/Dz3szYsP8g)!
--- a/docs/index.html
+++ b/docs/index.html
@ -42,7 +42,7 @@
                <ul class="navbar-nav ms-auto">
                    <li class="nav-item"><a class="nav-link" href="#top" style="color: rgb(49,52,55);">Home</a></li>
                    <li class="nav-item"><a class="nav-link" href="#features" style="color: rgb(49,52,55);">features</a></li>
-                    <li class="nav-item"><a class="nav-link" href="#" style="color: rgb(49,52,55);">wiki</a></li>
+                    <li class="nav-item"><a class="nav-link" href="https://github.com/XargonWan/RetroDECK/wiki" style="color: rgb(49,52,55);">wiki</a></li>
                    <li class="nav-item"><a class="nav-link" href="https://github.com/XargonWan/RetroDECK-cooker/" style="color: rgb(49,52,55);" target="_blank">cooker</a></li>
                    <li class="nav-item"><a class="nav-link" href="https://github.com/XargonWan/RetroDECK" target="_blank" style="color: rgb(49,52,55);">github</a></li>
                    <li class="nav-item"><a class="nav-link" href="https://discord.gg/tbmBpJbpur" target="_blank" style="color: rgb(49,52,55);">connect with us</a></li>
@ -126,8 +126,8 @@
            </div><!-- Start: Photos -->
            <div class="row gx-2 gy-2 row-cols-1 row-cols-md-2 row-cols-xl-3 photos" data-bss-baguettebox="">
                <div class="col item"><a><img class="img-fluid" src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen02.png?raw=true"></a></div>
-                <div class="col item"><a><img class="img-fluid" src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen04.jpg?raw=true"></a></div>
-                <div class="col item"><a><img class="img-fluid" src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen05.jpg?raw=true"></a></div>
+                <div class="col item"><a><img class="img-fluid" src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen04.png?raw=true"></a></div>
+                <div class="col item"><a><img class="img-fluid" src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen05.png?raw=true"></a></div>
            </div><!-- End: Photos -->
        </div>
    </section><!-- End: Lightbox Gallery -->
@ -144,4 +144,4 @@
    <script src="assets/js/scroll.js"></script>
 </body>

-</html>
+</html>
--- a/emu-configs/Dolphin.ini
+++ b/emu-configs/Dolphin.ini
@ -0,0 +1,28 @@
+[Analytics]
+ID = 09426e1e3e44d72728fb46a9e4a54663
+PermissionAsked = True
+[Core]
+GFXBackend = Vulkan
+SelectedLanguage = 0
+SerialPort1 = 255
+SkipIPL = True
+SlotA = 8
+SlotB = 255
+[Display]
+Fullscreen = True
+[GBA]
+BIOS = ~/retrodeck/bios/gba_bios.bin
+Rom1 = 
+Rom2 = 
+Rom3 = 
+Rom4 = 
+SavesInRomPath = False
+SavesPath = ~/retrodeck/saves/dolphin-emu/GBA/Saves/
+Threads = True
+[General]
+ISOPath0 = /run/user/1000/doc/9cd3cde7/wii
+ISOPath1 = /run/user/1000/doc/14708e0c/gc
+ISOPaths = 2
+WiiSDCardPath = ~/retrodeck/saves/dolphin-emu/Wii/sd.raw
+[NetPlay]
+TraversalChoice = direct
--- a/emu-configs/PCSX2_ui.ini
+++ b/emu-configs/PCSX2_ui.ini
@ -0,0 +1,159 @@
+MainGuiPosition=169,145
+SysSettingsTabName=Cpu
+McdSettingsTabName=none
+ComponentsTabName=
+AppSettingsTabName=none
+GameDatabaseTabName=none
+LanguageId=59
+LanguageCode=en_US
+RecentIsoCount=20
+GzipIsoIndexTemplate=$(f).pindex.tmp
+Listbook_ImageSize=32
+Toolbar_ImageSize=24
+Toolbar_ShowLabels=enabled
+CurrentIso=
+CurrentBlockdump=
+CurrentELF=
+CurrentIRX=
+EnableSpeedHacks=enabled
+EnableGameFixes=disabled
+EnableFastBoot=enabled
+EnablePresets=enabled
+PresetIndex=1
+AskOnBoot=disabled
+DevMode=disabled
+CdvdSource=ISO
+[ProgramLog]
+Visible=disabled
+AutoDock=enabled
+DisplayPosition=265,103
+DisplaySize=680,560
+FontSize=8
+Theme=Default
+[Folders]
+UseDefaultBios=disabled
+UseDefaultSnapshots=enabled
+UseDefaultSavestates=enabled
+UseDefaultMemoryCards=enabled
+UseDefaultLogs=enabled
+UseDefaultLangs=enabled
+UseDefaultCheats=enabled
+UseDefaultCheatsWS=enabled
+UseDefaultTextures=enabled
+Bios=~/retrodeck/bios
+Snapshots=~/retrodeck/screenshots
+Savestates=~/retrodeck/states/
+MemoryCards=~/retrodeck/saves/
+Logs=/var/config/PCSX2/logs
+Langs=/app/share/PCSX2/resources/locale
+Cheats=/var/config/PCSX2/cheats
+CheatsWS=/var/config/PCSX2/cheats_ws
+Cache=/var/config/PCSX2/cache
+Textures=
+RunIso=/var/config/PCSX2
+RunELF=/var/config/PCSX2
+RunDisc=
+[GSWindow]
+CloseOnEsc=enabled
+DefaultToFullscreen=disabled
+AlwaysHideMouse=disabled
+DisableResizeBorders=disabled
+DisableScreenSaver=enabled
+WindowSize=640,480
+WindowPos=-1,-1
+IsMaximized=disabled
+IsFullscreen=disabled
+EnableVsyncWindowFlag=disabled
+IsToggleFullscreenOnDoubleClick=enabled
+AspectRatio=4:3
+FMVAspectRatioSwitch=Off
+Zoom=100
+[InputRecording]
+VirtualPadPosition=-1,-1
+m_frame_advance_amount=1
+[Capture]
+EnableAudio=enabled
+[UiTemplates]
+LimiterUnlimited=Max
+LimiterTurbo=Turbo
+LimiterSlowmo=Slowmo
+LimiterNormal=Normal
+OutputFrame=Frame
+OutputField=Field
+OutputProgressive=Progressive
+OutputInterlaced=Interlaced
+Paused=<PAUSED> 
+TitleTemplate=Slot: ${slot} | Speed: ${speed} (${vfps}) | ${videomode} | Limiter: ${limiter} | ${gsdx} | ${omodei} | ${cpuusage}
+RecordingTemplate=Slot: ${slot} | Frame: ${frame}/${maxFrame} | Rec. Mode: ${mode} | Speed: ${speed} (${vfps}) | Limiter: ${limiter}
+[MemoryCards]
+Slot1_Enable=enabled
+Slot1_Filename=Mcd001.ps2
+Slot2_Enable=enabled
+Slot2_Filename=Mcd002.ps2
+Multitap1_Slot2_Enable=disabled
+Multitap1_Slot2_Filename=Mcd-Multitap1-Slot02.ps2
+Multitap1_Slot3_Enable=disabled
+Multitap1_Slot3_Filename=Mcd-Multitap1-Slot03.ps2
+Multitap1_Slot4_Enable=disabled
+Multitap1_Slot4_Filename=Mcd-Multitap1-Slot04.ps2
+Multitap2_Slot2_Enable=disabled
+Multitap2_Slot2_Filename=Mcd-Multitap2-Slot02.ps2
+Multitap2_Slot3_Enable=disabled
+Multitap2_Slot3_Filename=Mcd-Multitap2-Slot03.ps2
+Multitap2_Slot4_Enable=disabled
+Multitap2_Slot4_Filename=Mcd-Multitap2-Slot04.ps2
+[Filenames]
+BIOS=scph10000.bin
+[Framerate]
+NominalScalar=1
+TurboScalar=2
+SlomoScalar=0.5
+SkipOnLimit=disabled
+SkipOnTurbo=disabled
+[ConsoleLogSources]
+Devel=disabled
+.EEout=enabled
+.IOPout=enabled
+.EErecPerf=disabled
+.ELF=disabled
+.SysEvents=disabled
+.p\&xThread=disabled
+.SYSout=disabled
+.PGIFout=disabled
+.Input\ Recording=disabled
+.Controller\ Info=disabled
+[TraceLogSources]
+.SIF=disabled
+EE.Bios=disabled
+EE.Memory=disabled
+EE.Disasm.R5900=disabled
+EE.Disasm.COP0=disabled
+EE.Disasm.FPU=disabled
+EE.Disasm.VUmacro=disabled
+EE.Disasm.Cache=disabled
+EE.Registers.HwRegs=disabled
+EE.Registers.UnknownRegs=disabled
+EE.Registers.DmaRegs=disabled
+EE.Registers.IPU=disabled
+EE.GIFtags=disabled
+EE.VIFcodes=disabled
+EE.MSKPATH3=disabled
+EE.Events.DmaCtrl=disabled
+EE.Events.Counters=disabled
+EE.Events.MFIFO=disabled
+EE.Events.VIF=disabled
+EE.Events.GIF=disabled
+IOP.Bios=disabled
+IOP.Memorycards=disabled
+IOP.Pad=disabled
+IOP.Disasm.R3000A=disabled
+IOP.Disasm.Memory=disabled
+IOP.Registers.HwRegs=disabled
+IOP.Registers.UnknownRegs=disabled
+IOP.Registers.DmaRegs=disabled
+IOP.Events.DmaCrl=disabled
+IOP.Events.Counters=disabled
+IOP.Events.CDVD=disabled
+IOP.Events.MDEC=disabled
+[TraceLogSources/IOP.Disasm.COP2]
+GPU=disabled
--- a/emu-configs/qt-config.ini
+++ b/emu-configs/qt-config.ini
--- a/emu-configs/retroarch.cfg
+++ b/emu-configs/retroarch.cfg
@ -147,7 +147,7 @@ frontend_log_level = "1"
 game_specific_options = "true"
 gamemode_enable = "false"
 gamma_correction = "0"
-global_core_options = "false"
+global_core_options = "true"
 history_list_enable = "true"
 input_ai_service = "nul"
 input_ai_service_axis = "nul"
@ -219,7 +219,7 @@ input_driver = "x"
 input_duty_cycle = "3"
 input_enable_hotkey = "nul"
 input_enable_hotkey_axis = "nul"
-input_enable_hotkey_btn = "nul"
+input_enable_hotkey_btn = "4"
 input_enable_hotkey_mbtn = "nul"
 input_exit_emulator = "escape"
 input_exit_emulator_axis = "nul"
@ -242,7 +242,7 @@ input_grab_mouse_toggle_axis = "nul"
 input_grab_mouse_toggle_btn = "nul"
 input_grab_mouse_toggle_mbtn = "nul"
 input_hold_fast_forward = "l"
-input_hold_fast_forward_axis = "nul"
+input_hold_fast_forward_axis = "+5"
 input_hold_fast_forward_btn = "nul"
 input_hold_fast_forward_mbtn = "nul"
 input_hold_slowmotion = "e"
@ -254,13 +254,13 @@ input_joypad_driver = "sdl2"
 input_keyboard_layout = ""
 input_load_state = "f4"
 input_load_state_axis = "nul"
-input_load_state_btn = "nul"
+input_load_state_btn = "9"
 input_load_state_mbtn = "nul"
 input_max_users = "5"
 input_menu_toggle = "f1"
 input_menu_toggle_axis = "nul"
-input_menu_toggle_btn = "nul"
-input_menu_toggle_gamepad_combo = "0"
+input_menu_toggle_btn = "3"
+input_menu_toggle_gamepad_combo = "2"
 input_menu_toggle_mbtn = "nul"
 input_movie_record_toggle = "o"
 input_movie_record_toggle_axis = "nul"
@ -321,7 +321,7 @@ input_overlay_y_separation_landscape = "0.000000"
 input_overlay_y_separation_portrait = "0.000000"
 input_pause_toggle = "p"
 input_pause_toggle_axis = "nul"
-input_pause_toggle_btn = "nul"
+input_pause_toggle_btn = "1"
 input_pause_toggle_mbtn = "nul"
 input_player10_a = "nul"
 input_player10_a_axis = "nul"
@ -2676,7 +2676,7 @@ input_player9_y_axis = "nul"
 input_player9_y_btn = "nul"
 input_player9_y_mbtn = "nul"
 input_poll_type_behavior = "2"
-input_quit_gamepad_combo = "0"
+input_quit_gamepad_combo = "4"
 input_recording_toggle = "nul"
 input_recording_toggle_axis = "nul"
 input_recording_toggle_btn = "nul"
@ -2688,7 +2688,7 @@ input_reset_axis = "nul"
 input_reset_btn = "nul"
 input_reset_mbtn = "nul"
 input_rewind = "r"
-input_rewind_axis = "nul"
+input_rewind_axis = "+4"
 input_rewind_btn = "nul"
 input_rewind_mbtn = "nul"
 input_rumble_gain = "100"
@ -2698,11 +2698,11 @@ input_runahead_toggle_btn = "nul"
 input_runahead_toggle_mbtn = "nul"
 input_save_state = "f2"
 input_save_state_axis = "nul"
-input_save_state_btn = "nul"
+input_save_state_btn = "10"
 input_save_state_mbtn = "nul"
 input_screenshot = "f8"
 input_screenshot_axis = "nul"
-input_screenshot_btn = "nul"
+input_screenshot_btn = "0"
 input_screenshot_mbtn = "nul"
 input_send_debug_info = "f10"
 input_send_debug_info_axis = "nul"
@ -2719,11 +2719,11 @@ input_shader_prev_btn = "nul"
 input_shader_prev_mbtn = "nul"
 input_state_slot_decrease = "f6"
 input_state_slot_decrease_axis = "nul"
-input_state_slot_decrease_btn = "nul"
+input_state_slot_decrease_btn = "12"
 input_state_slot_decrease_mbtn = "nul"
 input_state_slot_increase = "f7"
 input_state_slot_increase_axis = "nul"
-input_state_slot_increase_btn = "nul"
+/home/steamos/RetroDECK/emu-configs/retroarch.cfginput_state_slot_increase_btn = "11"
 input_state_slot_increase_mbtn = "nul"
 input_streaming_toggle = "nul"
 input_streaming_toggle_axis = "nul"
@ -2842,7 +2842,7 @@ menu_show_rewind = "true"
 menu_show_shutdown = "true"
 menu_show_sublabels = "true"
 menu_show_video_layout = "true"
-menu_swap_ok_cancel_buttons = "false"
+menu_swap_ok_cancel_buttons = "true"
 menu_throttle_framerate = "true"
 menu_thumbnail_upscale_threshold = "0"
 menu_thumbnails = "3"
--- a/es_systems.xml
+++ b/es_systems.xml
@ -6,7 +6,7 @@
        <fullname>3DO</fullname>
        <path>%ROMPATH%/3do</path>
        <extension>.iso .ISO .bin .BIN .chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/4do_libretro.so %ROM%</command>
+        <command label="Opera">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/opera_libretro.so %ROM%</command>
        <platform>3do</platform>
        <theme>3do</theme>
    </system>
@ -142,7 +142,8 @@
        <fullname>Atari 5200</fullname>
        <path>%ROMPATH%/atari5200</path>
        <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%</command>
+        <command label="a5200">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/a5200_libretro.so %ROM%</command>
+        <command label="Atari800">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%</command>
        <platform>atari5200</platform>
        <theme>atari5200</theme>
    </system>
@ -159,7 +160,7 @@
        <name>atari800</name>
        <fullname>Atari 800</fullname>
        <path>%ROMPATH%/atari800</path>
-        <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP</extension>
+        <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .rom .ROM .7z .7Z .zip .ZIP</extension>
        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%</command>
        <platform>atari800</platform>
        <theme>atari800</theme>
@ -215,7 +216,8 @@
        <fullname>Atomiswave</fullname>
        <path>%ROMPATH%/atomiswave</path>
        <extension>.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_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>
        <platform>atomiswave</platform>
        <theme>atomiswave</theme>
    </system>
@ -314,6 +316,15 @@
        <theme>daphne</theme>
    </system>
    <system>
+							
+												 
+									  
+								  
+									 
+							   
+							  
+			 
+			
        <name>doom</name>
        <fullname>Doom</fullname>
        <path>%ROMPATH%/doom</path>
@ -327,7 +338,10 @@
        <fullname>DOS</fullname>
        <path>%ROMPATH%/dos</path>
        <extension>.dosz .DOSZ</extension>
+																													 
        <command label="DOSBox-Pure">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM%</command>
+																												   
+																							  
        <platform>dos</platform>
        <theme>dos</theme>
    </system>
@ -345,11 +359,22 @@
        <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>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_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="Redream (Standalone)">%EMULATOR_REDREAM% %ROM%</command>
        <platform>dreamcast</platform>
        <theme>dreamcast</theme>
    </system>
    <system>
+						 
+											 
+								   
+								  
+									 
+							   
+						   
+			 
+			
        <name>famicom</name>
        <fullname>Nintendo Family Computer</fullname>
        <path>%ROMPATH%/famicom</path>
@ -388,7 +413,9 @@
        <fullname>Nintendo Famicom Disk System</fullname>
        <path>%ROMPATH%/fds</path>
        <extension>.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
+        <command label="Nestopia UE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
+        <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
+        <command label="Mesen">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%</command>
        <platform>fds</platform>
        <theme>fds</theme>
    </system>
@ -424,6 +451,10 @@
        <command label="TGB Dual">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM%</command>
        <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
        <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
+        <command label="mGBA">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM%</command>
+        <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>
        <platform>gb</platform>
        <theme>gb</theme>
    </system>
@ -452,6 +483,10 @@
        <command label="TGB Dual">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM%</command>
        <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
        <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
+        <command label="mGBA">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM%</command>
+        <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>
        <platform>gbc</platform>
        <theme>gbc</theme>
    </system>
@ -459,9 +494,10 @@
        <name>gc</name>
        <fullname>Nintendo GameCube</fullname>
        <path>%ROMPATH%/gc</path>
-        <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
+        <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP</extension>
        <command label="Dolphin">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%</command>
        <command label="Dolphin (Standalone)">%EMULATOR_DOLPHIN% -b -e %ROM%</command>
+        <command label="PrimeHack (Standalone)">%EMULATOR_PRIMEHACK% -b -e %ROM%</command>
        <platform>gc</platform>
        <theme>gc</theme>
    </system>
@ -505,6 +541,15 @@
        <theme>j2me</theme>
    </system>
    <system>
+						 
+													   
+								   
+								  
+									 
+							   
+						   
+			 
+			
        <name>lutris</name>
        <fullname>Lutris Open Gaming Platform</fullname>
        <path>%ROMPATH%/lutris</path>
@ -523,6 +568,15 @@
        <theme>lutro</theme>
    </system>
    <system>
+							  
+											
+										
+												
+											
+									  
+								
+			 
+			
        <name>mame</name>
        <fullname>Multiple Arcade Machine Emulator</fullname>
        <path>%ROMPATH%/mame</path>
@ -704,7 +758,8 @@
        <fullname>Sega NAOMI</fullname>
        <path>%ROMPATH%/naomi</path>
        <extension>.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_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>	
        <platform>naomi</platform>
        <theme>naomi</theme>
    </system>
@ -713,7 +768,8 @@
        <fullname>Sega NAOMI GD-ROM</fullname>
        <path>%ROMPATH%/naomigd</path>
        <extension>.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_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>
        <platform>naomi</platform>
        <theme>naomigd</theme>
    </system>
@ -725,6 +781,7 @@
        <command label="DeSmuME">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume_libretro.so %ROM%</command>
        <command label="DeSmuME 2015">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume2015_libretro.so %ROM%</command>
        <command label="melonDS">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melonds_libretro.so %ROM%</command>
+        <command label="melonDS (Standalone)">%EMULATOR_MELONDS% %ROM%</command>
        <platform>nds</platform>
        <theme>nds</theme>
    </system>
@ -824,6 +881,18 @@
        <theme>palm</theme>
    </system>
    <system>
+					   
+								   
+								 
+																														  
+																													 
+																													 
+																												   
+																							  
+							   
+						 
+			 
+			
        <name>pc88</name>
        <fullname>NEC PC-8800 Series</fullname>
        <path>%ROMPATH%/pc88</path>
@ -881,10 +950,19 @@
        <theme>pokemini</theme>
    </system>
    <system>
+						  
+								  
+									
+								  
+									 
+							   
+							
+			 
+			
        <name>ps2</name>
        <fullname>Sony PlayStation 2</fullname>
        <path>%ROMPATH%/ps2</path>
-        <extension>.iso .ISO .isz .ISZ .cso .CSO .bin .BIN .elf .ELF</extension>
+        <extension>.bin .BIN .chd .CHD .cso .CSO .elf .ELF .iso .ISO .isz .ISZ</extension>
        <command label="PCSX2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%</command>
        <command label="PCSX2 (Standalone)">%EMULATOR_PCSX2% --nogui %ROM%</command>
        <platform>ps2</platform>
@ -894,7 +972,7 @@
        <name>ps3</name>
        <fullname>Sony PlayStation 3</fullname>
        <path>%ROMPATH%/ps3</path>
-        <extension>.ps3dir .PS3DIR</extension>
+        <extension>.ps3 .PS3 .ps3dir .PS3DIR</extension>
        <command label="RPCS3 (Standalone)">%EMULATOR_RPCS3% --no-gui %ROM%</command>
        <platform>ps3</platform>
        <theme>ps3</theme>
@ -914,7 +992,7 @@
        <path>%ROMPATH%/psp</path>
        <extension>.elf .ELF .iso .ISO .cso .CSO .prx .PRX .pbp .PBP .7z .7Z .zip .ZIP</extension>
        <command label="PPSSPP">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/ppsspp_libretro.so %ROM%</command>
-        <command label="PPSSPP (Standalone)">%EMULATOR_PPSSPP% %ROM%</command>
+        <command label="PPSSPP (Standalone)">%EMULATOR_PPSSPP% --escape-exit %ROM%</command>
        <platform>psp</platform>
        <theme>psp</theme>
    </system>
@ -935,7 +1013,9 @@
        <command label="Beetle PSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_libretro.so %ROM%</command>
        <command label="Beetle PSX HW">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_hw_libretro.so %ROM%</command>
        <command label="PCSX ReARMed">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx_rearmed_libretro.so %ROM%</command>
+        <command label="SwanStation">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/swanstation_libretro.so %ROM%</command>										 
        <command label="DuckStation">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/duckstation_libretro.so %ROM%</command>
+        <command label="DuckStation (Standalone)">%EMULATOR_DUCKSTATION% -batch %ROM%</command>			   
        <platform>psx</platform>
        <theme>psx</theme>
    </system>
@ -956,6 +1036,7 @@
        <command label="Snes9x - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
        <command label="Snes9x 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM%</command>
        <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
+        <command label="bsnes-hd">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%</command>									
        <command label="bsnes-mercury Accuracy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%</command>
        <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
        <platform>satellaview</platform>
@ -989,7 +1070,7 @@
        <name>scummvm</name>
        <fullname>ScummVM Game Engine</fullname>
        <path>%ROMPATH%/scummvm</path>
-        <extension>.scummvm .7z .7Z .zip .ZIP</extension>
+        <extension>.scummvm .SCUMMVM .svm .SVM</extension>
        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.so %ROM%</command>
        <platform>scummvm</platform>
        <theme>scummvm</theme>
@ -1033,6 +1114,21 @@
        <theme>segacd</theme>
    </system>
    <system>
+        <name>sfc</name>
+        <fullname>Nintendo SFC (Super Famicom)</fullname>
+        <path>%ROMPATH%/sfc</path>
+        <extension>.bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .7z .7Z .zip .ZIP</extension>
+        <command label="Snes9x - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
+        <command label="Snes9x 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM%</command>
+        <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
+        <command label="bsnes-hd">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%</command>
+        <command label="bsnes-mercury Accuracy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%</command>
+        <command label="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>
+        <platform>snes</platform>
+        <theme>sfc</theme>
+    </system>
+    <system>		
        <name>sg-1000</name>
        <fullname>Sega SG-1000</fullname>
        <path>%ROMPATH%/sg-1000</path>
@ -1052,6 +1148,7 @@
        <command label="Snes9x - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
        <command label="Snes9x 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM%</command>
        <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
+        <command label="bsnes-hd">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%</command>								
        <command label="bsnes-mercury Accuracy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%</command>
        <command label="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>
@ -1066,6 +1163,7 @@
        <command label="Snes9x - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
        <command label="Snes9x 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM%</command>
        <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
+        <command label="bsnes-hd">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%</command>								
        <command label="bsnes-mercury Accuracy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%</command>
        <command label="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>
@ -1091,6 +1189,15 @@
        <theme>spectravideo</theme>
    </system>
    <system>
+						  
+										
+									
+								  
+													   
+								  
+							
+			 
+			
        <name>stratagus</name>
        <fullname>Stratagus Game Engine</fullname>
        <path>%ROMPATH%/stratagus</path>
@ -1107,6 +1214,7 @@
        <command label="Snes9x - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
        <command label="Snes9x 2010">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM%</command>
        <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
+        <command label="bsnes-hd">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%</command>								
        <command label="bsnes-mercury Accuracy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%</command>
        <platform>sufami</platform>
        <theme>sufami</theme>
@ -1126,7 +1234,8 @@
        <fullname>Nintendo Switch</fullname>
        <path>%ROMPATH%/switch</path>
        <extension>.nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI .7z .7Z .zip .ZIP</extension>
-        <command label="Yuzu (Standalone)">%EMULATOR_YUZU% %ROM%</command>
+        <command label="Yuzu (Standalone)">%EMULATOR_YUZU% -f -g %ROM%</command>
+        <command label="Ryujinx (Standalone)">%EMULATOR_RYUJINX% %ROM%</command>
        <platform>switch</platform>
        <theme>switch</theme>
    </system>
@ -1253,9 +1362,10 @@
        <name>wii</name>
        <fullname>Nintendo Wii</fullname>
        <path>%ROMPATH%/wii</path>
-        <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
+        <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP</extension>
        <command label="Dolphin">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%</command>
        <command label="Dolphin (Standalone)">%EMULATOR_DOLPHIN% -b -e %ROM%</command>
+        <command label="PrimeHack (Standalone)">%EMULATOR_PRIMEHACK% -b -e %ROM%</command>
        <platform>wii</platform>
        <theme>wii</theme>
    </system>
--- a/flathub-pr.sh
+++ b/flathub-pr.sh
@ -0,0 +1,46 @@
+#!/bin/bash
+
+cd ~
+rm -rf flathub
+git clone --branch=RetroDECK --recursive https://github.com/XargonWan/flathub.git
+cd ~/RetroDECK
+git checkout main
+git submodule init
+git submodule update
+rsync -rav --progress --exclude={'shared-modules/','rd-submodules/','.git/','docs','retrodeck-flatpak/','retrodeck-flatpak-cooker/','.flatpak-builder/'} ~/RetroDECK/ ~/flathub/
+cd ~/flathub
+rm -rf shared-submodules
+rm -rf rd-submodules
+
+# rebuilding submodules
+git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
+    while read path_key path
+    do
+        url_key=$(echo $path_key | sed 's/\.path/.url/');
+        branch_key=$(echo $path_key | sed 's/\.path/.branch/');
+        # If the url_key doesn't yet exist then backup up the existing
+        # directory if necessary and add the submodule
+        if [ ! $(git config --get "$url_key") ]; then
+            if [ -d "$path" ] && [ ! $(git config --get "$url_key") ]; then
+                mv "$path" "$path""_backup_""$(date +'%Y%m%d%H%M%S')";
+            fi;
+            url=$(git config -f .gitmodules --get "$url_key");
+            # If a branch is specified then use that one, otherwise
+            # default to master
+            branch=$(git config -f .gitmodules --get "$branch_key");
+            if [ ! "$branch" ]; then branch="master"; fi;
+            git submodule add -f -b "$branch" "$url" "$path";
+        fi;
+    done;
+
+# In case the submodule exists in .git/config but the url is out of date
+
+git submodule sync;
+
+# Now actually pull all the modules. I used to use this...
+git submodule foreach --recursive 'git checkout $(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master)';
+
+rm flathub-pr.sh
+git add *
+git commit -m "Updating flathub"
+git push origin RetroDECK
--- a/flathub.json
+++ b/flathub.json
@ -0,0 +1,3 @@
+{
+    "only-arches": ["x86_64"]
+}
--- a/net.retrodeck.retrodeck.desktop
+++ b/net.retrodeck.retrodeck.desktop
@ -3,7 +3,7 @@ Name=RetroDECK
 GenericName=Emulation bundle for Steam Deck
 Type=Application
 Comment=All you need for emulation on Steam Deck
-Icon=com.xargon.retrodeck
+Icon=net.retrodeck.retrodeck
 Exec=
 Terminal=false
 StartupNotify=false
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@ -1,7 +1,11 @@
-app-id: com.xargon.retrodeck
+app-id: net.retrodeck.retrodeck
 runtime: org.kde.Platform
 runtime-version: '5.15-21.08'
 sdk: org.kde.Sdk
+# Needed for rpcs3
+sdk-extensions:
+- org.freedesktop.Sdk.Extension.llvm13
+# /Needed for rpcs3
 # Needed for Yuzu
 base: io.qt.qtwebengine.BaseApp
 base-version: 5.15-21.08
@ -17,6 +21,7 @@ finish-args:
   - --device=all
   - --filesystem=~/retrodeck:create
   - --filesystem=/run/media
+   - --filesystem=/media
   - --allow=multiarch
   - --talk-name=org.freedesktop.ScreenSaver
   - --talk-name=org.freedesktop.PowerManagement.Inhibit
@ -26,6 +31,9 @@ finish-args:
  # Yuzu
   - --filesystem=home:ro
  # - --filesystem=/run/media:ro
+  # Dolphin
+   - --allow=bluetooth
+  #- --env=QT_QPA_PLATFORM=xcb not sure if this will break something

 cleanup:
  # ES-DE
@ -83,11 +91,9 @@ modules:
    - --disable-programs
    - --disable-doc
    - --enable-gpl
-    - --enable-nonfree
    - --enable-shared
    - --enable-libvorbis
    - --enable-libopus
-    - --enable-libfdk-aac
    - --enable-libvpx
    - --enable-postproc
    sources:
@ -127,7 +133,7 @@ modules:
    sources:
    - type: git
      url: https://gitlab.com/leonstyhre/emulationstation-de.git
-      branch: c3fc30cfd5c26195024e0da328349d83af067b9e
+      branch: 3cb464c7adcea8d020cdff92803c64b7f72fb443

  # ES-DE - END

@ -139,7 +145,7 @@ modules:
    sources:
      - type: git
        url: https://github.com/anthonycaccese/art-book-next-de.git
-        branch: 4452f8356819d3cd079549b113fb15edb919a0df
+        commit: 4452f8356819d3cd079549b113fb15edb919a0df


  # External manifests start
@ -155,8 +161,6 @@ modules:
      - type: git
        url: https://github.com/libretro/RetroArch.git
        branch: de4e56ecf28a09057734f8624af6d62f3088734f
-      - type: file
-        path: rd-submodules/retroarch/org.libretro.RetroArch.appdata.xml
      - type: file
        path: rd-submodules/retroarch/retroarch.cfg
    post-install:
@ -169,20 +173,18 @@ modules:
      - >-
        sed s:@prefix@:${FLATPAK_DEST}:g retroarch.cfg >
        ${FLATPAK_DEST}/etc/retroarch.cfg
-      - mkdir -p ${FLATPAK_DEST}/share/appdata
-      - cp org.libretro.RetroArch.appdata.xml ${FLATPAK_DEST}/share/appdata
    modules:
-      - nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json
+      - rd-submodules/retroarch/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json
      - shared-modules/SDL/SDL-1.2.15.json
      - shared-modules/SDL/SDL_image-1.2.12.json
      - shared-modules/SDL/SDL_mixer-1.2.12.json
      - shared-modules/SDL/SDL_net-1.2.8.json
      - shared-modules/libusb/libusb.json
      - shared-modules/gudev/gudev.json
-      - libbz2/libbz2-1.0.8.json
-      - libaio/libaio-0.3.112.json
+      - rd-submodules/retroarch/libbz2/libbz2-1.0.8.json
+      - rd-submodules/retroarch/libaio/libaio-0.3.112.json
      - shared-modules/glu/glu-9.json
-      - libdecor/libdecor-0.1.0.json
+      - rd-submodules/retroarch/libdecor/libdecor-0.1.0.json
  - name: retroarch-filers-video
    subdir: gfx/video_filters
    make-install-args:
@ -190,7 +192,7 @@ modules:
    sources:
      - type: git
        url: https://github.com/libretro/RetroArch.git
-        commit: de4e56ecf28a09057734f8624af6d62f3088734f
+        branch: de4e56ecf28a09057734f8624af6d62f3088734f
  - name: retroarch-filers-audio
    subdir: libretro-common/audio/dsp_filters
    make-install-args:
@ -198,7 +200,7 @@ modules:
    sources:
      - type: git
        url: https://github.com/libretro/RetroArch.git
-        commit: de4e56ecf28a09057734f8624af6d62f3088734f
+        branch: de4e56ecf28a09057734f8624af6d62f3088734f
  - name: retroarch-assets
    make-install-args:
      - PREFIX=${FLATPAK_DEST}
@ -264,8 +266,6 @@ modules:
    build-commands:
        - mkdir -p /app/share/libretro/cores/
        - mv ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/* /app/share/libretro/cores/
-    cleanup:
-        - RetroArch_cores.7z
    sources:
      - type: archive
        url: https://buildbot.libretro.com/stable/1.10.2/linux/x86_64/RetroArch_cores.7z
@ -407,9 +407,6 @@ modules:
      - /share/pixmaps
    post-install:
      - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher
-      - >-
-        install -Dm644 ../org.yuzu_emu.yuzu.metainfo.xml
-        /app/share/appdata/org.yuzu_emu.yuzu.metainfo.xml
      - desktop-file-install --dir=/app/share/applications ../dist/yuzu.desktop
      - >-
        desktop-file-edit --set-key StartupWMClass --set-value yuzu --set-key
@ -432,8 +429,6 @@ modules:
        x-checker-data:
          type: git
          tag-pattern: ^(mainline-0-\d+)$
-      - type: file
-        path: rd-submodules/yuzu/org.yuzu_emu.yuzu.metainfo.xml
      - type: file
        path: rd-submodules/yuzu/yuzu-launcher.sh
      - type: file
@ -460,7 +455,6 @@ modules:
          type: git
          tag-pattern: ^v([\d.]+)$
    modules:
-      - shared-modules/glu/glu-9.json
  - name: libaio
    no-autogen: true
    make-install-args:
@ -560,32 +554,168 @@ modules:
      - >-
        install -Dm644 ../AppIcon128.png
        /app/share/icons/hicolor/128x128/apps/PCSX2.png
-      - >-
-        install -Dm644 ../net.pcsx2.PCSX2.metainfo.xml
-        /app/share/metainfo/net.pcsx2.PCSX2.metainfo.xml
    sources:
      - type: git
        url: https://github.com/PCSX2/pcsx2.git
        tag: v1.7.2554
        commit: 0d1675fbaa0d40874df98eed6270efc55620271b
-      - type: file
-        path: rd-submodules/pcsx2/net.pcsx2.PCSX2.metainfo.xml
      - type: file
        path: rd-submodules/pcsx2/AppIcon128.png

  # pcsx2 - END

+  # Dolphin - START
+  # https://github.com/flathub/org.DolphinEmu.dolphin-emu

-  # Ryujinx
-  # Xemu
-  # Rpcs3
-  # vita3k
-  # dolphin
-  # arduboy
-  # pocket station
-  # cemu - win only: wine
-  # Anbox?
+  # needed for the emulate bluetooth adapter feature to work
+  - name: bluez
+    config-opts:
+      - --enable-library
+      - --disable-manpages
+      - --disable-udev
+      - --disable-tools
+      - --disable-cups
+      - --disable-monitor
+      - --disable-client
+      - --disable-systemd
+      - --disable-a2dp
+      - --disable-avrcp
+      - --disable-network
+      - --with-dbusconfdir=/app/etc
+      - --with-dbussessionbusdir=/app/usr/lib/system-services
+    sources:
+      - type: archive
+        url: https://www.kernel.org/pub/linux/bluetooth/bluez-5.64.tar.xz
+        sha256: ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34
+        x-checker-data:
+          type: anitya
+          project-id: 10029
+          stable-only: true
+          url-template: https://www.kernel.org/pub/linux/bluetooth/bluez-$version.tar.xz

+  # enables motion controls on non-wii controllers (switch, ps4, etc)
+  # requires a udev rule enabling Motion Sensors access
+  - name: libevdev
+    buildsystem: meson
+    config-opts:
+      - -Dtests=disabled
+      - -Ddocumentation=disabled
+    sources:
+      - type: archive
+        url: https://www.freedesktop.org/software/libevdev/libevdev-1.12.1.tar.xz
+        sha256: 1dbba41bc516d3ca7abc0da5b862efe3ea8a7018fa6e9b97ce9d39401b22426c
+        x-checker-data:
+          type: anitya
+          project-id: 20540
+          stable-only: true
+          url-template: https://www.freedesktop.org/software/libevdev/libevdev-$version.tar.xz
+
+  # needed for screensaver inhibition
+  - name: xdg-screensaver-shim
+    buildsystem: meson
+    sources:
+      - type: archive
+        url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz
+        sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399
+
+  - name: dolphin-emu
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DENABLE_ALSA=OFF
+      - -DENABLE_SDL=ON
+      - -DENABLE_EVDEV=ON
+      - -DDISTRIBUTOR=Flathub
+    cleanup:
+      - /share/man
+    post-install:
+      - install -D dolphin-emu-wrapper /app/bin/dolphin-emu-wrapper
+      - install -Dm644 appdata.xml /app/share/appdata/dolphin-emu.appdata.xml
+      - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
+      - desktop-file-edit --set-key=Exec --set-value='/app/bin/dolphin-emu-wrapper'
+        /app/share/applications/dolphin-emu.desktop
+    sources:
+      - type: git
+        url: https://github.com/dolphin-emu/dolphin.git
+        commit: 8ecfa537a242de74d2e372e30d9d79b14584b2fb
+      # detects whether dolphin is running in a flatpak sandbox
+      # and makes it use xdg directories if it is.
+      # prevents dolphin from attempting to write conf files
+      # in non-writable paths, typically happens when a user
+      # has leftover files from a previous non-flatpak install
+      - type: patch
+        path: rd-submodules/dolphin/detectflatpak.patch
+      # version strings must match exactly for online multiplayer
+      - type: patch
+        path: rd-submodules/dolphin/nodirtyversion.patch
+      - type: file
+        path: rd-submodules/dolphin/appdata.xml
+      - type: script
+        commands:
+          - for i in {0..9}; do
+          - test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i;
+          - done
+          - dolphin-emu "$@"
+        dest-filename: dolphin-emu-wrapper
+
+  # Dolphin - END
+
+  # XEMU - START
+
+  - name: libglu
+    buildsystem: meson
+    cleanup:
+      - /include
+      - /lib/debug
+      - /lib/pkgconfig
+      - /lib/*.a
+    sources:
+      - type: archive
+        url: https://mesa.freedesktop.org/archive/glu/glu-9.0.2.tar.xz
+        sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4
+        x-checker-data:
+          type: anitya
+          project-id: 13518
+          stable-only: true
+          url-template: https://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz
+
+  - name: xemu
+    buildsystem: autotools
+    builddir: true
+    no-make-install: true
+    build-options:
+      cflags: -O3 -DXBOX=1 -Wno-error=redundant-decls
+    config-opts:
+      - --audio-drv-list=sdl
+      - --disable-werror
+      - --target-list=i386-softmmu
+    make-args:
+      - qemu-system-i386
+    post-install:
+      - |-
+        for px in 16 32 48 64 128 256 512; do
+          install -Dm644 ../ui/icons/xemu_${px}x${px}.png /app/share/icons/hicolor/${px}x${px}/apps/app.xemu.xemu.png
+        done
+      - install -Dm644 ../ui/icons/xemu.svg /app/share/icons/hicolor/scalable/apps/app.xemu.xemu.svg
+      - desktop-file-install ../ui/xemu.desktop --dir /app/share/applications
+      - sed -i 's/^Icon=xemu/Icon=app.xemu.xemu/' /app/share/applications/xemu.desktop
+      - mv qemu-system-i386 /app/bin/xemu
+      - mkdir -p /app/share/licenses/xemu
+      - cd .. && python3 scripts/gen-license.py > /app/share/licenses/xemu/LICENSE.txt
+    sources:
+      - type: git
+        url: https://github.com/mborgerson/xemu.git
+        tag: gh-release/0.6.2-90-g6f507c80af
+        commit: 6f507c80af546e0f5d316622d20f78820423ce6e
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/mborgerson/xemu/releases/latest
+          tag-query: .tag_name
+          version-query: $tag | sub("^gh-release/"; "")
+          timestamp-query: .published_at
+          is-main-source: true
+
+  # XEMU - END

  # External manifests end
  
@ -602,12 +732,11 @@ modules:
        # These must be put in home folder, managed by retrodeck.sh
        - mkdir -p ${FLATPAK_DEST}/retrodeck/
        - cp es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml
-        - cp retrodeck-retroarch.cfg ${FLATPAK_DEST}/retrodeck/retrodeck-retroarch.cfg

        # Logo, res
        - rm -f /app/share/emulationstation/resources/graphics/splash.svg
        - cp splash.svg /app/share/emulationstation/resources/graphics/splash.svg
-        - cp icon.svg /app/share/icons/hicolor/scalable/apps/com.xargon.retrodeck.svg
+        - cp icon.svg /app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg

        # Tools
        - mkdir -p ${FLATPAK_DEST}/retrodeck/tools/
@ -617,9 +746,26 @@ modules:
        
        - cp retrodeck.sh /app/bin/retrodeck.sh
        - chmod +x /app/bin/retrodeck.sh
-
+        
        # Desktop entry
-        - cp com.xargon.retrodeck.desktop /app/share/applications/com.xargon.retrodeck.desktop
+        - cp net.retrodeck.retrodeck.desktop /app/share/applications/net.retrodeck.retrodeck.desktop
+
+        # Steam Grids
+        - mkdir -p ${FLATPAK_DEST}/retrodeck/steam/
+        - cp banner_main.png ${FLATPAK_DEST}/retrodeck/steam/
+        - cp poster_main.png ${FLATPAK_DEST}/retrodeck/steam/
+        - cp poster_main_nodecklogo.png ${FLATPAK_DEST}/retrodeck/steam/
+
+        # Configuring emulators:
+        - mkdir -p ${FLATPAK_DEST}/retrodeck/emu-configs/
+        # RetroArch
+        - cp retroarch.cfg ${FLATPAK_DEST}/retrodeck/emu-configs/
+        # Dolphin 
+        - cp Dolphin.ini ${FLATPAK_DEST}/retrodeck/emu-configs/
+        # Yuzu
+        - cp qt-config.ini ${FLATPAK_DEST}/retrodeck/emu-configs/
+        # Pcsx2
+        - cp PCSX2_ui.ini ${FLATPAK_DEST}/retrodeck/emu-configs/

    #cleanup: ['*']
    sources:
@ -631,13 +777,15 @@ modules:
        path: es_systems.xml
      - type: file
        path: retrodeck.sh
-      - type: file
-        path: retrodeck-retroarch.cfg
+      - type: dir
+        path: emu-configs
      - type: file
        path: tools-gamelist.xml
      - type: dir
        path: res
+      - type: dir
+        path: res/steam
      - type: dir
        path: tools
      - type: file
-        path: com.xargon.retrodeck.desktop
+        path: net.retrodeck.retrodeck.desktop
--- a/res/screenshots/screen01.png
+++ b/res/screenshots/screen01.png
--- a/res/screenshots/screen03.jpg
+++ b/res/screenshots/screen03.jpg
--- a/res/screenshots/screen03.png
+++ b/res/screenshots/screen03.png
--- a/res/screenshots/screen04.jpg
+++ b/res/screenshots/screen04.jpg
--- a/res/screenshots/screen04.png
+++ b/res/screenshots/screen04.png
--- a/res/screenshots/screen05.jpg
+++ b/res/screenshots/screen05.jpg
--- a/res/screenshots/screen05.png
+++ b/res/screenshots/screen05.png
--- a/retrodeck.sh
+++ b/retrodeck.sh
@ -37,6 +37,7 @@ then
    # Cleaning
    rm -rf /var/config/emulationstation/
    rm /var/config/retrodeck/tools/*
+    rm -f /var/config/yuzu/qt-config.ini

    kdialog --title "RetroDECK" --msgbox "EmulationStation will now initialize the system, please don't edit the roms location, just select:\n\nCREATE DIRECTORIES, YES, QUIT\n\nRetroDECK will manage the rest."

@ -57,21 +58,39 @@ then
    mkdir -p ~/retrodeck/states
    mkdir -p ~/retrodeck/screenshots
    mkdir -p ~/retrodeck/bios
-    mkdir -p /var/config/retroarch/
-
+    # ES-DE
    cp -r /app/retrodeck/tools/* /var/config/retrodeck/tools/
+    mkdir -p /var/config/emulationstation/.emulationstation/custom_systems/tools/
+    cp /app/retrodeck/tools-gamelist.xml /var/config/retrodeck/tools/gamelist.xml

+    # Initializing emulators configs
+    emuconfigs=/app/retrodeck/emu-configs/
+
+    # RetroArch
+    mkdir -p /var/config/retroarch/cores/
    rm -rf /var/config/retroarch/system
    ln -s ~/retrodeck/bios /var/config/retroarch/system
-
-    cp /app/retrodeck/retrodeck-retroarch.cfg /var/config/retroarch/retroarch.cfg
-
-    mkdir -p /var/config/emulationstation/.emulationstation/custom_systems/tools/
-    cp /app/retrodeck/tools-gamelist.xml /var/config/emulationstation/.emulationstation/custom_systems/tools/gamelist.xml
-
-    mkdir -p /var/config/retroarch/cores/
    cp /app/share/libretro/cores/* /var/config/retroarch/cores/
+    cp $emuconfigs/retroarch.cfg /var/config/retroarch/

+    # Yuzu
+    mkdir -p ~/retrodeck/bios/switch/
+    mkdir -p /var/config/yuzu/keys
+    mkdir -p /var/data/yuzu/registered
+    ln -s ~/retrodeck/bios/switch/keys /var/data/yuzu/keys
+    ln -s /var/data/yuzu/registered ~/retrodeck/bios/switch/registered
+    cp $emuconfigs/qt-config.ini /var/config/yuzu/
+
+    # Dolphin
+    mkdir -p /var/config/dolphin-emu/
+    cp $emuconfigs/Dolphin.ini /var/config/dolphin-emu/
+
+    # pcsx2
+    mkdir -p /var/config/PCSX2/inis/
+    cp $emuconfigs/PCSX2_ui.ini /var/config/PCSX2/inis/
+
+
+    # Locking RetroDECK
    touch ~/retrodeck/.lock

    kdialog --title "RetroDECK" --msgbox "Initialization completed.\nplease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n~/retrodeck/bios\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIt's suggested to add RetroDECK to your Steam Library for a quick access."
--- a/tools-gamelist.xml
+++ b/tools-gamelist.xml
@ -8,6 +8,14 @@
 		<nogamecount>true</nogamecount>
 		<nomultiscrape>true</nomultiscrape>
 	</game>
+	<game>
+		<path>./start-yuzu.sh</path>
+		<name>Start Yuzu</name>
+		<sortname>RetroArch</sortname>
+		<desc>Start Yuzu to manually tweak your settings.</desc>
+		<nogamecount>true</nogamecount>
+		<nomultiscrape>true</nomultiscrape>
+	</game>
 	<game>
 		<path>./move-roms.sh</path>
 		<name>Move roms folder</name>
--- a/tools/move-roms.sh
+++ b/tools/move-roms.sh
@ -1,8 +1,8 @@
 #!/bin/bash

-if [ -d ~/retrodeck/roms ] && [ -d ~/retrodeck/roms ]
+if [ -d ~/retrodeck/roms ] && [ -d /run/media/mmcblk0p1/retrodeck/roms ]
 then # found both internal and sd folders
-    kdialog --title "RetroDECK" --warning "I found a roms folder both in internal and SD Card, in order to make this tool useful you should remove one of the two."
+    kdialog --title "RetroDECK" --warning "I found a roms folder both in internal and SD Card, in order to make this tool useful you should remove one of the two or merge them."
    exit 0
 fi

@ -18,8 +18,12 @@ then # found external folder and not the internal
    new_roms_path=~/retrodeck
 fi

-mkdir -p $new_roms_path
-mv -f $roms_path/roms $new_roms_path/roms
-rm -f /var/config/emulationstation/ROMs
-ln -s $new_roms_path/roms /var/config/emulationstation/ROMs
-rm -f $roms_path/roms
+kdialog --title "RetroDECK" --warningyesno "Should I move the roms from\n\n$roms_path/roms\n\nto\n\n$new_roms_path/roms?"
+if [ $? == 0 ] #yes
+then
+    mkdir -p $new_roms_path
+    mv -f $roms_path/roms $new_roms_path/roms
+    rm -f /var/config/emulationstation/ROMs
+    ln -s $new_roms_path/roms /var/config/emulationstation/ROMs
+    rm -f $roms_path/roms
+fi
--- a/tools/start-retroarch.sh
+++ b/tools/start-retroarch.sh
@ -1,5 +1,7 @@
 #!/bin/bash

 kdialog --title "RetroDECK" --warningyesno "Doing some changes in the RetroArch configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?"
-if [ $? == 0 ]; then
-    retroarch
+if [ $? == 0 ]
+then
+    retroarch
+fi
--- a/tools/start-yuzu.sh
+++ b/tools/start-yuzu.sh
@ -0,0 +1,7 @@
+#!/bin/bash
+
+kdialog --title "RetroDECK" --warningyesno "Doing some changes in the Yuzu configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?"
+if [ $? == 0 ]
+then
+    yuzu
+fi