diff --git a/_setup.bat b/_setup.bat
index 86ffe12..8d71d7f 100644
--- a/_setup.bat
+++ b/_setup.bat
@@ -1,88 +1,100 @@
 @echo off
-chcp 65001
+setlocal enabledelayedexpansion
+:: Force the script to run from the folder where it is saved
+cd /d "%~dp0"
+:: Set console encoding to UTF-8
+chcp 65001 >nul
 cls
 
 :begin
-echo Selecione a opção desejada:
+echo ============================================================
+echo                MICROSOFT OFFICE INSTALLER
+echo ============================================================
 echo.
-echo 1) Instalar Office Business (O365BusinessRetail) + Project + Visio - US+BR+MX
-echo 2) Instalar Office Business (O365BusinessRetail) - US+BR+MX
-echo 3) Instalar Office Business (O365BusinessRetail) - BR
-echo 4) Instalar Office Enterprise (O365ProPlusRetail) + Project + Visio - US+BR+MX
-echo 5) Instalar Office Enterprise (O365ProPlusRetail) - US+BR+MX
-echo 6) Instalar Office Enterprise (O365ProPlusRetail) - BR
-echo 7) Instalar Office Home (O365HomePremRetail) + Project + Visio - US+BR+MX
-echo 8) Instalar Office Home (O365HomePremRetail) - US+BR+MX
-echo 9) Instalar Office Home (O365HomePremRetail) - BR
-echo 0) Desinstalar pacotes Office
+echo 1 - Install Office Business + Project + Visio
+echo 2 - Install Office Business (US+BR+MX)
+echo 3 - Install Office Business (Brazil Only)
+echo 4 - Install Office Enterprise + Project + Visio
+echo 5 - Install Office Enterprise (US+BR+MX)
+echo 6 - Install Office Enterprise (Brazil Only)
+echo 7 - Install Office Home + Project + Visio
+echo 8 - Install Office Home (US+BR+MX)
+echo 9 - Install Office Home (Brazil Only)
+echo 0 - Uninstall All Office Packages
 echo.
-set /p op=Digite o número da opção: 
-if "%op%"=="1" goto op1
-if "%op%"=="2" goto op2
-if "%op%"=="3" goto op3
-if "%op%"=="4" goto op4
-if "%op%"=="5" goto op5
-if "%op%"=="6" goto op6
-if "%op%"=="7" goto op7
-if "%op%"=="8" goto op8
-if "%op%"=="9" goto op9
-if "%op%"=="0" goto op0
+echo ============================================================
 
-cls
-goto begin
+:: Use CHOICE command for better reliability on Windows 11
+echo Please press the number of your choice...
+choice /c 1234567890 /n /m "Selection: "
 
+:: Errorlevel 1 corresponds to "1", errorlevel 10 corresponds to "0"
+set op=%errorlevel%
+
+if %op%==1 goto op1
+if %op%==2 goto op2
+if %op%==3 goto op3
+if %op%==4 goto op4
+if %op%==5 goto op5
+if %op%==6 goto op6
+if %op%==7 goto op7
+if %op%==8 goto op8
+if %op%==9 goto op9
+if %op%==10 goto op0
 
 :op1
-echo Instalação do Office Business (O365BusinessRetail) + Project + Visio - US+BR+MX selecionado, aguarde.
-setup.exe /configure XMLFiles/InstallOfficeProjectVisio-Business.xml
-goto exit
+echo Installing Office Business + Project + Visio, please wait...
+setup.exe /configure "XMLFiles/InstallOfficeProjectVisio-Business.xml"
+goto end
 
 :op2
-echo Instalação do Office Business (O365BusinessRetail) - US+BR+MX selecionado, aguarde.
-setup.exe /configure XMLFiles/InstallOffice-Business-US.xml
-goto exit
+echo Installing Office Business (US+BR+MX), please wait...
+setup.exe /configure "XMLFiles/InstallOffice-Business-US.xml"
+goto end
 
 :op3
-echo Instalação do Office Business (O365BusinessRetail) - BR selecionado, aguarde.
-setup.exe /configure XMLFiles/InstallOffice-Business-BR.xml
-goto exit
+echo Installing Office Business (Brazil), please wait...
+setup.exe /configure "XMLFiles/InstallOffice-Business-BR.xml"
+goto end
 
 :op4
-echo Instalação do Office Enterprise (O365ProPlusRetail) + Project + Visio - US+BR+MX selecionado, aguarde.
-setup.exe /configure XMLFiles/InstallOfficeProjectVisio-Enterprise.xml
-goto exit
+echo Installing Office Enterprise + Project + Visio, please wait...
+setup.exe /configure "XMLFiles/InstallOfficeProjectVisio-Enterprise.xml"
+goto end
 
 :op5
-echo Instalação do Office Enterprise (O365ProPlusRetail) - US+BR+MX selecionado, aguarde.
-setup.exe /configure XMLFiles/InstallOffice-Enterprise-US.xml
-goto exit
+echo Installing Office Enterprise (US+BR+MX), please wait...
+setup.exe /configure "XMLFiles/InstallOffice-Enterprise-US.xml"
+goto end
 
 :op6
-echo Instalação do Office Enterprise (O365ProPlusRetail) - BR selecionado, aguarde.
-setup.exe /configure XMLFiles/InstallOffice-Enterprise-BR.xml
-goto exit
+echo Installing Office Enterprise (Brazil), please wait...
+setup.exe /configure "XMLFiles/InstallOffice-Enterprise-BR.xml"
+goto end
 
 :op7
-echo Instalação do Office Home (O365HomePremRetail) + Project + Visio - US+BR+MX selecionado, aguarde.
-setup.exe /configure XMLFiles/InstallOfficeProjectVisio-Home.xml
-goto exit
+echo Installing Office Home + Project + Visio, please wait...
+setup.exe /configure "XMLFiles/InstallOfficeProjectVisio-Home.xml"
+goto end
 
 :op8
-echo Instalação do Office Home (O365HomePremRetail) - US+BR+MX selecionado, aguarde.
-setup.exe /configure XMLFiles/InstallOffice-Home-US.xml
-goto exit
+echo Installing Office Home (US+BR+MX), please wait...
+setup.exe /configure "XMLFiles/InstallOffice-Home-US.xml"
+goto end
 
 :op9
-echo Instalação do Office Home (O365HomePremRetail) - BR selecionado, aguarde.
-setup.exe /configure XMLFiles/InstallOffice-Home-BR.xml
-goto exit
+echo Installing Office Home (Brazil), please wait...
+setup.exe /configure "XMLFiles/InstallOffice-Home-BR.xml"
+goto end
 
 :op0
-echo Desinstalação do Office selecionado, aguarde.
-setup.exe /configure XMLFiles/UninstallOffice.xml
-goto exit
+echo Uninstalling Office, please wait...
+setup.exe /configure "XMLFiles/UninstallOffice.xml"
+goto end
 
-:exit
-echo Processo finalizado.
+:end
+echo.
+echo ============================================================
+echo Process finished. Please check if the Office Setup started.
 pause
-@exit
+exit
\ No newline at end of file