diff --git a/functions/global.sh b/functions/global.sh
index b71b1b3e..60f7a966 100644
--- a/functions/global.sh
+++ b/functions/global.sh
@@ -29,7 +29,7 @@ splashscreen_dir="/var/config/emulationstation/ES-DE/resources/graphics/extra_sp
 current_splash_file="/var/config/emulationstation/ES-DE/resources/graphics/splash.svg"                    # The active splash file that will be shown on boot
 default_splash_file="/var/config/emulationstation/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)
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index d95c2908..c330496a 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -433,8 +433,8 @@ modules:
   - name: art-book-next-es-de
     buildsystem: simple
     build-commands:
-      - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/
-      - mv -f * ${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/es-de/themes/art-book-next-es-de/
     sources:
       - type: git
         url:  https://github.com/anthonycaccese/art-book-next-es-de.git
@@ -1302,16 +1302,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/linux/es_find_rules.xml
-      - cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/linux/
-      - rm -rf /app/share/emulationstation/resources/systems/linux/es_systems.xml
-      - cp es-configs/es_systems.xml /app/share/emulationstation/resources/systems/linux/
+      - rm -rf /app/share/es-de/resources/systems/linux/es_find_rules.xml
+      - cp es-configs/es_find_rules.xml /app/share/es-de/resources/systems/linux/
+      - rm -rf /app/share/es-de/resources/systems/linux/es_systems.xml
+      - 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