diff --git a/emu-configs/defaults/retrodeck/retrodeck.cfg b/emu-configs/defaults/retrodeck/retrodeck.cfg
index 9e824ece..88a33896 100644
--- a/emu-configs/defaults/retrodeck/retrodeck.cfg
+++ b/emu-configs/defaults/retrodeck/retrodeck.cfg
@@ -6,8 +6,8 @@ roms_folder=/home/deck/retrodeck/roms
 saves_folder=/home/deck/retrodeck/saves
 states_folder=/home/deck/retrodeck/states
 bios_folder=/home/deck/retrodeck/bios
-media_folder=/home/deck/retrodeck/downloaded_media
-themes_folder=/home/deck/retrodeck/themes
+media_folder=/home/deck/retrodeck/ES-DE/downloaded_media
+themes_folder=/home/deck/retrodeck/ES-DE/themes
 logs_folder=/home/deck/retrodeck/logs
 screenshots_folder=/home/deck/retrodeck/screenshots
 mods_folder=/home/deck/retrodeck/mods
diff --git a/functions/post_update.sh b/functions/post_update.sh
index dc074924..10050446 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -307,6 +307,11 @@ post_update() {
     log d "ES-DE files were moved inside the retrodeck folder, migrating to the new structure"
     dir_prep "$rdhome/ES-DE/collections" "/var/config/ES-DE/collections"
     dir_prep "$rdhome/ES-DE/gamelists" "/var/config/ES-DE/gamelists"
+    log i "Moving ES-DE collections, downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\""
+    set_setting_value "$es_settings" "MediaDirectory" "$rdhome/ES-DE/downloaded_media" "es_settings"
+    set_setting_value "$es_settings" "UserThemeDirectory" "$rdhome/ES-DE/themes" "es_settings"
+    mv -f "$rdhome/themes" "$rdhome/ES-DE/themes"
+    mv -f "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media"
     mv -f "$rdhome/gamelists/"* "$rdhome/ES-DE/gamelists"
     rm -rf "$rdhome/gamelists"
 
diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index dd74b2de..f8be894b 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -74,7 +74,7 @@
             <ul>
                <li>All emulators updated</li>
                <li>PREPARE_COMPONENT: now the choice is passed lowercased so the script don't have to check for the possible casings, this should fix the issue where GZDoom couldn't be reset as it was expecting both GZDOOM or gzdoom.</li>
-               <li>ES-DE: gamelists are now moved to retrodeck/ES-DE/gamelist (previously was retrodeck/gamelist)</li>
+               <li>ES-DE: downloaded_media, gamelist, and themes are now moved to the new retrodeck/ES-DE (previously was retrodeck)</li>
                <li>ES-DE: custom collections are now located in retrodeck/ES-DE/collections, this prevents to be destroyed by a reset</li>
                <li>LOGGER: version notes are no more outputed in the terminal or in the logs</li>
                <li>WORKFLOWS: added RetroDECK.flatpak.sha files</li>
diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch
index bd9653bb..c2aad986 160000
--- a/rd-submodules/retroarch
+++ b/rd-submodules/retroarch
@@ -1 +1 @@
-Subproject commit bd9653bb7bfcd05692a8eb8ca6862468dec88325
+Subproject commit c2aad98600a47ab250f1b133328d0ccc1310f65e
diff --git a/rd-submodules/ryujinx b/rd-submodules/ryujinx
index 72ec964e..ea1dae93 160000
--- a/rd-submodules/ryujinx
+++ b/rd-submodules/ryujinx
@@ -1 +1 @@
-Subproject commit 72ec964e090cfa76905fc26d19797f99b8fc07f7
+Subproject commit ea1dae930a6f61388c2b5e05f95bb6ed0120926e
diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules
index 782d3cc0..f63cb3f5 160000
--- a/rd-submodules/shared-modules
+++ b/rd-submodules/shared-modules
@@ -1 +1 @@
-Subproject commit 782d3cc04ccdd8071017f622d4bacd35faecbd86
+Subproject commit f63cb3f5fff835c141769d35cd54ce0ae042fcbf