diff --git a/IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/build.bat b/IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/build.bat
index 6a33142e33..f59df3b73a 100644
--- a/IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/build.bat
+++ b/IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/build.bat
@@ -1,9 +1,13 @@
 @echo off
 setlocal
 
-set MAKE=C:\Renesas\e2_studio\eclipse\plugins\com.renesas.ide.exttools.gnumake.win32.x86_64_4.3.1.v20240909-0854\mk\make.exe
-set CCRX_BIN=C:\PROGRA~2\Renesas\RX\3_6_0\bin
-set E2_UTILS=%USERPROFILE%\.eclipse\com.renesas.platform_1435879475\Utilities\ccrx
+REM --- These paths are tied to a specific e2studio/CCRX install (plugin version, CCRX
+REM version, platform ID) and will not exist as-is on a different machine or a different
+REM e2studio/CCRX version. Set MAKE/CCRX_BIN/E2_UTILS in the environment before calling
+REM build.bat to override the defaults below for your install. ---
+if not defined MAKE set MAKE=C:\Renesas\e2_studio\eclipse\plugins\com.renesas.ide.exttools.gnumake.win32.x86_64_4.3.1.v20240909-0854\mk\make.exe
+if not defined CCRX_BIN set CCRX_BIN=C:\PROGRA~2\Renesas\RX\3_6_0\bin
+if not defined E2_UTILS set E2_UTILS=%USERPROFILE%\.eclipse\com.renesas.platform_1435879475\Utilities\ccrx
 set PATH=%CCRX_BIN%;%E2_UTILS%;%PATH%
 set BASEDIR=%~dp0
 
diff --git a/IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/debug_run.bat b/IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/debug_run.bat
index 2f848a4d1e..581dd28041 100644
--- a/IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/debug_run.bat
+++ b/IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/debug_run.bat
@@ -1,17 +1,11 @@
 @echo off
 setlocal
 
-REM --- Flash test.x and let it run, using Renesas Flash Programmer (RFP) instead of a raw
-REM GDB session. e2studio's GUI debug launch sends >150 "monitor set_io_access_width"
-REM commands (device-specific I/O bus-width setup, captured from the Debugger Console) before
-REM anything else; a hand-written GDB script can't feasibly replicate that, and without it the
-REM CPU runs but peripherals (SCI2/TSIP) don't come up correctly -- no UART output, even though
-REM GDB reports the thread as running. RFP's own flash-and-run path sidesteps all of that: it's
-REM closer to a real power-on boot (erase/program/verify, then release reset via -run) and does
-REM not go through a GDB debug session at all. Confirmed working: UART output appears correctly
-REM after "rfp-cli ... -auto -run".
-
-set DEBUG_DIR=%USERPROFILE%\.eclipse\com.renesas.platform_1435879475\DebugComp\RX
+REM --- Flash test.x and let it run, using Renesas Flash Programmer (RFP) CLI ---
+REM DEBUG_DIR is tied to a specific e2studio install (platform ID) and will not exist as-is
+REM on a different machine. Set DEBUG_DIR in the environment before calling debug_run.bat to
+REM override the default below for your install.
+if not defined DEBUG_DIR set DEBUG_DIR=%USERPROFILE%\.eclipse\com.renesas.platform_1435879475\DebugComp\RX
 set OBJCOPY=%DEBUG_DIR%\rx-elf-objcopy.exe
 set BASEDIR=%~dp0
 set TARGET_X=%BASEDIR%test\HardwareDebug\test.x
diff --git a/IDE/Renesas/e2studio/RX72N/EnvisionKit/include.am b/IDE/Renesas/e2studio/RX72N/EnvisionKit/include.am
index 52d1fd00cf..cf0a8b309e 100644
--- a/IDE/Renesas/e2studio/RX72N/EnvisionKit/include.am
+++ b/IDE/Renesas/e2studio/RX72N/EnvisionKit/include.am
@@ -38,3 +38,5 @@ EXTRA_DIST+= IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/test/test.scfg
 EXTRA_DIST+= IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/wolfssl/.cproject
 EXTRA_DIST+= IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/wolfssl/.project
 EXTRA_DIST+= IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/build.bat
+EXTRA_DIST+= IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/debug_run.bat
+EXTRA_DIST+= IDE/Renesas/e2studio/RX72N/EnvisionKit/Simple/set_demo_mode.ps1