diff --git a/functions.sh b/functions.sh
index b130e692..244139e6 100644
--- a/functions.sh
+++ b/functions.sh
@@ -642,7 +642,6 @@ update_rd_conf() {
   deploy_single_patch $rd_defaults $rd_update_patch $rd_conf
   set_setting_value $rd_conf "version" "$hard_version" retrodeck # Set version of currently running RetroDECK to updated retrodeck.cfg
   rm -f $rd_update_patch # Cleanup temporary patch file
-  source $rd_conf # Load new config file variables
 }
 
 resolve_preset_conflicts() {
@@ -815,7 +814,7 @@ dolphin_init() {
   dir_prep "$rdhome/saves/gc/dolphin/USA" "/var/data/dolphin-emu/GC/USA"
   dir_prep "$rdhome/saves/gc/dolphin/JAP" "/var/data/dolphin-emu/GC/JAP"
   dir_prep "$rdhome/screenshots" "/var/data/dolphin-emu/ScreenShots"
-  dir_prep "$rdhome/states" "/var/data/dolphin-emu/StateSaves"
+  dir_prep "$rdhome/states/dolphin" "/var/data/dolphin-emu/StateSaves"
   mkdir -pv /var/data/dolphin-emu/Wii/
   dir_prep "$rdhome/saves/wii/dolphin" "/var/data/dolphin-emu/Wii"
   dir_prep "$mods_folder/Dolphin" "/var/data/dolphin-emu/Load/GraphicMods/"
@@ -835,7 +834,7 @@ primehack_init() {
   dir_prep "$rdhome/saves/gc/primehack/USA" "/var/data/primehack/GC/USA"
   dir_prep "$rdhome/saves/gc/primehack/JAP" "/var/data/primehack/GC/JAP"
   dir_prep "$rdhome/screenshots" "/var/data/primehack/ScreenShots"
-  dir_prep "$rdhome/states" "/var/data/primehack/StateSaves"
+  dir_prep "$rdhome/states/primehack" "/var/data/primehack/StateSaves"
   mkdir -pv /var/data/primehack/Wii/
   dir_prep "$rdhome/saves/wii/primehack" "/var/data/primehack/Wii"
   dir_prep "$mods_folder/Primehack" "/var/data/primehack/Load/GraphicMods/"
@@ -1129,7 +1128,7 @@ emulators_post_move() {
   dir_prep "$rdhome/saves/gc/dolphin/USA" "/var/data/dolphin-emu/GC/USA"
   dir_prep "$rdhome/saves/gc/dolphin/JAP" "/var/data/dolphin-emu/GC/JAP"
   dir_prep "$rdhome/screenshots" "/var/data/dolphin-emu/ScreenShots"
-  dir_prep "$rdhome/states" "/var/data/dolphin-emu/StateSaves"
+  dir_prep "$rdhome/states/dolphin" "/var/data/dolphin-emu/StateSaves"
   dir_prep "$rdhome/saves/wii/dolphin" "/var/data/dolphin-emu/Wii/"
 
   # Primehack section
@@ -1138,7 +1137,7 @@ emulators_post_move() {
   dir_prep "$rdhome/saves/gc/primehack/USA" "/var/data/primehack/GC/USA"
   dir_prep "$rdhome/saves/gc/primehack/JAP" "/var/data/primehack/GC/JAP"
   dir_prep "$rdhome/screenshots" "/var/data/primehack/ScreenShots"
-  dir_prep "$rdhome/states" "/var/data/primehack/StateSaves"
+  dir_prep "$rdhome/states/primehack" "/var/data/primehack/StateSaves"
   dir_prep "$rdhome/saves/wii/primehack" "/var/data/primehack/Wii/"
 
   # PCSX2 section
@@ -1376,7 +1375,7 @@ finit() {
   dir_prep "$themes_folder" "/var/config/emulationstation/.emulationstation/themes"
 
   # PICO-8
-  dir_prep "$bios_folder/pico-8" "~/.lexaloffle/pico-8" # Store binary and config files together. The .lexaloffle directory is a hard-coded location for the PICO-8 config file, cannot be changed
+  dir_prep "$bios_folder/pico-8" "$HOME/.lexaloffle/pico-8" # Store binary and config files together. The .lexaloffle directory is a hard-coded location for the PICO-8 config file, cannot be changed
   dir_prep "$roms_folder/pico8" "$bios_folder/pico-8/carts" # Symlink default game location to RD roms for cleanliness (this location is overridden anyway by the --root_path launch argument anyway)
   dir_prep "$bios_folder/pico-8/cdata" "$saves_folder/pico-8" # PICO-8 saves folder
 
diff --git a/post_update.sh b/post_update.sh
index 038ae2c3..7d861cab 100644
--- a/post_update.sh
+++ b/post_update.sh
@@ -19,7 +19,7 @@ post_update() {
     # - Primehack preconfiguration completely redone. "Stop emulation" hotkey set to Start+Select, Xbox and Nintendo keymap profiles were created, Xbox set as default.
     # - Duckstation save and state locations were dir_prep'd to the rdhome/save and /state folders, which was not previously done. Much safer now!
     # - Fix PICO-8 folder structure. ROM and save folders are now sane and binary files will go into ~/retrodeck/bios/pico-8/
-    
+
     rm -rf /var/config/primehack # Purge old Primehack config files. Saves are safe as they are linked into /var/data/primehack.
     primehack_init
 
@@ -27,10 +27,21 @@ post_update() {
     dir_prep "$rdhome/states/duckstation" "/var/data/duckstation/savestates"
 
     mv "$bios_folder/pico8" "$bios_folder/pico8_olddata" # Move legacy (and incorrect / non-functional ) PICO-8 location for future cleanup / less confusion
-    dir_prep "$bios_folder/pico-8" "~/.lexaloffle/pico-8" # Store binary and config files together. The .lexaloffle directory is a hard-coded location for the PICO-8 config file, cannot be changed
+    dir_prep "$bios_folder/pico-8" "$HOME/.lexaloffle/pico-8" # Store binary and config files together. The .lexaloffle directory is a hard-coded location for the PICO-8 config file, cannot be changed
     dir_prep "$roms_folder/pico8" "$bios_folder/pico-8/carts" # Symlink default game location to RD roms for cleanliness (this location is overridden anyway by the --root_path launch argument anyway)
     dir_prep "$bios_folder/pico-8/cdata" "$saves_folder/pico-8" # PICO-8 saves folder
   fi
+  if [[ $prev_version -le "063" ]]; then
+    # In version 0.6.2b, the following changes were made that required config file updates/reset:
+    # - Put Dolphin and Primehack save states in different folders inside $rd_home/states
+    # - Fix symlink to hard-coded PICO-8 config folder (dir_prep doesn't like ~)
+    
+    dir_prep "$rdhome/states/dolphin" "/var/data/dolphin-emu/StateSaves"
+    dir_prep "$rdhome/states/primehack" "/var/data/primehack/StateSaves"
+
+    rm -rf "$HOME/~/" # Remove old incorrect location from 0.6.2b
+    dir_prep "$bios_folder/pico-8" "$HOME/.lexaloffle/pico-8" # Store binary and config files together. The .lexaloffle directory is a hard-coded location for the PICO-8 config file, cannot be changed
+  fi
   if [[ $prev_version -le "070" ]]; then
     # In version 0.7.0b, the following changes were made that required config file updates/reset or other changes to the filesystem:
     # - New ~/retrodeck/mods and ~/retrodeck/texture_packs directories are added and symlinked to multiple different emulators (where supported)
@@ -53,6 +64,6 @@ post_update() {
   --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
   --title "RetroDECK Finishing Upgrade" \
   --text="RetroDECK is finishing the upgrade process, please wait."
-
+  source $rd_conf # Load new config file variables
   create_lock
 }
\ No newline at end of file
diff --git a/retrodeck.sh b/retrodeck.sh
index 634c38b7..75f09ba6 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -123,6 +123,8 @@ else
   fi
 fi
 
+source $rd_conf # Load latest variable values
+
 # Check if running in Desktop mode and warn if true, unless desktop_mode_warning=false in retrodeck.cfg
 
 desktop_mode_warning
diff --git a/tools/configurator.sh b/tools/configurator.sh
index 32cf0af5..c6349b2c 100644
--- a/tools/configurator.sh
+++ b/tools/configurator.sh
@@ -322,7 +322,7 @@ configurator_retroarch_rewind_dialog() {
     zenity --question \
     --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
     --title "RetroDECK Configurator - Rewind" \
-    --text="Rewind is currently disabled, do you want to enable it?\n\nNOTE:\nThis may impact performance expecially on the latest systems."
+    --text="Rewind is currently disabled, do you want to enable it?\n\nNOTE:\nThis may impact performance on some more demanding systems."
 
     if [ $? == 0 ]
     then
@@ -339,7 +339,7 @@ configurator_retroarch_options_dialog() {
   --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \
   --column="Choice" --column="Action" \
   "Change Rewind Setting" "Enable or disable the Rewind function in RetroArch." \
-  "Log in to RetroAchivements" "Log into the RetroAchievements service in RetroArch." )
+  "RetroAchievements Login" "Log into the RetroAchievements service in RetroArch." )
 
   case $choice in
 
@@ -347,7 +347,7 @@ configurator_retroarch_options_dialog() {
     configurator_retroarch_rewind_dialog
   ;;
 
-  "Log in to RetroAchivements" )
+  "RetroAchievements Login" )
     configurator_retroachivement_dialog
   ;;
 
@@ -803,18 +803,15 @@ configurator_move_dialog() {
 }
 
 configurator_welcome_dialog() {
-  # Clear the variables
-  destination=
-
   choice=$(zenity --list --title="RetroDECK Configurator Utility" --cancel-label="Quit" \
   --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \
   --column="Choice" --column="Action" \
-  "Move Files" "Move files between internal/SD card or to custom locations." \
-  "Change RetroArch Options" "Change RetroArch presets, log into RetroAchievements etc." \
-  "Change Standalone Emulator Options" "Run emulators standalone to make advanced config changes." \
-  "Compress Games" "Compress games to CHD format for systems that support it." \
-  "Troubleshooting Tools" "Run RetroDECK troubleshooting tools for common issues." \
-  "Reset" "Reset specific parts or all of RetroDECK." )
+  "Move Files" "Move files between internal/SD card or to custom locations" \
+  "RetroArch Presets" "Change RetroArch presets, log into RetroAchievements etc" \
+  "Emulator Options" "Launch and configure each emulators settings (for advanced users)" \
+  "Compress Games" "Compress games to CHD format for systems that support it" \
+  "Troubleshooting Tools" "Run RetroDECK troubleshooting tools for common issues" \
+  "Reset" "Reset specific parts or all of RetroDECK" )
 
   case $choice in
 
@@ -823,11 +820,11 @@ configurator_welcome_dialog() {
     configurator_move_dialog
   ;;
 
-  "Change RetroArch Options" )
+  "RetroArch Presets" )
     configurator_retroarch_options_dialog
   ;;
 
-  "Change Standalone Emulator Options" )
+  "Emulator Options" )
     configurator_power_user_warning_dialog
   ;;