diff --git a/flathub.yml b/flathub.yml
index 36a4dc59..a9906ebb 100644
--- a/flathub.yml
+++ b/flathub.yml
@@ -4,7 +4,6 @@ runtime-version: 5.15-22.08
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.llvm14    # Needed for rpcs3
-  #- org.freedesktop.Sdk.Extension.dotnet6   # Needed for Ryujinx - Removed, check if it's not breaking something else
 base: io.qt.qtwebengine.BaseApp             # Needed for Yuzu
 base-version: 5.15-22.08                    # Needed for Yuzu
 command: retrodeck.sh
@@ -27,7 +26,34 @@ finish-args:
   - --filesystem=xdg-run/app/com.discordapp.Discord:create
   # Dolphin
   - --allow=bluetooth
-  #- --env=QT_QPA_PLATFORM=xcb #not sure if this will break something
+  # PPSSPP
+  # It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows
+  - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.retrodeck
+  - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.retrodeck
+
+cleanup:
+  # ES-DE
+  - /include
+  - /share/ffmpeg
+  - /lib/cmake
+  - /lib/pkgconfig
+  # Yuzu
+  - /include
+  - /bin/glslangValidator
+  - /bin/zip*
+  - /bin/zstd*
+  - /lib/pkg-config
+  - /share/doc
+  - /share/man
+  - /src
+  - '*.a'
+  - '*.la'
+  # XMLSTARLET
+  - /lib/debug
+  - /share/runtime
+cleanup-commands:
+  # Yuzu
+  - /app/cleanup-BaseApp.sh
 
 modules:
   - name: retrodeck
diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index 550b9233..39933e26 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -68,14 +68,53 @@
       <release version="0.7.0b" date="2023-04-11">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.4b</url>
          <description>
-            <p>New features - General:</p>
+            <p>New - System features:</p>
             <ul>
-               <li>Added CEMU, WiiU Emulator</li>
-               <li>Dolphin (Standalone) is now default for GameCube and Wii</li>
+               <li>The Configurator has a new home inside the ES-DE main menu and thus the tools menu has been removed.</li>
+               <li>The Configurator also has a .deskop icon for ease of access for both Steam Deck desktop mode and Linux Desktop users.</li>
+               <li>Added RetroDECK auto updates on launch, this can be disabled from the Configurator this works in Game Mode for the Steam Deck.</li>
             </ul>
-            <p>Bug fixes and other changes:</p>
+            <p>New RetroDECK Configurator features:</p>
             <ul>
-               <li>PLACEHOLDER</li>
+               <li>The Configurator has a new structure, with more menus and options.</li>
+               <li>The compression tool has been updated to allow for even more formats such as .zip in addition to the standard disc-based formats for certain systems.</li>
+               <li>The compression tool has been updated to have an even stronger verification before a compression job starts.</li>
+               <li>Added a global preset to swap A/B and X/Y in all supported emulators (aka N layout).</li>
+               <li>Added a global preset to enable/disable Widescreen in all supported emulators, globally or per core/emulator.</li>
+               <li>Added a global preset to enable/disable Ask-to-Exit prompts in all supported emulators.</li>
+               <li>Added a preset to enable/disable Pegasus and NyNy77 Borders for RetroArch, globally or per core.</li>
+               <li>Added an option to install Venomalia's Universial Dynamic Input Textures for Dolphin https://github.com/Venomalia/UniversalDynamicInput</li>
+               <li>Added an RetroDECK: About section</li>
+               <li>Added an option to install the RetroDECK Steam Deck controller profile</li>
+               <li>Added an “RetroDECK: Auto Updates” function that enables or disables auto updates on RetroDECK launch.</li>
+               <li>Added a Semi-automated RPCS3 firmware installer.</li>
+               <li>The Move Folder tool has been greatly expanded</li>
+               <li>You can now move the entire folder or different folders as you choose. (WARNING! Please do not try to move the data to more exotic locations).</li>
+               <li>The basic BIOS checker has been removed.</li>
+               <li>The BIOS checker has been updated to look for over 120+ BIOS.</li>
+               <li>RetroAchivements Login: Now logs into all supported emulators/cores at once.</li>
+               <li>RetroAchivements Logout: Now logs out of all supported emulators/cores at once.</li>
+               <li>Added RetroAchivements: Hardcore Mode, that lets you toggle hardcore mode for supported emulators/cores with a logged in RetroAchivements account.</li>
+            </ul>
+            <p>Updates:</p>
+            <ul>
+               <li>Updated ES-DE to the latest version.</li>
+               <li>Updated RetroArch and the cores to latest versions.</li>
+               <li>Updated all standalone emulators and to their latest versions.</li>
+            </ul>
+            <p>Bugfixes and other changes:</p>
+            <ul>
+               <li>Dolphin/Primehack Wii Mote controls have been redesigned for the Steam Deck to allow both for touch input or right radial as pointer and R2 emulates the Wii Remote Shake needed for certain games.</li>
+               <li>Updated the RPCS3 to run better and with a better configuration. Read more on the wiki on how to install DLC and patches.</li>
+               <li>RPCS3 and Duckstations save files where in the wrong directory. They have been moved to fit the overall inside the RetroDECK Framework. If you have any issues, contact us on discord or add them on github.</li>
+               <li>We made a unique PICO-8 wrapper that makes it runs better in a flatpak environment.</li>
+               <li>Fixed an avcodec issue that caused some roms for certain emulators to break.</li>
+               <li>Changed the ES-DE progress bar color</li>
+               <li>Changed how Yuzu builds are handled and should allow for better Yuzu updates.</li>
+               <li>Added a low space warning on launch.</li>
+               <li>Various backend improvements and fixes.</li>
+               <li>Added the foss Capsimg BIOS for the Amiga RetroArch core.</li>
+               <li>Implemented ES-DE's experimental theme downloader. For fresh new installs we only now ship one theme: ArtBookNext (as all other themes can be downloaded from the interface).</li>
             </ul>
          </description>
       </release>
@@ -554,4 +593,4 @@
          </description>
       </release>
    </releases>
-</component>
+</component>
\ No newline at end of file
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 73ab7ffd..95676208 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -65,18 +65,18 @@ modules:
   # The version number is hardcoded in /app/retrodeck/version
   #
   # UPDATE STEPS FOR MAIN:
-  # [ ] Update the VERSION variable
+  # [X] Update the VERSION variable
   # [ ] Update the appdata.xml with the version number and notes
-  # [ ] change branch into main in version-initialization (first one)
-  # [ ] change branch into main in retrodeck module (last one)
-  # [ ] >>>>> if header (before modules) was edited, edit it even in flathub.yml
+  # [X] change branch into main in version-initialization (first one)
+  # [X] change branch into main in retrodeck module (last one)
+  # [X] if header (before modules) was edited, edit it even in flathub.yml
   #
   - name: version-initialization
     buildsystem: simple
     build-commands:
       - |
 
-        VERSION=$(git rev-parse --abbrev-ref HEAD)
+        VERSION="0.7.0b"
 
         git checkout ${GITHUB_REF_NAME}
         mkdir -p ${FLATPAK_DEST}/retrodeck/
@@ -90,7 +90,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.7.0b
+        branch: main
 
   - name: xmlstarlet
     config-opts:
@@ -1182,4 +1182,4 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.7.0b
+        branch: main
diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch
index 0b1cfb79..fbfdda61 160000
--- a/rd-submodules/retroarch
+++ b/rd-submodules/retroarch
@@ -1 +1 @@
-Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
+Subproject commit fbfdda61b3da092a71cc53999dd3e7b909f244e2
diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules
index a2441b96..50314360 160000
--- a/rd-submodules/shared-modules
+++ b/rd-submodules/shared-modules
@@ -1 +1 @@
-Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42
+Subproject commit 50314360ded6fa3b9f0b602513b1164b7a6636ed