diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml
index 117f1800..8ec2ff62 100644
--- a/es-configs/es_settings.xml
+++ b/es-configs/es_settings.xml
@@ -145,7 +145,7 @@
 <string name="ScraperPasswordScreenScraper" value="" />
 <string name="ScraperRegion" value="eu" />
 <string name="ScraperUsernameScreenScraper" value="" />
-<string name="ScreensaverSlideshowImageDir" value="/var/config/es-de/ES-DE/slideshow/custom_images" />
+<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" />
diff --git a/functions/050_save_migration.sh b/functions/050_save_migration.sh
index 786686fc..55f3d679 100644
--- a/functions/050_save_migration.sh
+++ b/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/es-de/ES-DE/downloaded_media"
-  dir_prep "$themes_folder" "/var/config/es-de/ES-DE/themes"
+  dir_prep "$media_folder" "/var/config/ES-DE/downloaded_media"
+  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/es-de/ES-DE/es_settings.xml
+  cp -fv /app/retrodeck/es_settings.xml /var/config/ES-DE/es_settings.xml
 
   # 0.4 -> 0.5
   # Perform save and state migration if needed
diff --git a/functions/functions.sh b/functions/functions.sh
index 6ac742f3..c69d69ed 100644
--- a/functions/functions.sh
+++ b/functions/functions.sh
@@ -486,9 +486,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/es-de/ES-DE/gamelists/doom"
-  if [[ ! -f "/var/config/es-de/ES-DE/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist
-    cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/es-de/ES-DE/gamelists/doom/gamelist.xml"
+  mkdir -p "/var/config/ES-DE/gamelists/doom"
+  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/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 +519,8 @@ 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/es-de/ES-DE/resources/graphics
-  rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/es-de/ES-DE/resources/graphics/"
+  rm -rf /var/config/ES-DE/resources/graphics
+  rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/ES-DE/resources/graphics/"
 }
 
 deploy_helper_files() {
@@ -631,5 +631,5 @@ start_retrodeck() {
   easter_eggs # Check if today has a surprise splashscreen and load it if so
   # normal startup
   echo "Starting RetroDECK v$version"
-  es-de --home /var/config/es-de
+  es-de --home /var/config/ES-DE
 }
diff --git a/functions/global.sh b/functions/global.sh
index 9a6ba230..ef5b760f 100644
--- a/functions/global.sh
+++ b/functions/global.sh
@@ -25,9 +25,9 @@ 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/es-de/ES-DE/resources/graphics/extra_splashes"                   # The default location of extra splash screens
-current_splash_file="/var/config/es-de/ES-DE/resources/graphics/splash.svg"                    # The active splash file that will be shown on boot
-default_splash_file="/var/config/es-de/ES-DE/resources/graphics/splash-orig.svg"               # The default RetroDECK splash screen
+splashscreen_dir="/var/config/ES-DE/resources/graphics/extra_splashes"                   # The default location of extra splash screens
+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/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/es-de/themes"                                                                     # The directory where themes packaged with RetroDECK are stored
 lockfile="/var/config/retrodeck/.lock"                                                                                # where the lockfile is located
@@ -58,7 +58,7 @@ yuzuconf="/var/config/yuzu/qt-config.ini"
 
 # ES-DE config files
 
-es_settings="/var/config/es-de/ES-DE/es_settings.xml"
+es_settings="/var/config/ES-DE/es_settings.xml"
 
 # RetroArch config files
 
diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index 95b1d0ac..1b293919 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -40,12 +40,12 @@ 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/es-de/
-      mkdir -p /var/config/es-de/ES-DE/
-      cp -f /app/retrodeck/es_settings.xml /var/config/es-de/ES-DE/es_settings.xml
+      mkdir -p /var/config/ES-DE/
+      cp -f /app/retrodeck/es_settings.xml /var/config/ES-DE/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/es-de/ES-DE/gamelists"
+      dir_prep "$rdhome/gamelists" "/var/config/ES-DE/gamelists"
       es-de --home /var/config/es-de --create-system-dirs
       update_splashscreens
     fi
@@ -53,7 +53,7 @@ prepare_component() {
       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/es-de/ES-DE/gamelists"
+      dir_prep "$rdhome/gamelists" "/var/config/ES-DE/gamelists"
     fi
   fi