Revert export-ignore

Rename
Merge branch 'dev'
16 changed files with 19255 additions and 17085 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,3 +1,4 @@
 # MAS export-ignore
 # LICENSE export-ignore
 # README.md export-ignore
 .gitattributes export-ignore
--- a/1
+++ b/1
@ -672,4 +672,3 @@ may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd
+++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
--- a/MAS/All-In-One-Version/MAS_AIO-CRC32_8C3AA7E0.cmd
+++ b/MAS/All-In-One-Version/MAS_AIO-CRC32_8C3AA7E0.cmd
--- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
--- a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
--- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
+++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
--- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
--- a/MAS/Separate-Files-Version/Change_Office_Edition.cmd
+++ b/MAS/Separate-Files-Version/Change_Office_Edition.cmd
--- a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
+++ b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
--- a/MAS/Separate-Files-Version/Check-Activation-Status-vbs.cmd
+++ b/MAS/Separate-Files-Version/Check-Activation-Status-vbs.cmd
@ -1,259 +0,0 @@
@setlocal DisableDelayedExpansion
@echo off
@cls
 ::
 ::  Check-Activation-Status
 ::  Written by @abbodi1406
 ::  forums.mydigitallife.net/posts/838808
 set _args=
 set _args=%*
 for %%A in (%_args%) do (
 if /i "%%A"=="-wow" set _rel1=1
 if /i "%%A"=="-arm" set _rel2=1
 )
 set "_cmdf=%~f0"
 if exist "%SystemRoot%\Sysnative\cmd.exe" if not defined _rel1 (
 setlocal EnableDelayedExpansion
 start %SystemRoot%\Sysnative\cmd.exe /c ""!_cmdf!" -wow"
 exit /b
 )
 if exist "%SystemRoot%\SysArm32\cmd.exe" if /i %PROCESSOR_ARCHITECTURE%==AMD64 if not defined _rel2 (
 setlocal EnableDelayedExpansion
 start %SystemRoot%\SysArm32\cmd.exe /c ""!_cmdf!" -arm"
 exit /b
 )
 color 07
 title Check Activation Status [vbs]
 set "SysPath=%SystemRoot%\System32"
 set "Path=%SystemRoot%\System32;%SystemRoot%\System32\Wbem;%SystemRoot%\System32\WindowsPowerShell\v1.0\"
 if exist "%SystemRoot%\Sysnative\reg.exe" (
 set "SysPath=%SystemRoot%\Sysnative"
 set "Path=%SystemRoot%\Sysnative;%SystemRoot%\Sysnative\Wbem;%SystemRoot%\Sysnative\WindowsPowerShell\v1.0\;%Path%"
 )
 ::  Check LF line ending
 pushd "%~dp0"
 >nul findstr /v "$" "%~nx0" && (
 echo:
 echo Error: Script either has LF line ending issue or an empty line at the end of the script is missing.
 echo:
 ping 127.0.0.1 -n 6 >nul
 popd
 exit /b
 )
 popd
 set ohook=
 for %%# in (15 16) do (
 for %%A in ("%ProgramFiles%" "%ProgramW6432%" "%ProgramFiles(x86)%") do (
 if exist "%%~A\Microsoft Office\Office%%#\sppc*dll" set ohook=1
 )
 )
 for %%# in (System SystemX86) do (
 for %%G in ("Office 15" "Office") do (
 for %%A in ("%ProgramFiles%" "%ProgramW6432%" "%ProgramFiles(x86)%") do (
 if exist "%%~A\Microsoft %%~G\root\vfs\%%#\sppc*dll" set ohook=1
 )
 )
 )
 set "_bit=64"
 set "_wow=1"
 if /i "%PROCESSOR_ARCHITECTURE%"=="x86" if "%PROCESSOR_ARCHITEW6432%"=="" set "_wow=0"&set "_bit=32"
 set "_utemp=%TEMP%"
 set "line2=************************************************************"
 set "line3=____________________________________________________________"
 set _sO16vbs=0
 set _sO15vbs=0
 if exist "%ProgramFiles%\Microsoft Office\Office15\ospp.vbs" (
  set _sO15vbs=1
 ) else if exist "%ProgramW6432%\Microsoft Office\Office15\ospp.vbs" (
  set _sO15vbs=1
 ) else if exist "%ProgramFiles(x86)%\Microsoft Office\Office15\ospp.vbs" (
  set _sO15vbs=1
 )
 setlocal EnableDelayedExpansion
 echo %line2%
 echo ***                   Windows Status                     ***
 echo %line2%
 pushd "!_utemp!"
 copy /y %SystemRoot%\System32\slmgr.vbs . >nul 2>&1
 net start sppsvc /y >nul 2>&1
 cscript //nologo slmgr.vbs /dli || (echo Error executing slmgr.vbs&del /f /q slmgr.vbs&popd&goto :casVend)
 cscript //nologo slmgr.vbs /xpr
 del /f /q slmgr.vbs >nul 2>&1
 popd
 echo %line3%
 if defined ohook (
 echo.
 echo.
 echo %line2%
 echo ***            Office Ohook Activation Status            ***
 echo %line2%
 echo.
 powershell "write-host -back 'Black' -fore 'Yellow' 'Ohook for permanent Office activation is installed.'; write-host -back 'Black' -fore 'Yellow' 'You can ignore below Office activation status.'"
 echo.
 )
 :casVo16
 set office=
 for /f "skip=2 tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Microsoft\Office\16.0\Common\InstallRoot /v Path" 2^>nul') do (set "office=%%b")
 if exist "!office!\ospp.vbs" (
 set _sO16vbs=1
 echo.
 echo %line2%
 if %_sO15vbs% EQU 0 (
 echo ***              Office 2016 %_bit%-bit Status               ***
 ) else (
 echo ***               Office 2013/2016 Status                ***
 )
 echo %line2%
 cscript //nologo "!office!\ospp.vbs" /dstatus
 )
 if %_wow%==0 goto :casVo13
 set office=
 for /f "skip=2 tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\Office\16.0\Common\InstallRoot /v Path" 2^>nul') do (set "office=%%b")
 if exist "!office!\ospp.vbs" (
 set _sO16vbs=1
 echo.
 echo %line2%
 if %_sO15vbs% EQU 0 (
 echo ***              Office 2016 32-bit Status               ***
 ) else (
 echo ***               Office 2013/2016 Status                ***
 )
 echo %line2%
 cscript //nologo "!office!\ospp.vbs" /dstatus
 )
 :casVo13
 if %_sO16vbs% EQU 1 goto :casVo10
 set office=
 for /f "skip=2 tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Microsoft\Office\15.0\Common\InstallRoot /v Path" 2^>nul') do (set "office=%%b")
 if exist "!office!\ospp.vbs" (
 echo.
 echo %line2%
 echo ***              Office 2013 %_bit%-bit Status               ***
 echo %line2%
 cscript //nologo "!office!\ospp.vbs" /dstatus
 )
 if %_wow%==0 goto :casVo10
 set office=
 for /f "skip=2 tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\Office\15.0\Common\InstallRoot /v Path" 2^>nul') do (set "office=%%b")
 if exist "!office!\ospp.vbs" (
 echo.
 echo %line2%
 echo ***              Office 2013 32-bit Status               ***
 echo %line2%
 cscript //nologo "!office!\ospp.vbs" /dstatus
 )
 :casVo10
 set office=
 for /f "skip=2 tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Microsoft\Office\14.0\Common\InstallRoot /v Path" 2^>nul') do (set "office=%%b")
 if exist "!office!\ospp.vbs" (
 echo.
 echo %line2%
 echo ***              Office 2010 %_bit%-bit Status               ***
 echo %line2%
 cscript //nologo "!office!\ospp.vbs" /dstatus
 )
 if %_wow%==0 goto :casVc16
 set office=
 for /f "skip=2 tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\Office\14.0\Common\InstallRoot /v Path" 2^>nul') do (set "office=%%b")
 if exist "!office!\ospp.vbs" (
 echo.
 echo %line2%
 echo ***              Office 2010 32-bit Status               ***
 echo %line2%
 cscript //nologo "!office!\ospp.vbs" /dstatus
 )
 :casVc16
 reg query HKLM\SOFTWARE\Microsoft\Office\ClickToRun /v InstallPath >nul 2>&1 || (
 reg query HKLM\SOFTWARE\WOW6432Node\Microsoft\Office\ClickToRun /v InstallPath >nul 2>&1 || goto :casVc13
 )
 set office=
 for /f "skip=2 tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Microsoft\Office\ClickToRun /v InstallPath" 2^>nul') do (set "office=%%b\Office16")
 if exist "!office!\ospp.vbs" (
 set _sO16vbs=1
 echo.
 echo %line2%
 if %_sO15vbs% EQU 0 (
 echo ***              Office 2016-2021 C2R Status             ***
 ) else (
 echo ***                Office 2013-2021 Status               ***
 )
 echo %line2%
 cscript //nologo "!office!\ospp.vbs" /dstatus
 )
 if %_wow%==0 goto :casVc13
 set office=
 for /f "skip=2 tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\WOW6432Node\Microsoft\Office\ClickToRun /v InstallPath" 2^>nul') do (set "office=%%b\Office16")
 if exist "!office!\ospp.vbs" (
 set _sO16vbs=1
 echo.
 echo %line2%
 if %_sO15vbs% EQU 0 (
 echo ***              Office 2016-2021 C2R Status             ***
 ) else (
 echo ***                Office 2013-2021 Status               ***
 )
 echo %line2%
 cscript //nologo "!office!\ospp.vbs" /dstatus
 )
 :casVc13
 if %_sO16vbs% EQU 1 goto :casVc10
 reg query HKLM\SOFTWARE\Microsoft\Office\15.0\ClickToRun /v InstallPath >nul 2>&1 || (
 reg query HKLM\SOFTWARE\WOW6432Node\Microsoft\Office\15.0\ClickToRun /v InstallPath >nul 2>&1 || goto :casVc10
 )
 set office=
 if exist "%ProgramFiles%\Microsoft Office\Office15\ospp.vbs" (
  set "office=%ProgramFiles%\Microsoft Office\Office15"
 ) else if exist "%ProgramW6432%\Microsoft Office\Office15\ospp.vbs" (
  set "office=%ProgramW6432%\Microsoft Office\Office15"
 ) else if exist "%ProgramFiles(x86)%\Microsoft Office\Office15\ospp.vbs" (
  set "office=%ProgramFiles(x86)%\Microsoft Office\Office15"
 )
 if exist "!office!\ospp.vbs" (
 echo.
 echo %line2%
 echo ***                Office 2013 C2R Status                ***
 echo %line2%
 cscript //nologo "!office!\ospp.vbs" /dstatus
 )
 :casVc10
 if %_wow%==0 reg query HKLM\SOFTWARE\Microsoft\Office\14.0\CVH /f Click2run /k >nul 2>&1 || goto :casVend
 if %_wow%==1 reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\Office\14.0\CVH /f Click2run /k >nul 2>&1 || goto :casVend
 set office=
 if exist "%ProgramFiles%\Microsoft Office\Office14\ospp.vbs" (
  set "office=%ProgramFiles%\Microsoft Office\Office14"
 ) else if exist "%ProgramW6432%\Microsoft Office\Office14\ospp.vbs" (
  set "office=%ProgramW6432%\Microsoft Office\Office14"
 ) else if exist "%ProgramFiles(x86)%\Microsoft Office\Office14\ospp.vbs" (
  set "office=%ProgramFiles(x86)%\Microsoft Office\Office14"
 )
 if exist "!office!\ospp.vbs" (
 echo.
 echo %line2%
 echo ***                Office 2010 C2R Status                ***
 echo %line2%
 cscript //nologo "!office!\ospp.vbs" /dstatus
 )
 :casVend
 echo.
 echo Press any key to exit.
 pause >nul
 exit /b
 :: Leave empty line below
--- a/MAS/Separate-Files-Version/Check-Activation-Status-wmi.cmd
+++ b/MAS/Separate-Files-Version/Check-Activation-Status-wmi.cmd
@ -1,564 +0,0 @@
@setlocal DisableDelayedExpansion
@echo off
 ::  Check-Activation-Status
 ::  Written by @abbodi1406
 ::  forums.mydigitallife.net/posts/838808
 set WMI_VBS=0
@cls
 set _args=
 set _args=%*
 for %%A in (%_args%) do (
 if /i "%%A"=="-wow" set _rel1=1
 if /i "%%A"=="-arm" set _rel2=1
 )
 set "_cmdf=%~f0"
 if exist "%SystemRoot%\Sysnative\cmd.exe" if not defined _rel1 (
 setlocal EnableDelayedExpansion
 start %SystemRoot%\Sysnative\cmd.exe /c ""!_cmdf!" -wow"
 exit /b
 )
 if exist "%SystemRoot%\SysArm32\cmd.exe" if /i %PROCESSOR_ARCHITECTURE%==AMD64 if not defined _rel2 (
 setlocal EnableDelayedExpansion
 start %SystemRoot%\SysArm32\cmd.exe /c ""!_cmdf!" -arm"
 exit /b
 )
 color 07
 title Check Activation Status [wmi]
 set wspp=SoftwareLicensingProduct
 set wsps=SoftwareLicensingService
 set ospp=OfficeSoftwareProtectionProduct
 set osps=OfficeSoftwareProtectionService
 set winApp=55c92734-d682-4d71-983e-d6ec3f16059f
 set o14App=59a52881-a989-479d-af46-f275c6370663
 set o15App=0ff1ce15-a989-479d-af46-f275c6370663
 for %%# in (spp_get,ospp_get,cW1nd0ws,sppw,c0ff1ce15,sppo,osppsvc,ospp14,ospp15) do set "%%#="
 for /f "tokens=6 delims=[]. " %%# in ('ver') do set winbuild=%%#
 set "spp_get=Description, DiscoveredKeyManagementServiceMachineName, DiscoveredKeyManagementServiceMachinePort, EvaluationEndDate, GracePeriodRemaining, ID, KeyManagementServiceMachine, KeyManagementServicePort, KeyManagementServiceProductKeyID, LicenseStatus, LicenseStatusReason, Name, PartialProductKey, ProductKeyID, VLActivationInterval, VLRenewalInterval"
 set "ospp_get=%spp_get%"
 if %winbuild% GEQ 9200 set "spp_get=%spp_get%, KeyManagementServiceLookupDomain, VLActivationTypeEnabled"
 if %winbuild% GEQ 9600 set "spp_get=%spp_get%, DiscoveredKeyManagementServiceMachineIpAddress, ProductKeyChannel"
 set "_work=%~dp0"
 set "_batf=%~f0"
 set "_batp=%_batf:'=''%"
 set "_Local=%LocalAppData%"
 set _Identity=0
 setlocal EnableDelayedExpansion
 dir /b /s /a:-d "!_Local!\Microsoft\Office\Licenses\*1*" 1>nul 2>nul && set _Identity=1
 dir /b /s /a:-d "!ProgramData!\Microsoft\Office\Licenses\*1*" 1>nul 2>nul && set _Identity=1
 pushd "!_work!"
 setlocal DisableDelayedExpansion
 if %winbuild% LSS 9200 if not exist "%SystemRoot%\servicing\Packages\Microsoft-Windows-PowerShell-WTR-Package~*.mum" set _Identity=0
 set "SysPath=%SystemRoot%\System32"
 set "Path=%SystemRoot%\System32;%SystemRoot%\System32\Wbem;%SystemRoot%\System32\WindowsPowerShell\v1.0\"
 if exist "%SystemRoot%\Sysnative\reg.exe" (
 set "SysPath=%SystemRoot%\Sysnative"
 set "Path=%SystemRoot%\Sysnative;%SystemRoot%\Sysnative\Wbem;%SystemRoot%\Sysnative\WindowsPowerShell\v1.0\;%Path%"
 )
 ::  Check LF line ending
 pushd "%~dp0"
 >nul findstr /v "$" "%~nx0" && (
 echo:
 echo Error: Script either has LF line ending issue or an empty line at the end of the script is missing.
 echo:
 ping 127.0.0.1 -n 6 >nul
 popd
 exit /b
 )
 popd
 set ohook=
 for %%# in (15 16) do (
 for %%A in ("%ProgramFiles%" "%ProgramW6432%" "%ProgramFiles(x86)%") do (
 if exist "%%~A\Microsoft Office\Office%%#\sppc*dll" set ohook=1
 )
 )
 for %%# in (System SystemX86) do (
 for %%G in ("Office 15" "Office") do (
 for %%A in ("%ProgramFiles%" "%ProgramW6432%" "%ProgramFiles(x86)%") do (
 if exist "%%~A\Microsoft %%~G\root\vfs\%%#\sppc*dll" set ohook=1
 )
 )
 )
 set _cwmi=0
 for %%# in (wmic.exe) do @if not "%%~$PATH:#"=="" (
 wmic path Win32_ComputerSystem get CreationClassName /value 2>nul | find /i "ComputerSystem" 1>nul && set _cwmi=1
 )
 if %_cwmi% EQU 0 (
 echo:
 echo Error: WMI is not responding in the system.
 echo:
 echo In MAS, Goto Troubleshoot and run Fix WMI option.
 echo:
 echo Press any key to exit...
 pause >nul
 exit /b
 )
 set "line2=************************************************************"
 set "line3=____________________________________________________________"
 set "_psc=powershell"
 set _prsh=1
 for %%# in (powershell.exe) do @if "%%~$PATH:#"=="" set _prsh=0
 set "_csg=cscript.exe //NoLogo //Job:WmiMulti "%~nx0?.wsf""
 set "_csq=cscript.exe //NoLogo //Job:WmiQuery "%~nx0?.wsf""
 set "_csx=cscript.exe //NoLogo //Job:XPDT "%~nx0?.wsf""
 if %_cwmi% EQU 0 set WMI_VBS=1
 if %WMI_VBS% EQU 0 (
 set "_zz1=wmic path"
 set "_zz2=where"
 set "_zz3=get"
 set "_zz4=/value"
 set "_zz5=("
 set "_zz6=)"
 set "_zz7="wmic path"
 set "_zz8=/value""
 ) else (
 set "_zz1=%_csq%"
 set "_zz2="
 set "_zz3="
 set "_zz4="
 set "_zz5=""
 set "_zz6=""
 set "_zz7=%_csq%"
 set "_zz8="
 )
 set _WSH=0
 set OsppHook=1
 sc query osppsvc >nul 2>&1
 if %errorlevel% EQU 1060 set OsppHook=0
 net start sppsvc /y >nul 2>&1
 call :casWpkey %wspp% %winApp% cW1nd0ws sppw
 if %winbuild% GEQ 9200 call :casWpkey %wspp% %o15App% c0ff1ce15 sppo
 if %OsppHook% NEQ 0 (
 net start osppsvc /y >nul 2>&1
 call :casWpkey %ospp% %o14App% osppsvc ospp14
 if %winbuild% LSS 9200 call :casWpkey %ospp% %o15App% osppsvc ospp15
 )
 echo %line2%
 echo ***                   Windows Status                     ***
 echo %line2%
 if not defined cW1nd0ws (
 echo.
 echo Error: product key not found.
 goto :casWcon
 )
 set winID=1
 set "_qr=%_zz7% %wspp% %_zz2% %_zz5%ApplicationID='%winApp%' and PartialProductKey is not null%_zz6% %_zz3% ID %_zz8%"
 for /f "tokens=2 delims==" %%# in ('%_qr%') do (
  set "chkID=%%#"
  call :casWdet "%wspp%" "%wsps%" "%spp_get%"
  call :casWout
  echo %line3%
  echo.
 )
 if defined ohook (
 echo.
 echo.
 echo %line2%
 echo ***            Office Ohook Activation Status            ***
 echo %line2%
 echo.
 powershell "write-host -back 'Black' -fore 'Yellow' 'Ohook for permanent Office activation is installed.'; write-host -back 'Black' -fore 'Yellow' 'You can ignore below Office activation status.'"
 echo.
 )
 :casWcon
 set winID=0
 set verbose=1
 if not defined c0ff1ce15 (
 if defined osppsvc goto :casWospp
 goto :casWend
 )
 echo %line2%
 echo ***                   Office Status                      ***
 echo %line2%
 set "_qr=%_zz7% %wspp% %_zz2% %_zz5%ApplicationID='%o15App%' and PartialProductKey is not null%_zz6% %_zz3% ID %_zz8%"
 for /f "tokens=2 delims==" %%# in ('%_qr%') do (
  set "chkID=%%#"
  call :casWdet "%wspp%" "%wsps%" "%spp_get%"
  call :casWout
  echo %line3%
  echo.
 )
 set verbose=0
 if defined osppsvc goto :casWospp
 goto :casWend
 :casWospp
 if %verbose% EQU 1 (
 echo %line2%
 echo ***                   Office Status                      ***
 echo %line2%
 )
 set "_qr=%_zz7% %ospp% %_zz2% %_zz5%ApplicationID='%o15App%' and PartialProductKey is not null%_zz6% %_zz3% ID %_zz8%"
 if defined ospp15 for /f "tokens=2 delims==" %%# in ('%_qr%') do (
  set "chkID=%%#"
  call :casWdet "%ospp%" "%osps%" "%ospp_get%"
  call :casWout
  echo %line3%
  echo.
 )
 set "_qr=%_zz7% %ospp% %_zz2% %_zz5%ApplicationID='%o14App%' and PartialProductKey is not null%_zz6% %_zz3% ID %_zz8%"
 if defined ospp14 for /f "tokens=2 delims==" %%# in ('%_qr%') do (
  set "chkID=%%#"
  call :casWdet "%ospp%" "%osps%" "%ospp_get%"
  call :casWout
  echo %line3%
  echo.
 )
 goto :casWend
 :casWpkey
 set "_qr=%_zz1% %1 %_zz2% %_zz5%ApplicationID='%2' and PartialProductKey is not null%_zz6% %_zz3% ID %_zz4%"
 %_qr% 2>nul | findstr /i ID 1>nul && (set %3=1&set %4=1)
 exit /b
 :casWdet
 for %%# in (%~3) do set "%%#="
 if /i %~1==%ospp% for %%# in (DiscoveredKeyManagementServiceMachineIpAddress, KeyManagementServiceLookupDomain, ProductKeyChannel, VLActivationTypeEnabled) do set "%%#="
 set "cKmsClient="
 set "cTblClient="
 set "cAvmClient="
 set "ExpireMsg="
 set "_xpr="
 set "_qr="wmic path %~1 where ID='%chkID%' get %~3 /value" ^| findstr ^="
 if %WMI_VBS% NEQ 0 set "_qr=%_csg% %~1 "ID='%chkID%'" "%~3""
 for /f "tokens=* delims=" %%# in ('%_qr%') do set "%%#"
 set /a _gpr=(GracePeriodRemaining+1440-1)/1440
 echo %Description%| findstr /i VOLUME_KMSCLIENT 1>nul && (set cKmsClient=1&set _mTag=Volume)
 echo %Description%| findstr /i TIMEBASED_ 1>nul && (set cTblClient=1&set _mTag=Timebased)
 echo %Description%| findstr /i VIRTUAL_MACHINE_ACTIVATION 1>nul && (set cAvmClient=1&set _mTag=Automatic VM)
 cmd /c exit /b %LicenseStatusReason%
 set "LicenseReason=%=ExitCode%"
 set "LicenseMsg=Time remaining: %GracePeriodRemaining% minute(s) (%_gpr% day(s))"
 if %_gpr% GEQ 1 if %_WSH% EQU 1 (
 for /f "tokens=* delims=" %%# in ('%_csx% %GracePeriodRemaining%') do set "_xpr=%%#"
 )
 if %_gpr% GEQ 1 if %_prsh% EQU 1 if not defined _xpr (
 for /f "tokens=* delims=" %%# in ('%_psc% "$([DateTime]::Now.addMinutes(%GracePeriodRemaining%)).ToString('yyyy-MM-dd HH:mm:ss')" 2^>nul') do set "_xpr=%%#"
 title Check Activation Status [wmi]
 )
 if %LicenseStatus% EQU 0 (
 set "License=Unlicensed"
 set "LicenseMsg="
 )
 if %LicenseStatus% EQU 1 (
 set "License=Licensed"
 set "LicenseMsg="
 if %GracePeriodRemaining% EQU 0 (
  if %winID% EQU 1 (set "ExpireMsg=The machine is permanently activated.") else (set "ExpireMsg=The product is permanently activated.")
  ) else (
  set "LicenseMsg=%_mTag% activation expiration: %GracePeriodRemaining% minute(s) (%_gpr% day(s))"
  if defined _xpr set "ExpireMsg=%_mTag% activation will expire %_xpr%"
  )
 )
 if %LicenseStatus% EQU 2 (
 set "License=Initial grace period"
 if defined _xpr set "ExpireMsg=Initial grace period ends %_xpr%"
 )
 if %LicenseStatus% EQU 3 (
 set "License=Additional grace period (KMS license expired or hardware out of tolerance)"
 if defined _xpr set "ExpireMsg=Additional grace period ends %_xpr%"
 )
 if %LicenseStatus% EQU 4 (
 set "License=Non-genuine grace period."
 if defined _xpr set "ExpireMsg=Non-genuine grace period ends %_xpr%"
 )
 if %LicenseStatus% EQU 6 (
 set "License=Extended grace period"
 if defined _xpr set "ExpireMsg=Extended grace period ends %_xpr%"
 )
 if %LicenseStatus% EQU 5 (
 set "License=Notification"
  if "%LicenseReason%"=="C004F200" (set "LicenseMsg=Notification Reason: 0xC004F200 (non-genuine)."
  ) else if "%LicenseReason%"=="C004F009" (set "LicenseMsg=Notification Reason: 0xC004F009 (grace time expired)."
  ) else (set "LicenseMsg=Notification Reason: 0x%LicenseReason%"
  )
 )
 if %LicenseStatus% GTR 6 (
 set "License=Unknown"
 set "LicenseMsg="
 )
 if not defined cKmsClient exit /b
 if %KeyManagementServicePort%==0 set KeyManagementServicePort=1688
 set "KmsReg=Registered KMS machine name: %KeyManagementServiceMachine%:%KeyManagementServicePort%"
 if "%KeyManagementServiceMachine%"=="" set "KmsReg=Registered KMS machine name: KMS name not available"
 if %DiscoveredKeyManagementServiceMachinePort%==0 set DiscoveredKeyManagementServiceMachinePort=1688
 set "KmsDns=KMS machine name from DNS: %DiscoveredKeyManagementServiceMachineName%:%DiscoveredKeyManagementServiceMachinePort%"
 if "%DiscoveredKeyManagementServiceMachineName%"=="" set "KmsDns=DNS auto-discovery: KMS name not available"
 set "_qr="wmic path %~2 get ClientMachineID, KeyManagementServiceHostCaching /value" ^| findstr ^="
 if %WMI_VBS% NEQ 0 set "_qr=%_csg% %~2 "ClientMachineID, KeyManagementServiceHostCaching""
 for /f "tokens=* delims=" %%# in ('%_qr%') do set "%%#"
 if /i %KeyManagementServiceHostCaching%==True (set KeyManagementServiceHostCaching=Enabled) else (set KeyManagementServiceHostCaching=Disabled)
 if %winbuild% LSS 9200 exit /b
 if /i %~1==%ospp% exit /b
 if "%KeyManagementServiceLookupDomain%"=="" set "KeyManagementServiceLookupDomain="
 if %VLActivationTypeEnabled% EQU 3 (
 set VLActivationType=Token
 ) else if %VLActivationTypeEnabled% EQU 2 (
 set VLActivationType=KMS
 ) else if %VLActivationTypeEnabled% EQU 1 (
 set VLActivationType=AD
 ) else (
 set VLActivationType=All
 )
 if %winbuild% LSS 9600 exit /b
 if "%DiscoveredKeyManagementServiceMachineIpAddress%"=="" set "DiscoveredKeyManagementServiceMachineIpAddress=not available"
 exit /b
 :casWout
 echo.
 echo Name: %Name%
 echo Description: %Description%
 echo Activation ID: %ID%
 echo Extended PID: %ProductKeyID%
 if defined ProductKeyChannel echo Product Key Channel: %ProductKeyChannel%
 echo Partial Product Key: %PartialProductKey%
 echo License Status: %License%
 if defined LicenseMsg echo %LicenseMsg%
 if not %LicenseStatus%==0 if not %EvaluationEndDate:~0,8%==16010101 echo Evaluation End Date: %EvaluationEndDate:~0,4%-%EvaluationEndDate:~4,2%-%EvaluationEndDate:~6,2% %EvaluationEndDate:~8,2%:%EvaluationEndDate:~10,2% UTC
 if not defined cKmsClient (
 if defined ExpireMsg echo.&echo.    %ExpireMsg%
 exit /b
 )
 if defined VLActivationTypeEnabled echo Configured Activation Type: %VLActivationType%
 echo.
 if not %LicenseStatus%==1 (
 echo Please activate the product in order to update KMS client information values.
 exit /b
 )
 echo Most recent activation information:
 echo Key Management Service client information
 echo.    Client Machine ID (CMID): %ClientMachineID%
 echo.    %KmsDns%
 echo.    %KmsReg%
 if defined DiscoveredKeyManagementServiceMachineIpAddress echo.    KMS machine IP address: %DiscoveredKeyManagementServiceMachineIpAddress%
 echo.    KMS machine extended PID: %KeyManagementServiceProductKeyID%
 echo.    Activation interval: %VLActivationInterval% minutes
 echo.    Renewal interval: %VLRenewalInterval% minutes
 echo.    K.M.S host caching: %KeyManagementServiceHostCaching%
 if defined KeyManagementServiceLookupDomain echo.    KMS SRV record lookup domain: %KeyManagementServiceLookupDomain%
 if defined ExpireMsg echo.&echo.    %ExpireMsg%
 exit /b
 :casWend
 if %_Identity% EQU 1 if %_prsh% EQU 1 (
 echo %line2%
 echo ***                  Office vNext Status                 ***
 echo %line2%
 setlocal EnableDelayedExpansion
 %_psc% "$f=[IO.File]::ReadAllText('!_batp!') -split ':vNextDiag\:.*';iex ($f[1])"
 title Check Activation Status [wmi]
 echo %line3%
 echo.
 )
 echo.
 echo Press any key to exit.
 pause >nul
 exit /b
 :vNextDiag:
 function PrintModePerPridFromRegistry
 {
 	$vNextRegkey = "HKCU:\SOFTWARE\Microsoft\Office\16.0\Common\Licensing\LicensingNext"
 	$vNextPrids = Get-Item -Path $vNextRegkey -ErrorAction Ignore | Select-Object -ExpandProperty 'property' | Where-Object -FilterScript {$_.ToLower() -like "*retail" -or $_.ToLower() -like "*volume"}
 	If ($vNextPrids -Eq $null)
 	{
 		Write-Host "No registry keys found."
 		Return
 	}
 	$vNextPrids | ForEach `
 	{
 		$mode = (Get-ItemProperty -Path $vNextRegkey -Name $_).$_
 		Switch ($mode)
 		{
 			2 { $mode = "vNext"; Break }
 			3 { $mode = "Device"; Break }
 			Default { $mode = "Legacy"; Break }
 		}
 		Write-Host $_ = $mode
 	}
 }
 function PrintSharedComputerLicensing
 {
 	$scaRegKey = "HKLM:\SOFTWARE\Microsoft\Office\ClickToRun\Configuration"
 	$scaValue = Get-ItemProperty -Path $scaRegKey -ErrorAction Ignore | Select-Object -ExpandProperty "SharedComputerLicensing" -ErrorAction Ignore
 	$scaRegKey2 = "HKLM:\SOFTWARE\Microsoft\Office\16.0\Common\Licensing"
 	$scaValue2 = Get-ItemProperty -Path $scaRegKey2 -ErrorAction Ignore | Select-Object -ExpandProperty "SharedComputerLicensing" -ErrorAction Ignore
 	$scaPolicyKey = "HKLM:\SOFTWARE\Policies\Microsoft\Office\16.0\Common\Licensing"
 	$scaPolicyValue = Get-ItemProperty -Path $scaPolicyKey -ErrorAction Ignore | Select-Object -ExpandProperty "SharedComputerLicensing" -ErrorAction Ignore
 	If ($scaValue -Eq $null -And $scaValue2 -Eq $null -And $scaPolicyValue -Eq $null)
 	{
 		Write-Host "No registry keys found."
 		Return
 	}
 	$scaModeValue = $scaValue -Or $scaValue2 -Or $scaPolicyValue
 	If ($scaModeValue -Eq 0)
 	{
 		$scaMode = "Disabled"
 	}
 	If ($scaModeValue -Eq 1)
 	{
 		$scaMode = "Enabled"
 	}
 	Write-Host "SharedComputerLicensing" = $scaMode
 	Write-Host
 	$tokenFiles = $null
 	$tokenPath = "${env:LOCALAPPDATA}\Microsoft\Office\16.0\Licensing"
 	If (Test-Path $tokenPath)
 	{
 		$tokenFiles = Get-ChildItem -Path $tokenPath -Recurse -File -Filter "*authString*"
 	}
 	If ($tokenFiles.length -Eq 0)
 	{
 		Write-Host "No tokens found."
 		Return
 	}
 	$tokenFiles | ForEach `
 	{
 		$tokenParts = (Get-Content -Encoding Unicode -Path $_.FullName).Split('_')
 		$output = [PSCustomObject] `
 			@{
 				ACID = $tokenParts[0];
 				User = $tokenParts[3]
 				NotBefore = $tokenParts[4];
 				NotAfter = $tokenParts[5];
 			} | ConvertTo-Json
 		Write-Host $output
 	}
 }
 function PrintLicensesInformation
 {
 	Param(
 		[ValidateSet("NUL", "Device")]
 		[String]$mode
 	)
 	If ($mode -Eq "NUL")
 	{
 		$licensePath = "${env:LOCALAPPDATA}\Microsoft\Office\Licenses"
 	}
 	ElseIf ($mode -Eq "Device")
 	{
 		$licensePath = "${env:PROGRAMDATA}\Microsoft\Office\Licenses"
 	}
 	$licenseFiles = $null
 	If (Test-Path $licensePath)
 	{
 		$licenseFiles = Get-ChildItem -Path $licensePath -Recurse -File
 	}
 	If ($licenseFiles.length -Eq 0)
 	{
 		Write-Host "No licenses found."
 		Return
 	}
 	$licenseFiles | ForEach `
 	{
 		$license = (Get-Content -Encoding Unicode $_.FullName | ConvertFrom-Json).License
 		$decodedLicense = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($license)) | ConvertFrom-Json
 		$licenseType = $decodedLicense.LicenseType
 		If ($null -Ne $decodedLicense.ExpiresOn)
 		{
 			$expiry = [DateTime]::Parse($decodedLicense.ExpiresOn, $null, 48)
 		}
 		Else
 		{
 			$expiry = New-Object DateTime
 		}
 		$licenseState = $null
 		If ((Get-Date) -Gt (Get-Date $decodedLicense.MetaData.NotAfter))
 		{
 			$licenseState = "RFM"
 		}
 		ElseIf ((Get-Date) -Lt (Get-Date $expiry))
 		{
 			$licenseState = "Licensed"
 		}
 		Else
 		{
 			$licenseState = "Grace"
 		}
 		if ($mode -Eq "NUL")
 		{
 			$output = [PSCustomObject] `
 			@{
 				Version = $_.Directory.Name
 				Type = "User|${licenseType}";
 				Product = $decodedLicense.ProductReleaseId;
 				Acid = $decodedLicense.Acid;
 				LicenseState = $licenseState;
 				EntitlementStatus = $decodedLicense.Status;
 				EntitlementExpiration = $decodedLicense.ExpiresOn;
 				ReasonCode = $decodedLicense.ReasonCode;
 				NotBefore = $decodedLicense.Metadata.NotBefore;
 				NotAfter = $decodedLicense.Metadata.NotAfter;
 				NextRenewal = $decodedLicense.Metadata.RenewAfter;
 				TenantId = $decodedLicense.Metadata.TenantId;
 			} | ConvertTo-Json
 		}
 		ElseIf ($mode -Eq "Device")
 		{
 			$output = [PSCustomObject] `
 			@{
 				Version = $_.Directory.Name
 				Type = "Device|${licenseType}";
 				Product = $decodedLicense.ProductReleaseId;
 				Acid = $decodedLicense.Acid;
 				DeviceId = $decodedLicense.Metadata.DeviceId;
 				LicenseState = $licenseState;
 				EntitlementStatus = $decodedLicense.Status;
 				EntitlementExpiration = $decodedLicense.ExpiresOn;
 				ReasonCode = $decodedLicense.ReasonCode;
 				NotBefore = $decodedLicense.Metadata.NotBefore;
 				NotAfter = $decodedLicense.Metadata.NotAfter;
 				NextRenewal = $decodedLicense.Metadata.RenewAfter;
 				TenantId = $decodedLicense.Metadata.TenantId;
 			} | ConvertTo-Json
 		}
 		Write-Output $output
 	}
 }
 	Write-Host
 	Write-Host "========== Mode per ProductReleaseId =========="
 	Write-Host
 PrintModePerPridFromRegistry
 	Write-Host
 	Write-Host "========== Shared Computer Licensing =========="
 	Write-Host
 PrintSharedComputerLicensing
 	Write-Host
 	Write-Host "========== vNext licenses =========="
 	Write-Host
 PrintLicensesInformation -Mode "NUL"
 	Write-Host
 	Write-Host "========== Device licenses =========="
 	Write-Host
 PrintLicensesInformation -Mode "Device"
 :vNextDiag:
 ::===================================================
 :: Leave empty line below
--- a/MAS/Separate-Files-Version/Check_Activation_Status.cmd
+++ b/MAS/Separate-Files-Version/Check_Activation_Status.cmd
--- a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
+++ b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
@ -1,15 +1,12 @@
-@set masver=2.6
+@set masver=2.7
@setlocal DisableDelayedExpansion
@echo off
 ::============================================================================
 ::
 ::   This script is a part of 'Microsoft-Activation-Scripts' (MAS) project.
 ::
 ::   Homepage: mass grave[.]dev
-::      Email: windowsaddict@protonmail.com
+::      Email: mas.help@outlook.com
 ::
 ::============================================================================
@ -17,26 +14,32 @@
 ::========================================================================================================================================
-::  Set Path variable, it helps if it is misconfigured in the system
+::  Set environment variables, it helps if they are misconfigured in the system
 setlocal EnableExtensions
 setlocal DisableDelayedExpansion
 set "PathExt=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC"
-set "PATH=%SystemRoot%\System32;%SystemRoot%\System32\wbem;%SystemRoot%\System32\WindowsPowerShell\v1.0\"
+set "SysPath=%SystemRoot%\System32"
 set "Path=%SystemRoot%\System32;%SystemRoot%;%SystemRoot%\System32\Wbem;%SystemRoot%\System32\WindowsPowerShell\v1.0\"
 if exist "%SystemRoot%\Sysnative\reg.exe" (
-set "PATH=%SystemRoot%\Sysnative;%SystemRoot%\Sysnative\wbem;%SystemRoot%\Sysnative\WindowsPowerShell\v1.0\;%PATH%"
+set "SysPath=%SystemRoot%\Sysnative"
 set "Path=%SystemRoot%\Sysnative;%SystemRoot%;%SystemRoot%\Sysnative\Wbem;%SystemRoot%\Sysnative\WindowsPowerShell\v1.0\;%Path%"
 )
-:: Re-launch the script with x64 process if it was initiated by x86 process on x64 bit Windows
+set "ComSpec=%SysPath%\cmd.exe"
-:: or with ARM64 process if it was initiated by x86/ARM32 process on ARM64 Windows
+set "PSModulePath=%ProgramFiles%\WindowsPowerShell\Modules;%SysPath%\WindowsPowerShell\v1.0\Modules"
 set "_cmdf=%~f0"
 for %%# in (%*) do (
 if /i "%%#"=="r1" set r1=1
 if /i "%%#"=="r2" set r2=1
 if /i "%%#"=="-qedit" (
 reg add HKCU\Console /v QuickEdit /t REG_DWORD /d "1" /f %nul1%
 rem check the code below admin elevation to understand why it's here
 )
 )
 :: Re-launch the script with x64 process if it was initiated by x86 process on x64 bit Windows
 :: or with ARM64 process if it was initiated by x86/ARM32 process on ARM64 Windows
 if exist %SystemRoot%\Sysnative\cmd.exe if not defined r1 (
 setlocal EnableDelayedExpansion
 start %SystemRoot%\Sysnative\cmd.exe /c ""!_cmdf!" %* r1"
@ -64,10 +67,10 @@ echo:
 echo Null service is not running, script may crash...
 echo:
 echo:
-echo Help - %mas%troubleshoot.html
+echo Help - %mas%troubleshoot
 echo:
 echo:
-ping 127.0.0.1 -n 10
+ping 127.0.0.1 -n 20
 )
 cls
@ -76,9 +79,13 @@ cls
 pushd "%~dp0"
 >nul findstr /v "$" "%~nx0" && (
 echo:
-echo Error: Script either has LF line ending issue or an empty line at the end of the script is missing.
+echo Error - Script either has LF line ending issue or an empty line at the end of the script is missing.
 echo:
 echo:
 echo Help - %mas%troubleshoot
 echo:
-ping 127.0.0.1 -n 6 >nul
+echo:
 ping 127.0.0.1 -n 20 >nul
 popd
 exit /b
 )
@ -88,10 +95,11 @@ popd
 cls
 color 07
-title Extract $OEM$ Folder %masver%
+title  Extract $OEM$ Folder %masver%
 set _args=
 set _elev=
 set _unattended=0
 set _args=%*
 if defined _args set _args=%_args:"=%
@ -106,54 +114,20 @@ set "nul2=2>nul"
 set "nul6=2^>nul"
 set "nul=>nul 2>&1"
-set psc=powershell.exe
+call :dk_setvar
 set winbuild=1
 for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G
 set _NCS=1
 if %winbuild% LSS 10586 set _NCS=0
 if %winbuild% GEQ 10586 reg query "HKCU\Console" /v ForceV2 %nul2% | find /i "0x0" %nul1% && (set _NCS=0)
 if %_NCS% EQU 1 (
 for /F %%a in ('echo prompt $E ^| cmd') do set "esc=%%a"
 set     "Red="41;97m""
 set    "Gray="100;97m""
 set   "Green="42;97m""
 set    "Blue="44;97m""
 set  "_White="40;37m""
 set  "_Green="40;92m""
 set "_Yellow="40;93m""
 ) else (
 set     "Red="Red" "white""
 set    "Gray="Darkgray" "white""
 set   "Green="DarkGreen" "white""
 set    "Blue="Blue" "white""
 set  "_White="Black" "Gray""
 set  "_Green="Black" "Green""
 set "_Yellow="Black" "Yellow""
 )
 set "nceline=echo: &echo ==== ERROR ==== &echo:"
 set "eline=echo: &call :ex_color %Red% "==== ERROR ====" &echo:"
 ::========================================================================================================================================
 if %winbuild% LSS 7600 (
 %nceline%
 echo Unsupported OS version detected [%winbuild%].
-echo Project is supported only for Windows 7/8/8.1/10/11 and their Server equivalent.
+echo Project is supported only for Windows 7/8/8.1/10/11 and their Server equivalents.
 goto done2
 )
 for %%# in (powershell.exe) do @if "%%~$PATH:#"=="" (
 %nceline%
 echo Unable to find powershell.exe in the system.
 goto done2
 )
 ::========================================================================================================================================
-::  Fix special characters limitation in path name
+::  Fix special character limitations in path name
 set "_work=%~dp0"
 if "%_work:~-1%"=="\" set "_work=%_work:~0,-1%"
@ -162,6 +136,8 @@ set "_batf=%~f0"
 set "_batp=%_batf:'=''%"
 set _PSarg="""%~f0""" -el %_args%
 set _PSarg=%_PSarg:'=''%
 set "_ttemp=%userprofile%\AppData\Local\Temp"
 setlocal EnableDelayedExpansion
@ -171,8 +147,8 @@ setlocal EnableDelayedExpansion
 echo "!_batf!" | find /i "!_ttemp!" %nul1% && (
 if /i not "!_work!"=="!_ttemp!" (
 %eline%
-echo Script is launched from the temp folder,
+echo The script was launched from the temp folder.
-echo Most likely you are running the script directly from the archive file.
+echo You are most likely running the script directly from the archive file.
 echo:
 echo Extract the archive file and launch the script from the extracted folder.
 goto done2
@ -181,30 +157,83 @@ goto done2
 ::========================================================================================================================================
 ::  Check PowerShell
 REM :PowerShellTest: $ExecutionContext.SessionState.LanguageMode :PowerShellTest:
 cmd /c "%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':PowerShellTest:\s*';iex ($f[1])"" | find /i "FullLanguage" %nul1% || (
 %eline%
 cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode""
 echo:
 cmd /c "%psc% "$ExecutionContext.SessionState.LanguageMode"" | find /i "FullLanguage" %nul1% && (
 echo Failed to run Powershell command but Powershell is working.
 call :dk_color %Blue% "Check if your antivirus is blocking the script."
 echo:
 set fixes=%fixes% %mas%troubleshoot
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
 ) || (
 echo PowerShell is not working. Aborting...
 echo If you have applied restrictions on Powershell then undo those changes.
 echo:
 set fixes=%fixes% %mas%fix_powershell
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%fix_powershell"
 )
 goto done2
 )
 ::========================================================================================================================================
 ::  Elevate script as admin and pass arguments and preventing loop
 %nul1% fltmc || (
-if not defined _elev %psc% "start cmd.exe -arg '/c \"!_PSarg:'=''!\"' -verb runas" && exit /b
+if not defined _elev %psc% "start cmd.exe -arg '/c \"!_PSarg!\"' -verb runas" && exit /b
 %eline%
 echo This script needs admin rights.
-echo To do so, right click on this script and select 'Run as administrator'.
+echo Right click on this script and select 'Run as administrator'.
 goto done2
 )
 ::========================================================================================================================================
-::  This code disables QuickEdit for this cmd.exe session only without making permanent changes to the registry
+::  Disable QuickEdit and launch from conhost.exe to avoid Terminal app
 ::  It is added because clicking on the script window pauses the operation and leads to the confusion that script stopped due to an error
-for %%# in (%_args%) do (if /i "%%#"=="-qedit" set quedit=1)
+if %winbuild% GEQ 17763 (
 set terminal=1
 ) else (
 set terminal=
 )
-reg query HKCU\Console /v QuickEdit %nul2% | find /i "0x0" %nul1% || if not defined quedit (
+::  Check if script is running in Terminal app
-reg add HKCU\Console /v QuickEdit /t REG_DWORD /d "0" /f %nul1%
+
-start cmd.exe /c ""!_batf!" %_args% -qedit"
+set r1=$TB = [AppDomain]::CurrentDomain.DefineDynamicAssembly(4, 1).DefineDynamicModule(2, $False).DefineType(0);
-rem quickedit reset code is added at the starting of the script instead of here because it takes time to reflect in some cases
+set r2=%r1% [void]$TB.DefinePInvokeMethod('GetConsoleWindow', 'kernel32.dll', 22, 1, [IntPtr], @(), 1, 3).SetImplementationFlags(128);
-exit /b
+set r3=%r2% [void]$TB.DefinePInvokeMethod('SendMessageW', 'user32.dll', 22, 1, [IntPtr], @([IntPtr], [UInt32], [IntPtr], [IntPtr]), 1, 3).SetImplementationFlags(128);
 set d1=%r3% $hIcon = $TB.CreateType(); $hWnd = $hIcon::GetConsoleWindow();
 set d2=%d1% echo $($hIcon::SendMessageW($hWnd, 127, 0, 0) -ne [IntPtr]::Zero);
 if defined terminal (
 %psc% "%d2%" %nul2% | find /i "True" %nul1% && set terminal=
 )
 if %_unattended%==1 goto :skipQE
 for %%# in (%_args%) do (if /i "%%#"=="-qedit" goto :skipQE)
 if defined terminal (
 set "launchcmd=start conhost.exe %psc%"
 ) else (
 set "launchcmd=%psc%"
 )
 ::  Disable QuickEdit in current session
 set "d1=$t=[AppDomain]::CurrentDomain.DefineDynamicAssembly(4, 1).DefineDynamicModule(2, $False).DefineType(0);"
 set "d2=$t.DefinePInvokeMethod('GetStdHandle', 'kernel32.dll', 22, 1, [IntPtr], @([Int32]), 1, 3).SetImplementationFlags(128);"
 set "d3=$t.DefinePInvokeMethod('SetConsoleMode', 'kernel32.dll', 22, 1, [Boolean], @([IntPtr], [Int32]), 1, 3).SetImplementationFlags(128);"
 set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080);"
 %launchcmd% "%d1% %d2% %d3% %d4% & cmd.exe '/c' '!_PSarg! -qedit'" && (exit /b) || (set terminal=1)
 :skipQE
 ::========================================================================================================================================
 ::  Check for updates
@ -213,24 +242,25 @@ set -=
 set old=
 for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not [%%#]==[] (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
 )
 if defined old (
 echo ________________________________________________
 %eline%
-echo You are running outdated version MAS %masver%
+echo Your version of MAS [%masver%] is outdated.
 echo ________________________________________________
 echo:
 if not %_unattended%==1 (
 echo [1] Get Latest MAS
 echo [0] Continue Anyway
 echo:
-call :ex_color %_Green% "Enter a menu option in the Keyboard [1,0] :"
+call :dk_color %_Green% "Choose a menu option using your keyboard [1,0] :"
 choice /C:10 /N
 if !errorlevel!==2 rem
 if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
 )
-cls
+)
 ::========================================================================================================================================
@ -247,7 +277,7 @@ set "_dir=%desktop%\$OEM$\$$\Setup\Scripts"
 if exist "!desktop!\" (
 %eline%
-echo Desktop location was not detected, aborting...
+echo Unable to detect Desktop location, aborting...
 goto done2
 )
@ -255,12 +285,12 @@ setlocal EnableDelayedExpansion
 ::========================================================================================================================================
-mode con cols=78 lines=30
+if not defined terminal mode 78, 30
 if exist "!desktop!\$OEM$\" (
 echo _____________________________________________________
 %eline%
-echo $OEM$ folder already exists on the Desktop.
+echo The $OEM$ folder already exists on your Desktop.
 echo _____________________________________________________
 goto done2
 )
@ -296,7 +326,7 @@ goto done2
 :Menu
 cls
-mode con cols=78 lines=30
+if not defined terminal mode 78, 30
 echo:
 echo:
 echo:
@ -315,16 +345,16 @@ echo:              [7] KMS38      ^(Windows^) ^+ Ohook      ^(Office^)
 echo:              [8] KMS38      ^(Windows^) ^+ Online KMS ^(Office^)
 echo:              [9] Online KMS ^(Windows^) ^+ Ohook      ^(Office^)
 echo:
-call :ex_color2 %_White% "              [R] " %_Green% "ReadMe"
+call :dk_color2 %_White% "              [R] " %_Green% "ReadMe"
 echo:              [0] Exit
 echo:           ________________________________________________________
 echo:  
-call :ex_color2 %_White% "             " %_Green% "Enter a menu option in the Keyboard :"
+call :dk_color2 %_White% "             " %_Green% "Choose a menu option using your keyboard :"
 choice /C:123456789R0 /N
 set _erl=%errorlevel%
 if %_erl%==11 exit /b
-if %_erl%==10 start %mas%oem-folder.html &goto :Menu
+if %_erl%==10 start %mas%oem-folder &goto :Menu
 if %_erl%==9 goto:kms_ohook
 if %_erl%==8 goto:kms38_kms
 if %_erl%==7 goto:kms38_ohook
@ -450,7 +480,7 @@ goto done
 fltmc >nul || exit /b
-call "%~dp0Online_KMS_Activation.cmd" /KMS-ActAndRenewalTask /KMS-WindowsOffice
+call "%~dp0Online_KMS_Activation.cmd" /K-WindowsOffice
 cd \
 (goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")
@ -525,7 +555,7 @@ call "%~dp0HWID_Activation.cmd" /HWID
 endlocal
 setlocal
-call "%~dp0Online_KMS_Activation.cmd" /KMS-ActAndRenewalTask /KMS-Office
+call "%~dp0Online_KMS_Activation.cmd" /K-Office
 endlocal
 cd \
@ -601,7 +631,7 @@ call "%~dp0KMS38_Activation.cmd" /KMS38
 endlocal
 setlocal
-call "%~dp0Online_KMS_Activation.cmd" /KMS-ActAndRenewalTask /KMS-Office
+call "%~dp0Online_KMS_Activation.cmd" /K-Office
 endlocal
 cd \
@ -635,7 +665,7 @@ goto done
 fltmc >nul || exit /b
 setlocal
-call "%~dp0Online_KMS_Activation.cmd" /KMS-ActAndRenewalTask /KMS-Windows
+call "%~dp0Online_KMS_Activation.cmd" /K-Windows
 endlocal
 setlocal
@ -651,15 +681,15 @@ cd \
 :errorfound
 %eline%
-echo $OEM$ Folder was not created successfully...
+echo The script failed to create the $OEM$ folder.
 goto :done2
 :done
 echo ______________________________________________________________
 echo:
-call :ex_color %Blue% "%oem%"
+call :dk_color %Blue% "%oem%"
-call :ex_color %Green% "$OEM$ folder is successfully created on the Desktop."
+call :dk_color %Green% "$OEM$ folder was successfully created on your Desktop."
 echo "%oem%" | find /i "38" %nul% && (
 echo:
 echo To KMS38 activate Server Cor/Acor editions ^(No GUI Versions^),
@ -670,8 +700,65 @@ echo ______________________________________________________________
 :done2
 echo:
-call :ex_color %_Yellow% "Press any key to exit..."
+if defined fixes (
 call :dk_color2 %Blue% "Press [1] to Open Troubleshoot Page " %Gray% " Press [0] to Ignore"
 choice /C:10 /N
 if !errorlevel!==1 (for %%# in (%fixes%) do (start %%#))
 )
 if defined terminal (
 call :dk_color %_Yellow% "Press [0] key to %_exitmsg%..."
 choice /c 0 /n
 ) else (
 call :dk_color %_Yellow% "Press any key to %_exitmsg%..."
 pause %nul1%
 )
 exit /b
 ::========================================================================================================================================
 ::  Set variables
 :dk_setvar
 set psc=powershell.exe
 set winbuild=1
 for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G
 set _NCS=1
 if %winbuild% LSS 10586 set _NCS=0
 if %winbuild% GEQ 10586 reg query "HKCU\Console" /v ForceV2 %nul2% | find /i "0x0" %nul1% && (set _NCS=0)
 if %_NCS% EQU 1 (
 for /F %%a in ('echo prompt $E ^| cmd') do set "esc=%%a"
 set     "Red="41;97m""
 set    "Gray="100;97m""
 set   "Green="42;97m""
 set    "Blue="44;97m""
 set    "_Red="40;91m""
 set  "_White="40;37m""
 set  "_Green="40;92m""
 set "_Yellow="40;93m""
 ) else (
 set     "Red="Red" "white""
 set    "Gray="Darkgray" "white""
 set   "Green="DarkGreen" "white""
 set    "Blue="Blue" "white""
 set    "_Red="Black" "Red""
 set  "_White="Black" "Gray""
 set  "_Green="Black" "Green""
 set "_Yellow="Black" "Yellow""
 )
 set "nceline=echo: &echo ==== ERROR ==== &echo:"
 set "eline=echo: &call :dk_color %Red% "==== ERROR ====" &echo:"
 if %~z0 GEQ 200000 (
 set "_exitmsg=Go back"
 set "_fixmsg=Go back to Main Menu, select Troubleshoot and run Fix Licensing option."
 ) else (
 set "_exitmsg=Exit"
 set "_fixmsg=In MAS folder, run Troubleshoot script and select Fix Licensing option."
 )
 exit /b
 ::========================================================================================================================================
@ -685,21 +772,21 @@ exit /b
 ::========================================================================================================================================
-:ex_color
+:dk_color
 if %_NCS% EQU 1 (
 echo %esc%[%~1%~2%esc%[0m
 ) else (
-if not exist %psc% (echo %~3) else (%psc% write-host -back '%1' -fore '%2' '%3')
+%psc% write-host -back '%1' -fore '%2' '%3'
 )
 exit /b
-:ex_color2
+:dk_color2
 if %_NCS% EQU 1 (
 echo %esc%[%~1%~2%esc%[%~3%~4%esc%[0m
 ) else (
-if not exist %psc% (echo %~3%~6) else (%psc% write-host -back '%1' -fore '%2' '%3' -NoNewline; write-host -back '%4' -fore '%5' '%6')
+%psc% write-host -back '%1' -fore '%2' '%3' -NoNewline; write-host -back '%4' -fore '%5' '%6'
 )
 exit /b
--- a/MAS/Separate-Files-Version/Troubleshoot.cmd
+++ b/MAS/Separate-Files-Version/Troubleshoot.cmd
--- a/README.md
+++ b/README.md
@ -14,19 +14,19 @@
 ## Download / How to use it?
-### Method 1 - PowerShell (Recommended)
+### Method 1 - PowerShell (Windows 8 and later) ❤️
-   Right-click on the Windows start menu and select PowerShell or Terminal (Not CMD).
+1.   Open PowerShell (Not CMD). To do that, right-click on the Windows start menu and select PowerShell or Terminal.
-   Copy and paste the code below and press enter  
+2.   Copy and paste the code below and press enter  
 ```
 irm https://get.activated.win | iex
 ```
-or (deprecated, will be retired on Aug 31 2024, use above instead)  
+or (deprecated, will be retired on Dec 31 2024, use above instead)  
 ```
 irm https://massgrave.dev/get | iex
 ```
-   You will see the activation options. Follow the on-screen instructions.
+3.   You will see the activation options. Choose [1] HWID for Windows activation. Choose [2] Ohook for Office activation.
-   That's all.
+4.   That's all.
 ---
@ -35,22 +35,22 @@ irm https://massgrave.dev/get | iex
 - The Powershell method does not work on Windows 7. Use the Method 2 - Traditional instead.  
 - The URL get.activated.win may be blocked by some DNS services because it is a new domain.
-### Method 2 - Traditional
+### Method 2 - Traditional (Windows 7 and later)
-   Download the file under the code button from [GitHub](https://github.com/massgravel/Microsoft-Activation-Scripts) or [Bitbucket](https://bitbucket.org/WindowsAddict/microsoft-activation-scripts)
+1.   Download the file under the code button from [GitHub](https://github.com/massgravel/Microsoft-Activation-Scripts) or [Bitbucket](https://bitbucket.org/WindowsAddict/microsoft-activation-scripts) or [Codeberg](https://codeberg.org/massgravel/Microsoft-Activation-Scripts)
-   Right-click on the downloaded zip file and extract
+2.   Right-click on the downloaded zip file and extract
-   In the extracted folder, find the folder named `All-In-One-Version`
+3.   In the extracted folder, find the folder named `All-In-One-Version`
-   Run the file named `MAS_AIO-CRC32_XXXXXXXX.cmd`
+4.   Run the file named `MAS_AIO.cmd`
-   You will see the activation options, follow the on-screen instructions.
+5.   You will see the activation options, follow the on-screen instructions.
-   That's all.
+6.   That's all.
 To run the scripts in unattended mode, check [here](https://massgrave.dev/command_line_switches)
 </br>
 ```
-Latest Version: 2.6
+Latest Version: 2.7
-Release date: 20-Apr-2024
+Release date: 6-Sep-2024
 ```
 ### [Troubleshooting / Help](https://massgrave.dev/troubleshoot)
Author	SHA1	Message	Date
WindowsAddict	c75cd29b9f	Revert export-ignore	2 months ago
Ave	b1b5299c47	Rename	2 months ago
Ave	652092e985	Merge branch 'dev'	2 months ago
WindowsAddict	b06c83622a	Update readme	2 months ago
WindowsAddict	ce669809bf	2.7	2 months ago
WindowsAddict	0afb09cbd1	Use IsOSBinary check	2 months ago
WindowsAddict	5d8a463475	Check signature of clipup.exe in Server Cor/Acor editions	2 months ago
WindowsAddict	7044f37b44	Add a line in main menu	2 months ago
WindowsAddict	08443039aa	Reword again	2 months ago
WindowsAddict	fd8b81411c	Reword the restart line	2 months ago
WindowsAddict	213bc50b49	Update asdcorp's Set-WindowsCbsEdition link	2 months ago
WindowsAddict	00e81be52f	Reword some sentences	2 months ago
WindowsAddict	2443e1e471	Remove preview keys It can cause issues with correct key detection and its not important anyways	2 months ago
WindowsAddict	ec31fef9b9	Fix line alignment in KMS38 menu	2 months ago
WindowsAddict	84f5516632	Remove CRC32 from AIO name and use random letters in folder name (To avoid AV's detection in URL)	2 months ago
WindowsAddict	f9f386a896	Detect SPP's PerfOptions registry in IFEO, and remove it in troubleshoot script	2 months ago
WindowsAddict	8e3b4135f5	Fix text alignment	2 months ago
WindowsAddict	bacb32f4a1	Update MAS AIO to 2.7	2 months ago
WindowsAddict	86c86c179a	LICENSE	2 months ago
WindowsAddict	445a74ccea	Check unsupported language for Project/Visio	2 months ago
WindowsAddict	69e6c9bf71	Add change Office edition script	3 months ago
WindowsAddict	0ced0f5d8e	Rename filename to Change_Windows_Edition.cmd	3 months ago
Lyssa	19be25c029	Fix many grammar/spelling issues in the script (#543 ) * Proof-read Change Edition script * . * Proof-read OEM folder script * Update Change_Edition.cmd * Update Troubleshoot.cmd * Update Troubleshoot.cmd * Update HWID_Activation.cmd * Update HWID_Activation.cmd * Update HWID_Activation.cmd * Update KMS38_Activation.cmd * Add files via upload * Update Change_Edition.cmd * I'm tired * Update Extract_OEM_Folder.cmd * Update Troubleshoot.cmd * Update HWID_Activation.cmd * Update HWID_Activation.cmd * Update HWID_Activation.cmd * finish with hwid * Update KMS38_Activation.cmd * final kms38 update * Update Ohook_Activation_AIO.cmd * start ohook * Update Ohook_Activation_AIO.cmd * Update Online_KMS_Activation.cmd * Update HWID_Activation.cmd * Update KMS38_Activation.cmd * Update Ohook_Activation_AIO.cmd * Update Online_KMS_Activation.cmd * Update Change_Edition.cmd * Update Extract_OEM_Folder.cmd * Update Troubleshoot.cmd --------- Co-authored-by: nekoppai <109633131+nekoppai@users.noreply.github.com> Co-authored-by: WindowsAddict <windowsaddict@protonmail.com>	3 months ago
WindowsAddict	d372b62280	Revert "Merge pull request #542 from alouiadel/dev" This reverts commit `1dfd3f6626`, reversing changes made to `79bc7b0242`.	3 months ago
WindowsAddict	9e5062e7cc	Update deletion of Office related keys	3 months ago
WindowsAddict	ed3dace78f	Cleanup some registry keys	3 months ago
WindowsAddict	1f50e4ba98	Allow Office repair on ARM64 as well	3 months ago
WindowsAddict	af7d204c96	Rename file (- to _)	3 months ago
WindowsAddict	0d26ba046e	Use %syspath%	3 months ago
WindowsAddict	3fd1666926	Fix color code	3 months ago
WindowsAddict	bf814304c6	Add fix for issues caused by update KB971033 in Windows 7	3 months ago
WindowsAddict	1dfd3f6626	Merge pull request #542 from alouiadel/dev Rephrase text and fix issue #521	3 months ago
WindowsAddict	79bc7b0242	Avoid a potential crash in wmic.exe check	3 months ago
Adel Aloui	ae48118ddb	Rephrase text and fix issue #521	3 months ago
WindowsAddict	b983bd41da	Replace square brackets with double quotes in string comparison	3 months ago
WindowsAddict	d55b9fa78c	Avoid using pause if Terminal is detected	3 months ago
WindowsAddict	fb113c7c24	Replace wmic.exe with Powershell in fix wmi	3 months ago
WindowsAddict	9efc3e49b9	Show perms error separately for folder and registry	3 months ago
WindowsAddict	a62c3ac36d	Optimize checks and fixes for SPP perms, replace slmgr /rilc	3 months ago
WindowsAddict	73eabbff59	Remove WPA check Already present in activation scripts	3 months ago
WindowsAddict	bc5efae19d	Remove Office vNext cleaning code Its already there in activation scripts	3 months ago
WindowsAddict	deb74ab9b8	Optimize DISM restore and SFC scan log creation	3 months ago
WindowsAddict	d08ed1bd38	Update Troubleshoot script with 2.7 structure	3 months ago
WindowsAddict	5f5a51322d	Realign lines related to dashboard app info	3 months ago
WindowsAddict	fd0e25f477	Detect Ohook install in KMS script	3 months ago
WindowsAddict	b33dcb2f72	Update OEM folder script	3 months ago
WindowsAddict	117ba004f0	better check for malware if sppsvc.exe is not found	3 months ago
WindowsAddict	b0d898973f	Change wording	3 months ago
WindowsAddict	63b3c5097b	Show info regarding Office dashboard app in KMS script	3 months ago
WindowsAddict	69430c6458	Don't create renewal task if VL IDs not found or OEMBIOS error is present and Office VL IDs not found	3 months ago
WindowsAddict	9f57f585d5	Don't show fix licensing solution in some more cases	3 months ago
WindowsAddict	52decdde18	Replace hyphen from evaluation-editions URL	3 months ago
WindowsAddict	601bd0e420	Add old preview edition keys in KMS38	3 months ago
WindowsAddict	5e4988a634	Add more KMS keys for old preview editions	3 months ago
WindowsAddict	3a050f2da7	Fix eval edition change and show .net 3.5 status	3 months ago
WindowsAddict	31b55fd0e3	Add two more preview editions and sort all of them EmbeddedIndustryE_TAP-CTP EmbeddedIndustryE_Beta	3 months ago
WindowsAddict	62d5d5442e	Add old preview editions in KMS script	3 months ago
WindowsAddict	f2e6e6e389	Fix SID code in KMS script	3 months ago
WindowsAddict	b5a305a14e	Highlight options if unsupported product is detected	3 months ago
WindowsAddict	6c71e82ef3	Fig a bug in server section	3 months ago
WindowsAddict	66e8cda508	Add timeout	3 months ago
WindowsAddict	98027af16d	Compress generated logs	3 months ago
WindowsAddict	be45752a21	Add info about edition ID difference	3 months ago
WindowsAddict	a421b12ae4	Add info about how to use a different sppc.dll file	3 months ago
WindowsAddict	d06185d7f7	Highlight skipping of Office activation	3 months ago
WindowsAddict	a46bb78e5e	Show info about buy button in Office dashboard app for Zoomers	3 months ago
WindowsAddict	2470963537	Inform to check antivirus block if dll extraction fails	3 months ago
WindowsAddict	89bff68b28	Fix pkeyconfig path	3 months ago
WindowsAddict	191121c3d4	Add more checks in checking user profile SID's	3 months ago
WindowsAddict	7bf55fc6ee	Fix bug where 'NETWORK SERVICE' translation is needed	3 months ago
WindowsAddict	816925bfef	Ignore log deletion error	4 months ago
WindowsAddict	ad45cf0926	Add red color	4 months ago
WindowsAddict	29eb5bd60d	Generate clean logs on desktop on edition change failure and other fixes	4 months ago
WindowsAddict	70b754657f	Use random GUID instead of %random%	4 months ago
WindowsAddict	8b58696455	Add a check for old renewal task detection	4 months ago
WindowsAddict	5d47723d07	Show fix_powershell link	4 months ago
WindowsAddict	2b786e3037	Correct a info line in KMS script	4 months ago
WindowsAddict	4451a25e7f	Differentiate between new and old outlook detection	4 months ago
WindowsAddict	886745f103	Detect sandboxing	4 months ago
WindowsAddict	5728ba2686	Add check for NT SERVICE\sppsvc	4 months ago
WindowsAddict	ddccc4025f	Optimize the code Thanks to abbodi1406	4 months ago
WindowsAddict	1567903b09	Improve device-based-licensing cleaning	4 months ago
WindowsAddict	f6125eaa5b	Add comment about S-1-5-20 SPP registry issue	4 months ago
WindowsAddict	07c4fcdc74	Improve error check of SPP in HKU\S-1-5-20	4 months ago
WindowsAddict	962f7e326a	Remove duplicacy of file infector checks	4 months ago
WindowsAddict	6f88a4bf90	More accurate check for Office Products in NoEditionChange mode	4 months ago
WindowsAddict	dd3d788bfa	Fix these bugs in checking activated products Issue when similar names products are installed, like O365ProPlusRetail and ProPlusRetail Issue in detecting SPDRetail 2013 because of different name in LicenseFamily	4 months ago
WindowsAddict	3d16fc6a07	Improve/Fix error messages when key is not found	4 months ago
WindowsAddict	e1b9942223	Remove unsupported EnterpriseSN keys	4 months ago
WindowsAddict	53cda879c1	Add VL IDs in ProductReleaseIds in old Office builds	4 months ago
WindowsAddict	211835666b	Separate label for malware check To also call it at the start	4 months ago
WindowsAddict	bdb9875a6b	Remove check activation status scripts and replace them with @abbodi1406's CAS https://gravesoft.dev/cas	4 months ago
WindowsAddict	5b694779be	Remove notx86 check in KMS script and run /reg:32 regardless	4 months ago
WindowsAddict	b7c3f9a98a	Shorten the Windows Subscription check code	4 months ago
WindowsAddict	48fb5fc5fe	2.7 Preview	4 months ago