diff --git a/bin/device-install.bat b/bin/device-install.bat
index c18be89a8..4d13d9f3b 100755
--- a/bin/device-install.bat
+++ b/bin/device-install.bat
@@ -1,7 +1,12 @@
 @ECHO OFF
-
-set PYTHON=python
-set WEB_APP=0
+SETLOCAL EnableDelayedExpansion
+set "SCRIPTNAME=%~nx0"
+set "PYTHON=python"
+set "WEB_APP=0"
+set "TFT8=0"
+set "TFT16=0"
+SET "TFT_BUILD=0"
+SET "DO_SPECIAL_OTA=0"
 
 :: Determine the correct esptool command to use
 where esptool >nul 2>&1
@@ -13,7 +18,7 @@ if %ERRORLEVEL% EQU 0 (
 
 goto GETOPTS
 :HELP
-echo Usage: %~nx0 [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME^|FILENAME] [--web]
+echo Usage: %SCRIPTNAME% [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME] [--web] [--tft] [--tft-16mb]
 echo Flash image file to device, but first erasing and writing system information
 echo.
 echo     -h               Display this help and exit
@@ -21,52 +26,124 @@ echo     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not
 echo     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: %PYTHON%)
 echo     -f FILENAME      The .bin file to flash.  Custom to your device type and region.
 echo     --web            Flash WEB APP.
+echo     --tft            Flash MUI 8mb
+echo     --tft-16mb       Flash MUI 16mb
 goto EOF
 
 :GETOPTS
-if /I "%1"=="-h" goto HELP
-if /I "%1"=="--help" goto HELP
-if /I "%1"=="-F" set "FILENAME=%2" & SHIFT
-if /I "%1"=="-p" set ESPTOOL_PORT=%2 & SHIFT
-if /I "%1"=="-P" set PYTHON=%2 & SHIFT
-if /I "%1"=="--web" set WEB_APP=1 & SHIFT
+if /I "%~1"=="-h" goto HELP & exit /b
+if /I "%~1"=="--help" goto HELP & exit /b
+if "%~1"=="-p" set "ESPTOOL_PORT=%~2" & SHIFT & SHIFT & goto GETOPTS
+if "%~1"=="-P" set "PYTHON=%~2" & SHIFT & SHIFT & goto GETOPTS
+if /I "%~1"=="-f" set "FILENAME=%~2" & SHIFT & SHIFT & goto GETOPTS
+if /I "%~1"=="--web" set "WEB_APP=1" & SHIFT & goto GETOPTS
+if /I "%~1"=="--tft" set "TFT8=1" & SHIFT & goto GETOPTS
+if /I "%~1"=="--tft-16mb" set "TFT16=1" & SHIFT & goto GETOPTS
 SHIFT
-IF NOT "__%1__"=="____" goto GETOPTS
+IF NOT "%~1"=="" goto GETOPTS
 
 IF "__%FILENAME%__" == "____" (
     echo "Missing FILENAME"
     goto HELP
 )
+
+:: Check if FILENAME contains "-tft-" and either TFT8 or TFT16 is 1 (--tft, -tft-16mb)
+IF NOT "%FILENAME:-tft-=%"=="%FILENAME%" (
+    SET "TFT_BUILD=1"
+    IF NOT "%TFT8%"=="1" IF NOT "%TFT16%"=="1" (
+        echo Error: Either --tft or --tft-16mb must be set to use a TFT build.
+        goto EOF
+    )
+    IF "%TFT8%"=="1" IF "%TFT16%"=="1" (
+        echo Error: Both --tft and --tft-16mb must NOT be set at the same time.
+        goto EOF
+    )
+)
+
+:: Extract BASENAME from %FILENAME% for later use.
+SET BASENAME=%FILENAME:firmware-=%
+
 IF EXIST %FILENAME% IF x%FILENAME:update=%==x%FILENAME% (
+    @REM Default littlefs* offset (--web).
+    SET "OFFSET=0x300000"
+
+    @REM Default OTA Offset
+    SET "OTA_OFFSET=0x260000"
+
+    @REM littlefs* offset for MUI 8mb (--tft) and OTA OFFSET.
+    IF "%TFT8%"=="1" IF "%TFT_BUILD%"=="1" (
+        SET "OFFSET=0x670000"
+        SET "OTA_OFFSET=0x340000"
+    ) else (
+        echo Ignoring --tft, not a TFT Build.
+    )
+
+    @REM littlefs* offset for MUI 16mb (--tft-16mb) and OTA OFFSET.
+    IF "%TFT16%"=="1" IF "%TFT_BUILD%"=="1" (
+        SET "OFFSET=0xc90000"
+        SET "OTA_OFFSET=0x650000"
+    ) else (
+        echo Ignoring --tft-16mb, not a TFT Build.
+    )
+
     echo Trying to flash update %FILENAME%, but first erasing and writing system information"
     %ESPTOOL_CMD% --baud 115200 erase_flash
-    %ESPTOOL_CMD% --baud 115200 write_flash 0x00 %FILENAME%
-    
+    %ESPTOOL_CMD% --baud 115200 write_flash 0x00 "%FILENAME%"
+
     @REM Account for S3 and C3 board's different OTA partition
-    IF x%FILENAME:s3=%==x%FILENAME% IF x%FILENAME:v3=%==x%FILENAME% IF x%FILENAME:t-deck=%==x%FILENAME% IF x%FILENAME:wireless-paper=%==x%FILENAME% IF x%FILENAME:wireless-tracker=%==x%FILENAME% IF x%FILENAME:station-g2=%==x%FILENAME% IF x%FILENAME:unphone=%==x%FILENAME% (
-        IF x%FILENAME:esp32c3=%==x%FILENAME% (
-            %ESPTOOL_CMD% --baud 115200 write_flash 0x260000 bleota.bin
+    IF NOT "%FILENAME%"=="%FILENAME:s3=%" SET "DO_SPECIAL_OTA=1"
+    IF NOT "%FILENAME%"=="%FILENAME:v3=%" SET "DO_SPECIAL_OTA=1"
+    IF NOT "%FILENAME%"=="%FILENAME:t-deck=%" SET "DO_SPECIAL_OTA=1"
+    IF NOT "%FILENAME%"=="%FILENAME:wireless-paper=%" SET "DO_SPECIAL_OTA=1"
+    IF NOT "%FILENAME%"=="%FILENAME:wireless-tracker=%" SET "DO_SPECIAL_OTA=1"
+    IF NOT "%FILENAME%"=="%FILENAME:station-g2=%" SET "DO_SPECIAL_OTA=1"
+    IF NOT "%FILENAME%"=="%FILENAME:unphone=%" SET "DO_SPECIAL_OTA=1"
+    IF NOT "%FILENAME%"=="%FILENAME:esp32c3=%" SET "DO_SPECIAL_OTA=1"
+
+    IF "!DO_SPECIAL_OTA!"=="1" (
+        IF NOT "%FILENAME%"=="%FILENAME:esp32c3=%" (
+            %ESPTOOL_CMD% --baud 115200 write_flash !OTA_OFFSET! bleota-c3.bin
+        ) ELSE (
+            %ESPTOOL_CMD% --baud 115200 write_flash !OTA_OFFSET! bleota-s3.bin
+        )
+    ) ELSE (
+        %ESPTOOL_CMD% --baud 115200 write_flash !OTA_OFFSET! bleota.bin
+    )
+
+    @REM Check if WEB_APP (--web) is enabled and add "littlefswebui-" to BASENAME else "littlefs-".
+    IF "%WEB_APP%"=="1" (
+        @REM Check it the file exist before trying to write it.
+        IF EXIST "littlefswebui-%BASENAME%" (
+            %ESPTOOL_CMD% --baud 115200 write_flash !OFFSET! "littlefswebui-%BASENAME%"
         ) else (
-            %ESPTOOL_CMD% --baud 115200 write_flash 0x260000 bleota-c3.bin
+            echo Error: file "littlefswebui-%BASENAME%" wasn't found, littlefswebui not written.
+            goto EOF
         )
     ) else (
-        %ESPTOOL_CMD% --baud 115200 write_flash 0x260000 bleota-s3.bin
-    )
-    IF %WEB_APP%==1 (
-        for %%f in (littlefswebui-*.bin) do (
-            %ESPTOOL_CMD% --baud 115200 write_flash 0x300000 %%f
-        )
-    ) else (
-        for %%f in (littlefs-*.bin) do (
-            %ESPTOOL_CMD% --baud 115200 write_flash 0x300000 %%f
+        @REM Check it the file exist before trying to write it.
+        IF EXIST "littlefs-%BASENAME%" (
+            %ESPTOOL_CMD% --baud 115200 write_flash !OFFSET! "littlefs-%BASENAME%"
+        ) else (
+            echo Error: file "littlefs-%BASENAME%" wasn't found, littlefs not written.
+            goto EOF
         )
     )
 ) else (
     echo "Invalid file: %FILENAME%"
     goto HELP
-) else (
-    echo "Invalid file: %FILENAME%"
-    goto HELP
 )
 
 :EOF
+@REM Cleanup vars.
+SET "SCRIPTNAME="
+SET "PYTHON="
+SET "WEB_APP="
+SET "TFT8="
+Set "TFT16="
+SET "OFFSET="
+SET "OTA_OFFSET="
+SET "DO_SPECIAL_OTA="
+SET "FILENAME="
+SET "BASENAME="
+endlocal
+exit /b 0
\ No newline at end of file
diff --git a/bin/device-install.sh b/bin/device-install.sh
index 4698b88e5..96a204a5a 100755
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
 WEB_APP=false
+TFT8=false
+TFT16=false
+TFT_BUILD=false
 
 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
@@ -19,8 +22,8 @@ set -e
 
 # Usage info
 show_help() {
-	cat <<EOF
-Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME] [--web]
+    cat <<EOF
+Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME] [--web] [--tft] [--tft-16mb]
 Flash image file to device, but first erasing and writing system information"
 
     -h               Display this help and exit
@@ -28,71 +31,135 @@ Flash image file to device, but first erasing and writing system information"
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
     -f FILENAME      The .bin file to flash.  Custom to your device type and region.
     --web            Flash WEB APP.
+    --tft            Flash MUI 8mb
+    --tft-16mb       Flash MUI 16mb
 
 EOF
 }
-# Preprocess long options like --web
-for arg in "$@"; do
-    case "$arg" in
+# Parse arguments using a single while loop
+while [ $# -gt 0 ]; do
+    case "$1" in
+        -h|--help)
+            show_help
+            exit 0
+            ;;
+        -p)
+            ESPTOOL_PORT="$2"
+            shift # Shift past the option argument
+            ;;
+        -P)
+            PYTHON="$2"
+            shift
+            ;;
+        -f)
+            FILENAME="$2"
+            shift
+            ;;
         --web)
             WEB_APP=true
-            shift # Remove this argument from the list
+            ;;
+        --tft)
+            TFT8=true
+            ;;
+        --tft-16mb)
+            TFT16=true
+            ;;
+        --) # Stop parsing options
+            shift
+            break
+            ;;
+        *)
+            echo "Unknown argument: $1" >&2
+            exit 1
             ;;
     esac
+    shift # Move to the next argument
 done
 
-while getopts ":hp:P:f:" opt; do
-	case "${opt}" in
-	h)
-		show_help
-		exit 0
-		;;
-	p)
-		export ESPTOOL_PORT=${OPTARG}
-		;;
-	P)
-		PYTHON=${OPTARG}
-		;;
-	f)
-		FILENAME=${OPTARG}
-		;;
-	*)
-		echo "Invalid flag."
-		show_help >&2
-		exit 1
-		;;
-	esac
-done
-shift "$((OPTIND - 1))"
-
 [ -z "$FILENAME" -a -n "$1" ] && {
-	FILENAME=$1
-	shift
+    FILENAME=$1
+    shift
 }
 
+# Check if FILENAME contains "-tft-" and either TFT8 or TFT16 is 1 (--tft, -tft-16mb)
+if [[ "${FILENAME//-tft-/}" != "$FILENAME" ]]; then
+    TFT_BUILD=true
+    if [[ "$TFT8" != true && "$TFT16" != true ]]; then
+        echo "Error: Either --tft or --tft-16mb must be set to use a TFT build."
+        exit 1
+    fi
+    if [[ "$TFT8" == true && "$TFT16" == true ]]; then
+        echo "Error: Both --tft and --tft-16mb must NOT be set at the same time."
+        exit 1
+    fi
+fi
+
+# Extract BASENAME from %FILENAME% for later use.
+BASENAME="${FILENAME/firmware-/}"
+
 if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
-	echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
-	$ESPTOOL_CMD erase_flash
-	$ESPTOOL_CMD write_flash 0x00 "${FILENAME}"
-	# Account for S3 board's different OTA partition
-	if [ -n "${FILENAME##*"s3"*}" ] && [ -n "${FILENAME##*"-v3"*}" ] && [ -n "${FILENAME##*"t-deck"*}" ] && [ -n "${FILENAME##*"wireless-paper"*}" ] && [ -n "${FILENAME##*"wireless-tracker"*}" ] && [ -n "${FILENAME##*"station-g2"*}" ] && [ -n "${FILENAME##*"unphone"*}" ]; then
-		if [ -n "${FILENAME##*"esp32c3"*}" ]; then
-			$ESPTOOL_CMD write_flash 0x260000 bleota.bin
-		else
-			$ESPTOOL_CMD write_flash 0x260000 bleota-c3.bin
-		fi
-	else
-		$ESPTOOL_CMD write_flash 0x260000 bleota-s3.bin
-	fi
-	if [ "$WEB_APP" = true ]; then
-		$ESPTOOL_CMD write_flash 0x300000 littlefswebui-*.bin
-	else
-		$ESPTOOL_CMD write_flash 0x300000 littlefs-*.bin
-	fi
+    # Default littlefs* offset (--web).
+    OFFSET=0x300000
+
+    # Default OTA Offset
+    OTA_OFFSET=0x260000
+
+    # littlefs* offset for MUI 8mb (--tft) and OTA OFFSET.
+    if [ "$TFT8" = true ]; then
+        if [ "$TFT_BUILD" = true ]; then
+            OFFSET=0x670000
+            OTA_OFFSET=0x340000
+        else
+            echo "Ignoring --tft, not a TFT Build."
+        fi
+    fi
+
+    # littlefs* offset for MUI 16mb (--tft-16mb) and OTA OFFSET.
+    if [ "$TFT16" = true ]; then
+        if [ "$TFT_BUILD" = true ]; then
+            OFFSET=0xc90000
+            OTA_OFFSET=0x650000
+        else
+            echo "Ignoring --tft-16mb, not a TFT Build."
+        fi
+    fi
+
+    echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
+    $ESPTOOL_CMD erase_flash
+    $ESPTOOL_CMD write_flash 0x00 "${FILENAME}"
+    # Account for S3 board's different OTA partition
+    if [ -n "${FILENAME##*"s3"*}" ] && [ -n "${FILENAME##*"-v3"*}" ] && [ -n "${FILENAME##*"t-deck"*}" ] && [ -n "${FILENAME##*"wireless-paper"*}" ] && [ -n "${FILENAME##*"wireless-tracker"*}" ] && [ -n "${FILENAME##*"station-g2"*}" ] && [ -n "${FILENAME##*"unphone"*}" ]; then
+        if [ -n "${FILENAME##*"esp32c3"*}" ]; then
+            $ESPTOOL_CMD write_flash $OTA_OFFSET bleota.bin
+        else
+            $ESPTOOL_CMD write_flash $OTA_OFFSET bleota-c3.bin
+        fi
+    else
+        $ESPTOOL_CMD write_flash $OTA_OFFSET bleota-s3.bin
+    fi
+
+    # Check if WEB_APP (--web) is enabled and add "littlefswebui-" to BASENAME else "littlefs-".
+    if [ "$WEB_APP" = true ]; then
+        # Check it the file exist before trying to write it.
+        if [ -f "littlefswebui-${BASENAME}" ]; then
+            $ESPTOOL_CMD write_flash $OFFSET "littlefswebui-${BASENAME}"
+        else
+            echo "Error: file "littlefswebui-${BASENAME}" wasn't found, littlefs not written."
+            exit 1
+        fi
+    else
+        # Check it the file exist before trying to write it.
+        if [ -f "littlefs-${BASENAME}" ]; then
+            $ESPTOOL_CMD write_flash $OFFSET "littlefs-${BASENAME}"
+        else
+            echo "Error: file "littlefs-${BASENAME}" wasn't found, littlefs not written."
+            exit 1
+        fi
+    fi
 
 else
-	show_help
-	echo "Invalid file: ${FILENAME}"
+    show_help
+    echo "Invalid file: ${FILENAME}"
 fi
 
 exit 0