.gitattributes

@@ -1,4 +1,4 @@
-# MAS export-ignore
+MAS export-ignore
-# LICENSE export-ignore
+LICENSE export-ignore
-# README.md export-ignore
+README.md export-ignore
 .gitattributes export-ignore

MAS/Separate-Files-Version/Activators/HWID_Activation.cmd

@@ -1,4 +1,4 @@
-@set masver=3.0
+@set masver=2.8
 @echo off
 
 
@@ -109,7 +109,7 @@ echo:
 echo Null service is not running, script may crash...
 echo:
 echo:
-echo Help - %mas%fix_service
+echo Help - %mas%troubleshoot
 echo:
 echo:
 ping 127.0.0.1 -n 20
@@ -161,29 +161,19 @@ for %%A in (%_act% %_NoEditionChange%) do (if "%%A"=="1" set _unattended=1)
 
 call :dk_setvar
 
-if %winbuild% EQU 1 (
-%eline%
-echo Failed to detect Windows build number.
-echo:
-setlocal EnableDelayedExpansion
-set fixes=%fixes% %mas%troubleshoot
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
-goto dk_done
-)
-
 if %winbuild% LSS 10240 (
 %eline%
 echo Unsupported OS version detected [%winbuild%].
 echo HWID Activation is only supported on Windows 10/11.
 echo:
-call :dk_color %Blue% "Use TSforge activation option from the main menu."
+call :dk_color %Blue% "Use Online KMS activation option."
 goto dk_done
 )
 
 if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-Server*Edition~*.mum" (
 %eline%
 echo HWID Activation is not supported on Windows Server.
-call :dk_color %Blue% "Use TSforge activation option from the main menu."
+call :dk_color %Blue% "Use KMS38 or Online KMS activation option."
 goto dk_done
 )
 
@@ -221,9 +211,9 @@ goto dk_done
 
 ::  Check PowerShell
 
-REM :PStest: $ExecutionContext.SessionState.LanguageMode :PStest:
+REM :PowerShellTest: $ExecutionContext.SessionState.LanguageMode :PowerShellTest:
 
-cmd /c "%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':PStest:\s*';iex ($f[1])"" | find /i "FullLanguage" %nul1% || (
+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:
@@ -304,13 +294,9 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
 
 set -=
 set old=
-set upver=%masver:.=%
 
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (
+for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not "%%#"=="" set old=1
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (
-if not "%%#"=="" set old=
-)
 )
 
 if defined old (
@@ -326,7 +312,7 @@ echo:
 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 %mas% & exit /b)
+if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
 )
 )
 
@@ -377,6 +363,7 @@ cls
 echo ___________________________________________________________________________________________
 echo:
 call :dk_color2 %_White% "     " %Green% "%winos% is already permanently activated."
+call :dk_color2 %_White% "     " %Gray% "Activation is not required."
 echo ___________________________________________________________________________________________
 if %_unattended%==1 goto dk_done
 echo:
@@ -394,8 +381,7 @@ reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2
 %eline%
 echo [%winos% ^| %winbuild%]
 echo:
-echo Evaluation editions cannot be activated outside of their evaluation period.
+echo Evaluation editions cannot be activated outside of their evaluation period. 
-call :dk_color %Blue% "Use TSforge activation option from the main menu to reset evaluation period."
 echo:
 set fixes=%fixes% %mas%evaluation_editions
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation_editions"
@@ -479,7 +465,7 @@ echo [%winos% ^| %winbuild% ^| SKU:%osSKU%]
 if not defined skunotfound (
 echo This product does not support HWID activation.
 echo Make sure you are using the latest version of the script.
-echo If you are, then try TSforge activation option from the main menu.
+echo If you are, then try KMS38 activation option.
 set fixes=%fixes% %mas%
 echo %mas%
 ) else (
@@ -619,18 +605,17 @@ goto :dl_final
 
 set "_ident=HKU\S-1-5-19\SOFTWARE\Microsoft\IdentityCRL"
 
-if %keyerror% EQU 0 if defined _int (
+if defined _int (
 reg delete "%_ident%" /f %nul%
+reg query "%_ident%" %nul% && (
+echo:
+set error=1
+call :dk_color %Red% "Deleting IdentityCRL Registry           [Failed] [%_ident%]"
+)
 for %%# in (wlidsvc LicenseManager sppsvc) do (%psc% "Start-Job { Restart-Service %%# } | Wait-Job -Timeout 20 | Out-Null")
 call :dk_refresh
 call :dk_act
 call :dk_checkperm
-
-reg query "%_ident%" %nul% || (
-set error=1
-echo:
-call :dk_color %Red% "Generating New IdentityCRL Registry     [Failed] [%_ident%]"
-)
 )
 
 ::==========================================================================================================================================
@@ -638,91 +623,75 @@ call :dk_color %Red% "Generating New IdentityCRL Registry     [Failed] [%_ident%
 ::  Extended licensing servers tests incase error not found and activation failed
 
 if %keyerror% EQU 0 if not defined _perm if defined _int (
+set resfail=
 ipconfig /flushdns %nul%
 set "tls=[Net.ServicePointManager]::SecurityProtocol=[Net.SecurityProtocolType]::Tls12;"
 
 for %%# in (
-licensing.mp.microsoft.com/v7.0/licenses/content
 login.live.com/ppsecure/deviceaddcredential.srf
 purchase.mp.microsoft.com/v7.0/users/me/orders
 ) do if not defined resfail (
-%psc% "try { !tls! irm https://%%# -Method POST } catch { if ($_.Exception.Response -eq $null) { Write-Host """"[%%#] $($_.Exception.Message)"""" -ForegroundColor Red -BackgroundColor Black; exit 3 } }"
+set "d1=Add-Type -AssemblyName System.Net.Http;"
-if !errorlevel!==3 set resfail=1
+set "d1=!d1! $client = [System.Net.Http.HttpClient]::new();"
+set "d1=!d1! $response = $client.GetAsync('https://%%#').GetAwaiter().GetResult();"
+set "d1=!d1! $response.Content.ReadAsStringAsync().GetAwaiter().GetResult()"
+%psc% "!tls! !d1!" %nul2% | findstr /i "PurchaseFD DeviceAddResponse" %nul1% || set resfail=1
 )
+
+if not defined resfail (
+%psc% "!tls! irm https://licensing.mp.microsoft.com/v7.0/licenses/content -Method POST" | find /i "traceId" %nul1% || set resfail=1
 )
 
 if defined resfail (
 set error=1
-for %%# in (
+echo:
-live.com
+call :dk_color %Red% "Checking Licensing Servers              [Failed to Connect]"
-microsoft.com
-login.live.com
-purchase.mp.microsoft.com
-licensing.mp.microsoft.com
-) do (
-findstr /i "%%#" "%SysPath%\drivers\etc\hosts" %nul1% && set "hosfail= [%%# Blocked in Hosts]"
-)
-call :dk_color %Red% "Checking Licensing Servers              [Failed to Connect]!hosfail!"
 set fixes=%fixes% %mas%licensing-servers-issue
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%licensing-servers-issue"
 )
+)
 
 ::==========================================================================================================================================
 
-::  Windows update and store block check
-
 if %keyerror% EQU 0 if not defined _perm if defined _int (
 
+reg query "%_ident%" %nul% || (
+set error=1
+echo:
+call :dk_color %Red% "Generating New IdentityCRL Registry     [Failed] [%_ident%]"
+)
+
 reg query "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /v DisableWindowsUpdateAccess %nul2% | find /i "0x1" %nul% && set wublock=1
 reg query "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /v DoNotConnectToWindowsUpdateInternetLocations %nul2% | find /i "0x1" %nul% && set wublock=1
-if defined wublock (
+if defined wublock call :dk_color %Red% "Checking Update Blocker In Registry     [Found]"
-call :dk_color %Red% "Checking Update Blocker In Registry     [Found]"
-call :dk_color %Blue% "HWID activation needs working Windows updates, if you have used any tool to block updates, undo it."
-)
 
 reg query "HKLM\SOFTWARE\Policies\Microsoft\WindowsStore" /v DisableStoreApps %nul2% | find /i "0x1" %nul% && (
 set storeblock=1
 call :dk_color %Red% "Checking Store Blocker In Registry      [Found]"
-call :dk_color %Blue% "If you have used any tool to block Store, undo it."
 )
 
-set wcount=0
+for %%G in (DependOnService Description DisplayName ErrorControl ImagePath ObjectName Start Type ServiceSidType RequiredPrivileges FailureActions) do if not defined wucorrupt (
-for %%G in (DependOnService Description DisplayName ErrorControl ImagePath ObjectName Start Type ServiceSidType RequiredPrivileges FailureActions) do (
+reg query HKLM\SYSTEM\CurrentControlSet\Services\wuauserv /v %%G %nul% || set wucorrupt=1
-reg query HKLM\SYSTEM\CurrentControlSet\Services\wuauserv /v %%G %nul% || (set wucorrupt=1&set /a wcount+=1)
 )
 
-for %%G in (Parameters Security) do (
+for %%G in (Parameters Security TriggerInfo) do if not defined wucorrupt (
-reg query HKLM\SYSTEM\CurrentControlSet\Services\wuauserv\%%G %nul% || (set wucorrupt=1&set /a wcount+=1)
+reg query HKLM\SYSTEM\CurrentControlSet\Services\wuauserv\%%G %nul% || set wucorrupt=1
 )
 
 if defined wucorrupt (
-set error=1
 call :dk_color %Red% "Checking Windows Update Registry        [Corruption Found]"
-if !wcount! GTR 2 (
-call :dk_color %Red% "Windows seems to be infected with Mal%w%ware."
-set fixes=%fixes% %mas%remove_mal%w%ware
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%remove_mal%w%ware"
-) else (
-call :dk_color %Blue% "HWID activation needs working Windows updates, if you have used any tool to block updates, undo it."
-)
 ) else (
 %psc% "Start-Job { Start-Service wuauserv } | Wait-Job -Timeout 20 | Out-Null"
 sc query wuauserv | find /i "RUNNING" %nul% || (
-set error=1
 set wuerror=1
 sc start wuauserv %nul%
 call :dk_color %Red% "Starting Windows Update Service         [Failed] [!errorlevel!]"
-call :dk_color %Blue% "HWID activation needs working Windows updates, if you have used any tool to block updates, undo it."
-)
 )
 )
 
-::==========================================================================================================================================
+REM Check Internet related error codes
 
-::  Check Internet related error codes
+if not defined wucorrupt if not defined wublock if not defined wuerror if not defined storeblock (
-
-if %keyerror% EQU 0 if not defined _perm if defined _int (
-if not defined wucorrupt if not defined wublock if not defined wuerror if not defined storeblock if not defined resfail (
 echo "%error_code%" | findstr /i "0x80072e 0x80072f 0x800704cf 0x87e10bcf 0x800705b4" %nul% && (
 call :dk_color %Red% "Checking Internet Issues                [Found] %error_code%"
 set fixes=%fixes% %mas%licensing-servers-issue
@@ -740,7 +709,7 @@ call :dk_color %Green% "%winos% is permanently activated with a digital license.
 call :dk_color %Red% "Activation Failed %error_code%"
 if defined notworking (
 call :dk_color %Blue% "At the time of writing, HWID Activation is not supported for this product."
-call :dk_color %Blue% "Use TSforge activation option from the main menu instead."
+call :dk_color %Blue% "Use KMS38 activation option instead."
 ) else (
 if not defined error call :dk_color %Blue% "%_fixmsg%"
 set fixes=%fixes% %mas%troubleshoot
@@ -1244,11 +1213,6 @@ echo %serv_e% | findstr /i "ClipSVC-1058 sppsvc-1058" %nul% && (
 call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."
 set showfix=1
 )
-echo %serv_e% | findstr /i "sppsvc-1060" %nul% && (
-set fixes=%fixes% %mas%fix_service
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%fix_service"
-set showfix=1
-)
 )
 
 ::========================================================================================================================================
@@ -1267,10 +1231,10 @@ call :dk_color2 %Red% "Checking Boot Mode                      [%safeboot_option
 for /f "skip=2 tokens=2*" %%A in ('reg query "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Setup\State" /v ImageState') do (set imagestate=%%B)
 
 if /i not "%imagestate%"=="IMAGE_STATE_COMPLETE" (
-call :dk_color %Gray% "Checking Windows Setup State            [%imagestate%]"
-echo "%imagestate%" | find /i "RESEAL" %nul% && (
 set error=1
 set showfix=1
+call :dk_color %Gray% "Checking Windows Setup State            [%imagestate%]"
+echo "%imagestate%" | find /i "RESEAL" %nul% && (
 call :dk_color %Blue% "You need to run it in normal mode in case you are running it in Audit Mode."
 )
 echo "%imagestate%" | find /i "UNDEPLOYABLE" %nul% && (
@@ -1299,8 +1263,9 @@ echo Checking WPA Registry Count             [%wpainfo%]
 )
 
 
-if not defined notwinact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (
+if not defined officeact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Eval" %nul1% || (
+set error=1
 call :dk_color %Red% "Checking Eval Packages                  [Non-Eval Licenses are installed in Eval Windows]"
 set fixes=%fixes% %mas%evaluation_editions
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation_editions"
@@ -1322,17 +1287,19 @@ if "%osSKU%"=="164" set osedition=ProfessionalEducation
 if "%osSKU%"=="165" set osedition=ProfessionalEducationN
 )
 
-if not defined notwinact (
+if not defined officeact (
 if %osedition%==0 (
 call :dk_color %Red% "Checking Edition Name                   [Not Found In Registry]"
 ) else (
 
 if not exist "%SysPath%\spp\tokens\skus\%osedition%\%osedition%*.xrm-ms" if not exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" (
+set error=1
 set skunotfound=1
 call :dk_color %Red% "Checking License Files                  [Not Found] [%osedition%]"
 )
 
 if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
+set error=1
 call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 )
 )
@@ -1363,7 +1330,7 @@ set showfix=1
 )
 
 
-if not defined notwinact (
+if not defined officeact (
 if %winbuild% GEQ 10240 (
 %nul% set /a "sum=%slcSKU%+%regSKU%+%wmiSKU%"
 set /a "sum/=3"
@@ -1396,7 +1363,11 @@ call :dk_color2 %Red% "Checking ClipSVC                        " %Blue% "[System
 ::  This "WLMS" service was included in previous Eval editions (which were activable) to automatically shut down the system every hour after the evaluation period expired and prevent SPPSVC from stopping.
 
 if exist "%SysPath%\wlms\wlms.exe" (
+if %winbuild% LSS 9200 (
 echo Checking Eval WLMS Service              [Found]
+) else (
+call :dk_color %Red% "Checking Eval WLMS Service              [Found]"
+)
 )
 
 
@@ -1427,13 +1398,14 @@ for /f "skip=2 tokens=2*" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT
 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v "SkipRearm" /t REG_DWORD /d "0" /f %nul%
 call :dk_color %Red% "Checking SkipRearm                      [Default 0 Value Not Found. Changing To 0]"
 %psc% "Start-Job { Stop-Service sppsvc -force } | Wait-Job -Timeout 20 | Out-Null"
+set error=1
 )
 
 
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (
 call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found]"
 set fixes=%fixes% %mas%issues_due_to_gaming_spoofers
-call :dk_color2 %Blue% "Most likely caused by gaming spoofers. Help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"
+call :dk_color2 %Blue% "Most likely caused by HWID spoofers. Help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"
 set error=1
 set showfix=1
 )
@@ -1472,7 +1444,6 @@ set showfix=1
 )
 
 
-if not defined notwinact (
 call :dk_actid 55c92734-d682-4d71-983e-d6ec3f16059f
 if not defined apps (
 %psc% "Start-Job { Stop-Service sppsvc -force } | Wait-Job -Timeout 20 | Out-Null; $sls = Get-WmiObject SoftwareLicensingService; $f=[io.file]::ReadAllText('!_batp!') -split ':xrm\:.*';iex ($f[1]); ReinstallLicenses" %nul%
@@ -1481,13 +1452,12 @@ if not defined apps (
 set "_notfoundids=Key Not Installed / Act ID Not Found"
 call :dk_actids 55c92734-d682-4d71-983e-d6ec3f16059f
 if not defined allapps (
-set error=1
 set "_notfoundids=Not found"
 )
+set error=1
 call :dk_color %Red% "Checking Activation IDs                 [!_notfoundids!]"
 )
 )
-)
 
 
 if exist "%tokenstore%\" if not exist "%tokenstore%\tokens.dat" (
@@ -1497,15 +1467,12 @@ call :dk_color %Red% "Checking SPP tokens.dat                 [Not Found] [%toke
 
 
 if %winbuild% GEQ 9200 if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (
-%psc% "Get-WmiObject -Query 'SELECT Description FROM SoftwareLicensingProduct WHERE PartialProductKey IS NOT NULL AND LicenseDependsOn IS NULL' | Select-Object -Property Description" %nul2% | findstr /i "KMS_" %nul1% || (
 for /f "delims=" %%a in ('%psc% "(Get-ScheduledTask -TaskName 'SvcRestartTask' -TaskPath '\Microsoft\Windows\SoftwareProtectionPlatform\').State" %nul6%') do (set taskinfo=%%a)
 echo !taskinfo! | find /i "Ready" %nul% || (
 reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v "actionlist" /f %nul%
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Schedule\TaskCache\Tree\Microsoft\Windows\SoftwareProtectionPlatform\SvcRestartTask" %nul% || set taskinfo=Removed
 if "!taskinfo!"=="" set "taskinfo=Not Found"
 call :dk_color %Red% "Checking SvcRestartTask Status          [!taskinfo!, System might deactivate later]"
-if not defined error call :dk_color %Blue% "Reboot your machine using the restart option."
-)
 )
 )
 
@@ -1647,7 +1614,10 @@ echo:
 if %_unattended%==1 timeout /t 2 & exit /b
 
 if defined fixes (
+call :dk_color %White% "                                   "
 call :dk_color %White% "Follow ALL the ABOVE blue lines.   "
+call :dk_color %White% "                                   "
+echo:
 call :dk_color2 %Blue% "Press [1] to Open Support Webpage " %Gray% " Press [0] to Ignore"
 choice /C:10 /N
 if !errorlevel!==1 (for %%# in (%fixes%) do (start %%#))

MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd

@@ -1,4 +1,4 @@
-@set masver=3.0
+@set masver=2.8
 @echo off
 
 
@@ -112,7 +112,7 @@ echo:
 echo Null service is not running, script may crash...
 echo:
 echo:
-echo Help - %mas%fix_service
+echo Help - %mas%troubleshoot
 echo:
 echo:
 ping 127.0.0.1 -n 20
@@ -167,25 +167,15 @@ set _k38=
 call :dk_setvar
 set "specific_kms=SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\55c92734-d682-4d71-983e-d6ec3f16059f"
 
-if %winbuild% EQU 1 (
-%eline%
-echo Failed to detect Windows build number.
-echo:
-setlocal EnableDelayedExpansion
-set fixes=%fixes% %mas%troubleshoot
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
-goto dk_done
-)
-
 if %winbuild% LSS 14393 (
 %eline%
 echo Unsupported OS version detected [%winbuild%].
 echo KMS38 activation is only supported on Windows 10/11/Server, build 14393 and later.
 echo:
 if %winbuild% LSS 10240 (
-call :dk_color %Blue% "Use TSforge activation option from the main menu."
+call :dk_color %Blue% "Use Online KMS activation option."
 ) else (
-call :dk_color %Blue% "Use HWID activation option from the main menu."
+call :dk_color %Blue% "Use HWID activation option."
 )
 goto dk_done
 )
@@ -224,9 +214,9 @@ goto dk_done
 
 ::  Check PowerShell
 
-REM :PStest: $ExecutionContext.SessionState.LanguageMode :PStest:
+REM :PowerShellTest: $ExecutionContext.SessionState.LanguageMode :PowerShellTest:
 
-cmd /c "%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':PStest:\s*';iex ($f[1])"" | find /i "FullLanguage" %nul1% || (
+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:
@@ -307,13 +297,9 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
 
 set -=
 set old=
-set upver=%masver:.=%
 
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (
+for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not "%%#"=="" set old=1
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (
-if not "%%#"=="" set old=
-)
 )
 
 if defined old (
@@ -329,7 +315,7 @@ echo:
 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 %mas% & exit /b)
+if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
 )
 )
 cls
@@ -445,8 +431,7 @@ echo Server Evaluation cannot be activated. Convert it to full Server OS.
 echo:
 call :dk_color %Blue% "Go Back to main menu and use [Change Edition] option."
 ) else (
-echo Evaluation editions cannot be activated outside of their evaluation period.
+echo Evaluation editions cannot be activated outside of their evaluation period. 
-call :dk_color %Blue% "Use TSforge activation option from the main menu to reset evaluation period."
 echo:
 set fixes=%fixes% %mas%evaluation_editions
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation_editions"
@@ -556,7 +541,7 @@ call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
 
 if not defined skunotfound if not defined sppks (
 call :dk_color %Red% "This product does not support KMS38 activation."
-call :dk_color %Blue% "Use TSforge activation option from the main menu."
+call :dk_color %Blue% "Make sure you are using the latest version of the script."
 set fixes=%fixes% %mas%
 echo %mas%
 )
@@ -1393,11 +1378,6 @@ echo %serv_e% | findstr /i "ClipSVC-1058 sppsvc-1058" %nul% && (
 call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."
 set showfix=1
 )
-echo %serv_e% | findstr /i "sppsvc-1060" %nul% && (
-set fixes=%fixes% %mas%fix_service
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%fix_service"
-set showfix=1
-)
 )
 
 ::========================================================================================================================================
@@ -1416,10 +1396,10 @@ call :dk_color2 %Red% "Checking Boot Mode                      [%safeboot_option
 for /f "skip=2 tokens=2*" %%A in ('reg query "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Setup\State" /v ImageState') do (set imagestate=%%B)
 
 if /i not "%imagestate%"=="IMAGE_STATE_COMPLETE" (
-call :dk_color %Gray% "Checking Windows Setup State            [%imagestate%]"
-echo "%imagestate%" | find /i "RESEAL" %nul% && (
 set error=1
 set showfix=1
+call :dk_color %Gray% "Checking Windows Setup State            [%imagestate%]"
+echo "%imagestate%" | find /i "RESEAL" %nul% && (
 call :dk_color %Blue% "You need to run it in normal mode in case you are running it in Audit Mode."
 )
 echo "%imagestate%" | find /i "UNDEPLOYABLE" %nul% && (
@@ -1448,8 +1428,9 @@ echo Checking WPA Registry Count             [%wpainfo%]
 )
 
 
-if not defined notwinact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (
+if not defined officeact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Eval" %nul1% || (
+set error=1
 call :dk_color %Red% "Checking Eval Packages                  [Non-Eval Licenses are installed in Eval Windows]"
 set fixes=%fixes% %mas%evaluation_editions
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation_editions"
@@ -1471,17 +1452,19 @@ if "%osSKU%"=="164" set osedition=ProfessionalEducation
 if "%osSKU%"=="165" set osedition=ProfessionalEducationN
 )
 
-if not defined notwinact (
+if not defined officeact (
 if %osedition%==0 (
 call :dk_color %Red% "Checking Edition Name                   [Not Found In Registry]"
 ) else (
 
 if not exist "%SysPath%\spp\tokens\skus\%osedition%\%osedition%*.xrm-ms" if not exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" (
+set error=1
 set skunotfound=1
 call :dk_color %Red% "Checking License Files                  [Not Found] [%osedition%]"
 )
 
 if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
+set error=1
 call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 )
 )
@@ -1512,7 +1495,7 @@ set showfix=1
 )
 
 
-if not defined notwinact (
+if not defined officeact (
 if %winbuild% GEQ 10240 (
 %nul% set /a "sum=%slcSKU%+%regSKU%+%wmiSKU%"
 set /a "sum/=3"
@@ -1545,7 +1528,11 @@ call :dk_color2 %Red% "Checking ClipSVC                        " %Blue% "[System
 ::  This "WLMS" service was included in previous Eval editions (which were activable) to automatically shut down the system every hour after the evaluation period expired and prevent SPPSVC from stopping.
 
 if exist "%SysPath%\wlms\wlms.exe" (
+if %winbuild% LSS 9200 (
 echo Checking Eval WLMS Service              [Found]
+) else (
+call :dk_color %Red% "Checking Eval WLMS Service              [Found]"
+)
 )
 
 
@@ -1576,13 +1563,14 @@ for /f "skip=2 tokens=2*" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT
 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v "SkipRearm" /t REG_DWORD /d "0" /f %nul%
 call :dk_color %Red% "Checking SkipRearm                      [Default 0 Value Not Found. Changing To 0]"
 %psc% "Start-Job { Stop-Service sppsvc -force } | Wait-Job -Timeout 20 | Out-Null"
+set error=1
 )
 
 
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (
 call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found]"
 set fixes=%fixes% %mas%issues_due_to_gaming_spoofers
-call :dk_color2 %Blue% "Most likely caused by gaming spoofers. Help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"
+call :dk_color2 %Blue% "Most likely caused by HWID spoofers. Help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"
 set error=1
 set showfix=1
 )
@@ -1621,7 +1609,6 @@ set showfix=1
 )
 
 
-if not defined notwinact (
 call :dk_actid 55c92734-d682-4d71-983e-d6ec3f16059f
 if not defined apps (
 %psc% "Start-Job { Stop-Service sppsvc -force } | Wait-Job -Timeout 20 | Out-Null; $sls = Get-WmiObject SoftwareLicensingService; $f=[io.file]::ReadAllText('!_batp!') -split ':xrm\:.*';iex ($f[1]); ReinstallLicenses" %nul%
@@ -1630,13 +1617,12 @@ if not defined apps (
 set "_notfoundids=Key Not Installed / Act ID Not Found"
 call :dk_actids 55c92734-d682-4d71-983e-d6ec3f16059f
 if not defined allapps (
-set error=1
 set "_notfoundids=Not found"
 )
+set error=1
 call :dk_color %Red% "Checking Activation IDs                 [!_notfoundids!]"
 )
 )
-)
 
 
 if exist "%tokenstore%\" if not exist "%tokenstore%\tokens.dat" (
@@ -1646,15 +1632,12 @@ call :dk_color %Red% "Checking SPP tokens.dat                 [Not Found] [%toke
 
 
 if %winbuild% GEQ 9200 if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (
-%psc% "Get-WmiObject -Query 'SELECT Description FROM SoftwareLicensingProduct WHERE PartialProductKey IS NOT NULL AND LicenseDependsOn IS NULL' | Select-Object -Property Description" %nul2% | findstr /i "KMS_" %nul1% || (
 for /f "delims=" %%a in ('%psc% "(Get-ScheduledTask -TaskName 'SvcRestartTask' -TaskPath '\Microsoft\Windows\SoftwareProtectionPlatform\').State" %nul6%') do (set taskinfo=%%a)
 echo !taskinfo! | find /i "Ready" %nul% || (
 reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v "actionlist" /f %nul%
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Schedule\TaskCache\Tree\Microsoft\Windows\SoftwareProtectionPlatform\SvcRestartTask" %nul% || set taskinfo=Removed
 if "!taskinfo!"=="" set "taskinfo=Not Found"
 call :dk_color %Red% "Checking SvcRestartTask Status          [!taskinfo!, System might deactivate later]"
-if not defined error call :dk_color %Blue% "Reboot your machine using the restart option."
-)
 )
 )
 
@@ -1796,7 +1779,10 @@ echo:
 if %_unattended%==1 timeout /t 2 & exit /b
 
 if defined fixes (
+call :dk_color %White% "                                   "
 call :dk_color %White% "Follow ALL the ABOVE blue lines.   "
+call :dk_color %White% "                                   "
+echo:
 call :dk_color2 %Blue% "Press [1] to Open Support Webpage " %Gray% " Press [0] to Ignore"
 choice /C:10 /N
 if !errorlevel!==1 (for %%# in (%fixes%) do (start %%#))

MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd

@@ -1,4 +1,4 @@
-@set masver=3.0
+@set masver=2.8
 @echo off
 
 
@@ -109,7 +109,7 @@ echo:
 echo Null service is not running, script may crash...
 echo:
 echo:
-echo Help - %mas%fix_service
+echo Help - %mas%troubleshoot
 echo:
 echo:
 ping 127.0.0.1 -n 20
@@ -161,16 +161,6 @@ for %%A in (%_act% %_rem%) do (if "%%A"=="1" set _unattended=1)
 
 call :dk_setvar
 
-if %winbuild% EQU 1 (
-%eline%
-echo Failed to detect Windows build number.
-echo:
-setlocal EnableDelayedExpansion
-set fixes=%fixes% %mas%troubleshoot
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
-goto dk_done
-)
-
 if %winbuild% LSS 9200 (
 %eline%
 echo Unsupported OS version detected [%winbuild%].
@@ -214,9 +204,9 @@ goto dk_done
 
 ::  Check PowerShell
 
-REM :PStest: $ExecutionContext.SessionState.LanguageMode :PStest:
+REM :PowerShellTest: $ExecutionContext.SessionState.LanguageMode :PowerShellTest:
 
-cmd /c "%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':PStest:\s*';iex ($f[1])"" | find /i "FullLanguage" %nul1% || (
+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:
@@ -297,13 +287,9 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
 
 set -=
 set old=
-set upver=%masver:.=%
 
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (
+for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not "%%#"=="" set old=1
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (
-if not "%%#"=="" set old=
-)
 )
 
 if defined old (
@@ -319,7 +305,7 @@ echo:
 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 %mas% & exit /b)
+if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
 )
 )
 cls
@@ -414,8 +400,7 @@ set "_serv=sppsvc Winmgmt"
 ::  Software Protection
 ::  Windows Management Instrumentation
 
-set notwinact=1
+set officeact=1
-set ohookact=1
 call :dk_errorcheck
 
 ::  Check unsupported office versions
@@ -510,6 +495,16 @@ reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2
 
 ::========================================================================================================================================
 
+::  Check already activated products list
+
+set actiProds15=
+set actiProds16=
+
+if not "%o15c2r%%o15msi%"=="" call :oh_findactivated -like 15
+if not "%o16c2r%%o16msi%"=="" call :oh_findactivated -notlike 16
+
+::========================================================================================================================================
+
 ::  Process Office 15.0 C2R
 
 if not defined o15c2r goto :starto16c2r
@@ -534,11 +529,11 @@ echo "!_oIds!" | find /i " %%a " %nul1% || (set "_oIds= !_oIds! %%a ")
 set "_oLPath=%_oRoot%\Licenses"
 set "_oIntegrator=%_oRoot%\integration\integrator.exe"
 
-if /i "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System"    & set "_hook=sppc64.dll")
+if "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System"    & set "_hook=sppc64.dll")
-if /i "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
+if "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
 if not "%osarch%"=="x86" (
-if /i "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
+if "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
-if /i "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
+if "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
 ) else (
 set "_sppcPath=%SystemRoot%\System32\sppc.dll"
 )
@@ -584,11 +579,11 @@ set _o16c2rIds=%_oIds%
 set "_oLPath=%_oRoot%\Licenses16"
 set "_oIntegrator=%_oRoot%\integration\integrator.exe"
 
-if /i "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System"    & set "_hook=sppc64.dll")
+if "%_oArch%"=="x64" (set "_hookPath=%_oRoot%\vfs\System"    & set "_hook=sppc64.dll")
-if /i "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
+if "%_oArch%"=="x86" (set "_hookPath=%_oRoot%\vfs\SystemX86" & set "_hook=sppc32.dll")
 if not "%osarch%"=="x86" (
-if /i "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
+if "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
-if /i "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
+if "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
 ) else (
 set "_sppcPath=%SystemRoot%\System32\sppc.dll"
 )
@@ -978,6 +973,11 @@ exit /b
 
 for %%# in (%_oIds%) do (
 
+echo: !actiProds%oVer%! | find /i "-%%#-" %nul1% && (
+call :dk_color %Gray% "Checking Activation Status              [%%# is already permanently activated]"
+
+) || (
+
 set key=
 set _actid=
 set _lic=
@@ -1002,6 +1002,7 @@ set fixes=%fixes% %mas%
 call :dk_color %_Yellow% "%mas%"
 )
 )
+)
 
 ::  Add SharedComputerLicensing registry key if Retail Office C2R is installed on Windows Server
 ::  https://learn.microsoft.com/en-us/office/troubleshoot/office-suite-issues/click-to-run-office-on-terminal-server
@@ -1034,11 +1035,11 @@ echo "%2" | find /i "Wow6432Node" %nul1% && set _oArch=x86
 if not "%osarch%"=="x86" if not defined _oArch set _oArch=x64
 if "%osarch%"=="x86" set _oArch=x86
 
-if /i "%_oArch%"=="x64" (set "_hookPath=%_oRoot%" & set "_hook=sppc64.dll")
+if "%_oArch%"=="x64" (set "_hookPath=%_oRoot%" & set "_hook=sppc64.dll")
-if /i "%_oArch%"=="x86" (set "_hookPath=%_oRoot%" & set "_hook=sppc32.dll")
+if "%_oArch%"=="x86" (set "_hookPath=%_oRoot%" & set "_hook=sppc32.dll")
 if not "%osarch%"=="x86" (
-if /i "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
+if "%_oArch%"=="x64" set "_sppcPath=%SystemRoot%\System32\sppc.dll"
-if /i "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
+if "%_oArch%"=="x86" set "_sppcPath=%SystemRoot%\SysWOW64\sppc.dll"
 ) else (
 set "_sppcPath=%SystemRoot%\System32\sppc.dll"
 )
@@ -1074,6 +1075,46 @@ exit /b
 
 ::========================================================================================================================================
 
+:oh_findactivated
+
+set oVer=%2
+set _FsortIds=
+set actiProds=
+
+for /f "delims=" %%a in ('%psc% "(Get-WmiObject -Query 'SELECT LicenseFamily, Name FROM %spp% WHERE ApplicationID=''0ff1ce15-a989-479d-af46-f275c6370663'' AND LicenseStatus=1 AND GracePeriodRemaining=0 AND PartialProductKey IS NOT NULL' | Where-Object { $_.Name %1 '*Office 15*' }).LicenseFamily" %nul6%') do call set "actiProds=%%a !actiProds!"
+
+if not defined actiProds exit /b
+
+for %%# in (%actiProds%) do (
+set _sortIds=%%#
+set _sortIds=!_sortIds:OfficeSPDFreeR_=SPDRetail_!
+set _sortIds=!_sortIds:XC2RVL_=XVolume_!
+set _sortIds=!_sortIds:CO365R_=Retail_!
+set _sortIds=!_sortIds:O365R_=Retail_!
+set _sortIds=!_sortIds:E5R_=Retail_!
+set _sortIds=!_sortIds:MSDNR_=Retail_!
+set _sortIds=!_sortIds:DemoR_=Retail_!
+set _sortIds=!_sortIds:EDUR_=Retail_!
+set _sortIds=!_sortIds:R_=Retail_!
+set _sortIds=!_sortIds:VL_=Volume_!
+set _sortIds=!_sortIds:Office16=!
+set _sortIds=!_sortIds:Office19=!
+set _sortIds=!_sortIds:Office21=!
+set _sortIds=!_sortIds:Office24=!
+set _sortIds=!_sortIds:Office=!
+for /f "tokens=1 delims=-_" %%a in ("!_sortIds!") do set "_sortIds=-%%a-"
+set _FsortIds=!_sortIds! !_FsortIds!
+)
+
+call :ohookdata findactivated %2
+exit /b
+
+::  Below IDs are not checked for permanent activation
+set _sortIds=!_sortIds:PreviewVL_=Volume_!
+set _sortIds=!_sortIds:PreInstallR_=Retail_!
+
+::========================================================================================================================================
+
 :oh_clearblock
 
 ::  Find remnants of Office vNext/shared/device license block and remove it because it stops other licenses from appearing
@@ -1134,6 +1175,7 @@ rmdir /s /q "%ProgramData%\Microsoft\Office\Licenses\" %nul%
 for %%x in (15 16) do (
 for %%# in (%_sidlist%) do (
 reg delete HKU\%%#\Software\Microsoft\Office\%%x.0\Common\Licensing /f %nul%
+reg delete HKU\%%#\Software\Microsoft\Office\%%x.0\Common\Identity /f %nul%
 
 for /f "skip=2 tokens=2*" %%a in ('"reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\%%#" /v ProfileImagePath" %nul6%') do (
 rmdir /s /q "%%b\AppData\Local\Microsoft\Office\Licenses\" %nul%
@@ -1156,6 +1198,7 @@ if exist "%%b\AppData\Local\Packages\Microsoft.Office.Desktop_8wekyb3d8bbwe\Syst
 set defname=DEFTEMP-%%#
 reg load HKU\!defname! "%%b\AppData\Local\Packages\Microsoft.Office.Desktop_8wekyb3d8bbwe\SystemAppData\Helium\User.dat" %nul%
 reg delete HKU\!defname!\Software\Microsoft\Office\16.0\Common\Licensing /f %nul%
+reg delete HKU\!defname!\Software\Microsoft\Office\16.0\Common\Identity /f %nul%
 reg unload HKU\!defname! %nul%
 )
 )
@@ -1199,7 +1242,7 @@ echo Clearing Office License Blocks          [Successfully cleared from all %cou
 set defname=DEFTEMP-%random%
 for /f "skip=2 tokens=2*" %%a in ('"reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" /v Default" %nul6%') do call set "defdat=%%b"
 
-if defined o16c2r if defined ohookact (
+if defined o16c2r if defined officeact (
 if exist "%defdat%\NTUSER.DAT" (
 reg load HKU\%defname% "%defdat%\NTUSER.DAT" %nul%
 reg query HKU\%defname%\Software %nul% && (
@@ -1235,8 +1278,11 @@ set upk_result=0
 call :dk_actid 0ff1ce15-a989-479d-af46-f275c6370663
 
 if "%_actprojvis%"=="1" (
-for /f "delims=" %%a in ('%psc% "Get-WmiObject -Query 'SELECT ID, Description, LicenseFamily FROM %spp% WHERE ApplicationID=''0ff1ce15-a989-479d-af46-f275c6370663'' AND PartialProductKey IS NOT NULL' | Where-Object { $_.LicenseFamily -notmatch 'Project' -and $_.LicenseFamily -notmatch 'Visio' } | Select-Object -ExpandProperty ID" %nul6%') do call set "_allactid=%%a !_allactid!"
+set _allactid=
-for /f "delims=" %%a in ('%psc% "Get-WmiObject -Query 'SELECT ID, Description, LicenseFamily FROM %spp% WHERE ApplicationID=''0ff1ce15-a989-479d-af46-f275c6370663'' AND PartialProductKey IS NOT NULL' | Where-Object { '!_allactid!' -contains $_.ID -and ($_.LicenseFamily -match 'Project' -or $_.LicenseFamily -match 'Visio') } | Select-Object -ExpandProperty ID" %nul6%') do call set "_allactid=%%a !_allactid!"
+for /f "delims=" %%a in ('%psc% "(Get-WmiObject -Query 'SELECT ID, Description, LicenseFamily FROM %spp% WHERE ApplicationID=''0ff1ce15-a989-479d-af46-f275c6370663'' AND PartialProductKey IS NOT NULL' | Where-Object { $_.LicenseFamily -notmatch 'Project' -and $_.LicenseFamily -notmatch 'Visio' }).ID" %nul6%') do call set "_allactid=%%a !_allactid!"
+for /f "delims=" %%a in ('%psc% "(Get-WmiObject -Query 'SELECT ID, Description, LicenseFamily FROM %spp% WHERE ApplicationID=''0ff1ce15-a989-479d-af46-f275c6370663'' AND PartialProductKey IS NOT NULL' | Where-Object { $_.Description -match 'KMSCLIENT' -and ($_.LicenseFamily -match 'Project' -or $_.LicenseFamily -match 'Visio') }).ID" %nul6%') do call set "_allactid=%%a !_allactid!"
+) else (
+for /f "delims=" %%a in ('%psc% "(Get-WmiObject -Query 'SELECT ID FROM %spp% WHERE ApplicationID=''0ff1ce15-a989-479d-af46-f275c6370663'' AND LicenseStatus=1 AND GracePeriodRemaining=0 AND PartialProductKey IS NOT NULL').ID" %nul6%') do call set "_allactid=%%a !_allactid!"
 )
 
 for %%# in (%apps%) do (
@@ -1254,7 +1300,7 @@ set upk_result=2
 )
 )
 
-if defined ohookact if not %upk_result%==0 echo:
+if defined officeact if not %upk_result%==0 echo:
 if %upk_result%==1 echo Uninstalling Other/Grace Keys           [Successful]
 if %upk_result%==2 call :dk_color %Red% "Uninstalling Other/Grace Keys           [Failed]"
 exit /b
@@ -1663,11 +1709,6 @@ echo %serv_e% | findstr /i "ClipSVC-1058 sppsvc-1058" %nul% && (
 call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."
 set showfix=1
 )
-echo %serv_e% | findstr /i "sppsvc-1060" %nul% && (
-set fixes=%fixes% %mas%fix_service
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%fix_service"
-set showfix=1
-)
 )
 
 ::========================================================================================================================================
@@ -1686,10 +1727,10 @@ call :dk_color2 %Red% "Checking Boot Mode                      [%safeboot_option
 for /f "skip=2 tokens=2*" %%A in ('reg query "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Setup\State" /v ImageState') do (set imagestate=%%B)
 
 if /i not "%imagestate%"=="IMAGE_STATE_COMPLETE" (
-call :dk_color %Gray% "Checking Windows Setup State            [%imagestate%]"
-echo "%imagestate%" | find /i "RESEAL" %nul% && (
 set error=1
 set showfix=1
+call :dk_color %Gray% "Checking Windows Setup State            [%imagestate%]"
+echo "%imagestate%" | find /i "RESEAL" %nul% && (
 call :dk_color %Blue% "You need to run it in normal mode in case you are running it in Audit Mode."
 )
 echo "%imagestate%" | find /i "UNDEPLOYABLE" %nul% && (
@@ -1718,8 +1759,9 @@ echo Checking WPA Registry Count             [%wpainfo%]
 )
 
 
-if not defined notwinact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (
+if not defined officeact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Eval" %nul1% || (
+set error=1
 call :dk_color %Red% "Checking Eval Packages                  [Non-Eval Licenses are installed in Eval Windows]"
 set fixes=%fixes% %mas%evaluation_editions
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation_editions"
@@ -1741,17 +1783,19 @@ if "%osSKU%"=="164" set osedition=ProfessionalEducation
 if "%osSKU%"=="165" set osedition=ProfessionalEducationN
 )
 
-if not defined notwinact (
+if not defined officeact (
 if %osedition%==0 (
 call :dk_color %Red% "Checking Edition Name                   [Not Found In Registry]"
 ) else (
 
 if not exist "%SysPath%\spp\tokens\skus\%osedition%\%osedition%*.xrm-ms" if not exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" (
+set error=1
 set skunotfound=1
 call :dk_color %Red% "Checking License Files                  [Not Found] [%osedition%]"
 )
 
 if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
+set error=1
 call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 )
 )
@@ -1782,7 +1826,7 @@ set showfix=1
 )
 
 
-if not defined notwinact (
+if not defined officeact (
 if %winbuild% GEQ 10240 (
 %nul% set /a "sum=%slcSKU%+%regSKU%+%wmiSKU%"
 set /a "sum/=3"
@@ -1815,7 +1859,11 @@ call :dk_color2 %Red% "Checking ClipSVC                        " %Blue% "[System
 ::  This "WLMS" service was included in previous Eval editions (which were activable) to automatically shut down the system every hour after the evaluation period expired and prevent SPPSVC from stopping.
 
 if exist "%SysPath%\wlms\wlms.exe" (
+if %winbuild% LSS 9200 (
 echo Checking Eval WLMS Service              [Found]
+) else (
+call :dk_color %Red% "Checking Eval WLMS Service              [Found]"
+)
 )
 
 
@@ -1846,13 +1894,14 @@ for /f "skip=2 tokens=2*" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT
 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v "SkipRearm" /t REG_DWORD /d "0" /f %nul%
 call :dk_color %Red% "Checking SkipRearm                      [Default 0 Value Not Found. Changing To 0]"
 %psc% "Start-Job { Stop-Service sppsvc -force } | Wait-Job -Timeout 20 | Out-Null"
+set error=1
 )
 
 
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (
 call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found]"
 set fixes=%fixes% %mas%issues_due_to_gaming_spoofers
-call :dk_color2 %Blue% "Most likely caused by gaming spoofers. Help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"
+call :dk_color2 %Blue% "Most likely caused by HWID spoofers. Help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"
 set error=1
 set showfix=1
 )
@@ -1891,7 +1940,6 @@ set showfix=1
 )
 
 
-if not defined notwinact (
 call :dk_actid 55c92734-d682-4d71-983e-d6ec3f16059f
 if not defined apps (
 %psc% "Start-Job { Stop-Service sppsvc -force } | Wait-Job -Timeout 20 | Out-Null; $sls = Get-WmiObject SoftwareLicensingService; $f=[io.file]::ReadAllText('!_batp!') -split ':xrm\:.*';iex ($f[1]); ReinstallLicenses" %nul%
@@ -1900,13 +1948,12 @@ if not defined apps (
 set "_notfoundids=Key Not Installed / Act ID Not Found"
 call :dk_actids 55c92734-d682-4d71-983e-d6ec3f16059f
 if not defined allapps (
-set error=1
 set "_notfoundids=Not found"
 )
+set error=1
 call :dk_color %Red% "Checking Activation IDs                 [!_notfoundids!]"
 )
 )
-)
 
 
 if exist "%tokenstore%\" if not exist "%tokenstore%\tokens.dat" (
@@ -1916,15 +1963,12 @@ call :dk_color %Red% "Checking SPP tokens.dat                 [Not Found] [%toke
 
 
 if %winbuild% GEQ 9200 if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (
-%psc% "Get-WmiObject -Query 'SELECT Description FROM SoftwareLicensingProduct WHERE PartialProductKey IS NOT NULL AND LicenseDependsOn IS NULL' | Select-Object -Property Description" %nul2% | findstr /i "KMS_" %nul1% || (
 for /f "delims=" %%a in ('%psc% "(Get-ScheduledTask -TaskName 'SvcRestartTask' -TaskPath '\Microsoft\Windows\SoftwareProtectionPlatform\').State" %nul6%') do (set taskinfo=%%a)
 echo !taskinfo! | find /i "Ready" %nul% || (
 reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v "actionlist" /f %nul%
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Schedule\TaskCache\Tree\Microsoft\Windows\SoftwareProtectionPlatform\SvcRestartTask" %nul% || set taskinfo=Removed
 if "!taskinfo!"=="" set "taskinfo=Not Found"
 call :dk_color %Red% "Checking SvcRestartTask Status          [!taskinfo!, System might deactivate later]"
-if not defined error call :dk_color %Blue% "Reboot your machine using the restart option."
-)
 )
 )
 
@@ -2066,7 +2110,10 @@ echo:
 if %_unattended%==1 timeout /t 2 & exit /b
 
 if defined fixes (
+call :dk_color %White% "                                   "
 call :dk_color %White% "Follow ALL the ABOVE blue lines.   "
+call :dk_color %White% "                                   "
+echo:
 call :dk_color2 %Blue% "Press [1] to Open Support Webpage " %Gray% " Press [0] to Ignore"
 choice /C:10 /N
 if !errorlevel!==1 (for %%# in (%fixes%) do (start %%#))
@@ -2097,7 +2144,6 @@ set f=
 for %%# in (
 :: Office 2013
 15_ab4d047b-97cf-4126-a69f-34df08e2f254_B7RFY-7NXPK-Q4342-Y9X2H-3J%f%X4X_Retail________AccessRetail
-15_259de5be-492b-44b3-9d78-9645f848f7b0_X3XNB-HJB7K-66THH-8DWQ3-XH%f%GJP_Bypass________AccessRuntimeRetail
 15_4374022d-56b8-48c1-9bb7-d8f2fc726343_9MF9G-CN32B-HV7XT-9XJ8T-9K%f%VF4_MAK___________AccessVolume
 15_1b1d9bd5-12ea-4063-964c-16e7e87d6e08_NT889-MBH4X-8MD4H-X8R2D-WQ%f%HF8_Retail________ExcelRetail
 15_ac1ae7fd-b949-4e04-a330-849bc40638cf_Y3N36-YCHDK-XYWBG-KYQVV-BD%f%TJ2_MAK___________ExcelVolume
@@ -2105,8 +2151,6 @@ for %%# in (
 15_4825ac28-ce41-45a7-9e6e-1fed74057601_RN84D-7HCWY-FTCBK-JMXWM-HT%f%7GJ_MAK___________GrooveVolume
 15_c02fb62e-1cd5-4e18-ba25-e0480467ffaa_2WQNF-GBK4B-XVG6F-BBMX7-M4%f%F2Y_OEM-Perp______HomeBusinessPipcRetail
 15_a2b90e7a-a797-4713-af90-f0becf52a1dd_YWD4R-CNKVT-VG8VJ-9333B-RC%f%W9F_Subscription__HomeBusinessRetail
-15_1fdfb4e4-f9c9-41c4-b055-c80daf00697d_B92QY-NKYFQ-6KTKH-VWW2Q-3P%f%B3B_OEM-ARM_______HomeStudentARMRetail
-15_ebef9f05-5273-404a-9253-c5e252f50555_QPG96-CNT7M-KH36K-KY4HQ-M7%f%TBR_OEM-ARM_______HomeStudentPlusARMRetail
 15_f2de350d-3028-410a-bfae-283e00b44d0e_6WW3N-BDGM9-PCCHD-9QPP9-P3%f%4QG_Subscription__HomeStudentRetail
 15_44984381-406e-4a35-b1c3-e54f499556e2_RV7NQ-HY3WW-7CKWH-QTVMW-29%f%VHC_Retail________InfoPathRetail
 15_9e016989-4007-42a6-8051-64eb97110cf2_C4TGN-QQW6Y-FYKXC-6WJW7-X7%f%3VG_MAK___________InfoPathVolume
@@ -2146,15 +2190,15 @@ for %%# in (
 15_9cedef15-be37-4ff0-a08a-13a045540641_RPHPB-Y7NC4-3VYFM-DW7VD-G8%f%YJ8_MAK___________WordVolume
 :: Office 365 - 15.0 version
 15_742178ed-6b28-42dd-b3d7-b7c0ea78741b_Y9NF9-M2QWD-FF6RJ-QJW36-RR%f%F2T_SubTest_______O365BusinessRetail
-15_a96f8dae-da54-4fad-bdc6-108da592707a_3NMDC-G7C3W-68RGP-CB4MH-4C%f%XCH_SubTest1______O365HomePremRetail
+15_537ea5b5-7d50-4876-bd38-a53a77caca32_J2W28-TN9C8-26PWV-F7J4G-72%f%XCB_Subscription1_O365HomePremRetail
 15_e3dacc06-3bc2-4e13-8e59-8e05f3232325_H8DN8-Y2YP3-CR9JT-DHDR9-C7%f%GP3_Subscription2_O365ProPlusRetail
-15_0bc1dae4-6158-4a1c-a893-807665b934b2_2QCNB-RMDKJ-GC8PB-7QGQV-7Q%f%TQJ_Subscription2_O365SmallBusPremRetail
+15_bacd4614-5bef-4a5e-bafc-de4c788037a2_HN8JP-87TQJ-PBF3P-Y66KC-W2%f%K9V_Subscription1_O365SmallBusPremRetail
 :: Office 365 - 16.0 version
 16_742178ed-6b28-42dd-b3d7-b7c0ea78741b_Y9NF9-M2QWD-FF6RJ-QJW36-RR%f%F2T_SubTest_______O365BusinessRetail
 16_2f5c71b4-5b7a-4005-bb68-f9fac26f2ea3_W62NQ-267QR-RTF74-PF2MH-JQ%f%MTH_Subscription__O365EduCloudRetail
-16_a96f8dae-da54-4fad-bdc6-108da592707a_3NMDC-G7C3W-68RGP-CB4MH-4C%f%XCH_SubTest1______O365HomePremRetail
+16_537ea5b5-7d50-4876-bd38-a53a77caca32_J2W28-TN9C8-26PWV-F7J4G-72%f%XCB_Subscription1_O365HomePremRetail
 16_e3dacc06-3bc2-4e13-8e59-8e05f3232325_H8DN8-Y2YP3-CR9JT-DHDR9-C7%f%GP3_Subscription2_O365ProPlusRetail
-16_0bc1dae4-6158-4a1c-a893-807665b934b2_2QCNB-RMDKJ-GC8PB-7QGQV-7Q%f%TQJ_Subscription2_O365SmallBusPremRetail
+16_bacd4614-5bef-4a5e-bafc-de4c788037a2_HN8JP-87TQJ-PBF3P-Y66KC-W2%f%K9V_Subscription1_O365SmallBusPremRetail
 :: Office 2016
 16_bfa358b0-98f1-4125-842e-585fa13032e6_WHK4N-YQGHB-XWXCC-G3HYC-6J%f%F94_Retail________AccessRetail
 16_9d9faf9e-d345-4b49-afce-68cb0a539c7c_RNB7V-P48F4-3FYY6-2P3R3-63%f%BQV_PrepidBypass__AccessRuntimeRetail
@@ -2163,8 +2207,6 @@ for %%# in (
 16_685062a7-6024-42e7-8c5f-6bb9e63e697f_FVGNR-X82B2-6PRJM-YT4W7-8H%f%V36_MAK___________ExcelVolume
 16_c02fb62e-1cd5-4e18-ba25-e0480467ffaa_2WQNF-GBK4B-XVG6F-BBMX7-M4%f%F2Y_OEM-Perp______HomeBusinessPipcRetail
 16_86834d00-7896-4a38-8fae-32f20b86fa2b_HM6FM-NVF78-KV9PM-F36B8-D9%f%MXD_Retail________HomeBusinessRetail
-16_090896a0-ea98-48ac-b545-ba5da0eb0c9c_PBQPJ-NC22K-69MXD-KWMRF-WF%f%G77_OEM-ARM_______HomeStudentARMRetail
-16_6bbe2077-01a4-4269-bf15-5bf4d8efc0b2_6F2NY-7RTX4-MD9KM-TJ43H-94%f%TBT_OEM-ARM_______HomeStudentPlusARMRetail
 16_c28acdb8-d8b3-4199-baa4-024d09e97c99_PNPRV-F2627-Q8JVC-3DGR9-WT%f%YRK_Retail________HomeStudentRetail
 16_e2127526-b60c-43e0-bed1-3c9dc3d5a468_YWD4R-CNKVT-VG8VJ-9333B-RC%f%3B8_Retail________HomeStudentVNextRetail
 16_69ec9152-153b-471a-bf35-77ec88683eae_VNWHF-FKFBW-Q2RGD-HYHWF-R3%f%HH2_Subscription__MondoRetail
@@ -2211,8 +2253,6 @@ for %%# in (
 16_c201c2b7-02a1-41a8-b496-37c72910cd4a_KBPNW-64CMM-8KWCB-23F44-8B%f%7HM_Retail________Excel2019Retail
 16_05cb4e1d-cc81-45d5-a769-f34b09b9b391_8NT4X-GQMCK-62X4P-TW6QP-YK%f%PYF_MAK-AE________Excel2019Volume
 16_7fe09eef-5eed-4733-9a60-d7019df11cac_QBN2Y-9B284-9KW78-K48PB-R6%f%2YT_Retail________HomeBusiness2019Retail
-16_6303d14a-afad-431f-8434-81052a65f575_DJTNY-4HDWM-TDWB2-8PWC2-W2%f%RRT_OEM-ARM_______HomeStudentARM2019Retail
-16_215c841d-ffc1-4f03-bd11-5b27b6ab64cc_NM8WT-CFHB2-QBGXK-J8W6J-GV%f%K8F_OEM-ARM_______HomeStudentPlusARM2019Retail
 16_4539aa2c-5c31-4d47-9139-543a868e5741_XNWPM-32XQC-Y7QJC-QGGBV-YY%f%7JK_Retail________HomeStudent2019Retail
 16_20e359d5-927f-47c0-8a27-38adbdd27124_WR43D-NMWQQ-HCQR2-VKXDR-37%f%B7H_Retail________Outlook2019Retail
 16_92a99ed8-2923-4cb7-a4c5-31da6b0b8cf3_RN3QB-GT6D7-YB3VH-F3RPB-3G%f%QYB_MAK-AE________Outlook2019Volume
@@ -2242,14 +2282,11 @@ for %%# in (
 :: Office 2021
 16_f634398e-af69-48c9-b256-477bea3078b5_P286B-N3XYP-36QRQ-29CMP-RV%f%X9M_Retail________Access2021Retail
 16_ae17db74-16b0-430b-912f-4fe456e271db_JBH3N-P97FP-FRTJD-MGK2C-VF%f%WG6_MAK-AE________Access2021Volume
-16_844c36cb-851c-49e7-9079-12e62a049e2a_MNX9D-PB834-VCGY2-K2RW2-2D%f%P3D_Bypass________AccessRuntime2021Retail
 16_fb099c19-d48b-4a2f-a160-4383011060aa_V6QFB-7N7G9-PF7W9-M8FQM-MY%f%8G9_Retail________Excel2021Retail
 16_9da1ecdb-3a62-4273-a234-bf6d43dc0778_WNYR4-KMR9H-KVC8W-7HJ8B-K7%f%9DQ_MAK-AE________Excel2021Volume
 16_38b92b63-1dff-4be7-8483-2a839441a2bc_JM99N-4MMD8-DQCGJ-VMYFY-R6%f%3YK_Subscription__HomeBusiness2021Retail
 16_2f258377-738f-48dd-9397-287e43079958_N3CWD-38XVH-KRX2Y-YRP74-6R%f%BB2_Subscription__HomeStudent2021Retail
 16_279706f4-3a4b-4877-949b-f8c299cf0cc5_NB2TQ-3Y79C-77C6M-QMY7H-7Q%f%Y8P_Retail________OneNote2021Retail
-16_0c7af60d-0664-49fc-9b01-41b2dea81380_THNKC-KFR6C-Y86Q9-W8CB3-GF%f%7PD_MAK-AE________OneNote2021Volume
-16_778ccb9a-2f6a-44e5-853c-eb22b7609643_CNM3W-V94GB-QJQHH-BDQ3J-33%f%Y8H_Bypass________OneNoteFree2021Retail
 16_ecea2cfa-d406-4a7f-be0d-c6163250d126_4NCWR-9V92Y-34VB2-RPTHR-YT%f%GR7_Retail________Outlook2021Retail
 16_45bf67f9-0fc8-4335-8b09-9226cef8a576_JQ9MJ-QYN6B-67PX9-GYFVY-QJ%f%6TB_MAK-AE________Outlook2021Volume
 16_8f89391e-eedb-429d-af90-9d36fbf94de6_RRRYB-DN749-GCPW4-9H6VK-HC%f%HPT_Retail________Personal2021Retail
@@ -2328,6 +2365,12 @@ if defined _oIds (set _oIds=!_oIds! %%E) else (set _oIds=%%E)
 )
 )
 
+if %1==findactivated if %oVer%==%%A (
+echo "!_FsortIds!" | find /i "-%%E-" %nul% && (
+set actiProds%oVer%=!actiProds%oVer%! -%%E-
+)
+)
+
 )
 )
 exit /b

MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd

@@ -1,4 +1,4 @@
-@set masver=3.0
+@set masver=2.8
 @echo off
 
 
@@ -134,7 +134,7 @@ echo:
 echo Null service is not running, script may crash...
 echo:
 echo:
-echo Help - %mas%fix_service
+echo Help - %mas%troubleshoot
 echo:
 echo:
 ping 127.0.0.1 -n 20
@@ -192,16 +192,6 @@ for %%A in (%_actwin% %_actoff% %_actprojvis% %_actwinoff% %_uni%) do (if "%%A"=
 
 call :dk_setvar
 
-if %winbuild% EQU 1 (
-%eline%
-echo Failed to detect Windows build number.
-echo:
-setlocal EnableDelayedExpansion
-set fixes=%fixes% %mas%troubleshoot
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
-goto dk_done
-)
-
 if %winbuild% LSS 7600 (
 %nceline%
 echo Unsupported OS version detected [%winbuild%].
@@ -243,9 +233,9 @@ goto dk_done
 
 ::  Check PowerShell
 
-REM :PStest: $ExecutionContext.SessionState.LanguageMode :PStest:
+REM :PowerShellTest: $ExecutionContext.SessionState.LanguageMode :PowerShellTest:
 
-cmd /c "%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':PStest:\s*';iex ($f[1])"" | find /i "FullLanguage" %nul1% || (
+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:
@@ -326,13 +316,9 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
 
 set -=
 set old=
-set upver=%masver:.=%
 
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (
+for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not "%%#"=="" set old=1
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (
-if not "%%#"=="" set old=
-)
 )
 
 if defined old (
@@ -348,7 +334,7 @@ echo:
 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 %mas% & exit /b)
+if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
 )
 )
 
@@ -497,7 +483,6 @@ set "_serv=sppsvc Winmgmt"
 ::  Software Protection
 ::  Windows Management Instrumentation
 
-if %_actwin%==0 set notwinact=1
 call :dk_errorcheck
 
 ::========================================================================================================================================
@@ -534,7 +519,6 @@ call :dk_color %Red% "Checking Evaluation Edition             [Evaluation editio
 if defined _evalserv (
 call :dk_color %Blue% "Go back to main menu and use [Change Edition] option."
 ) else (
-call :dk_color %Blue% "Use TSforge activation option from the main menu to reset evaluation period."
 set fixes=%fixes% %mas%evaluation_editions
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation_editions"
 )
@@ -597,7 +581,10 @@ call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
 
 if not defined skunotfound if not defined sppks (
 call :dk_color %Red% "This product does not support %KS% activation."
-call :dk_color %Blue% "Use TSforge activation option from the main menu."
+if %winbuild% LSS 9200 (
+call :dk_color2 %Blue% "Use the alternative activator listed here - " %_Yellow% " %mas%unsupported_products_activation"
+)
+set fixes=%fixes% %mas%unsupported_products_activation
 )
 echo:
 goto :ks_office
@@ -1341,6 +1328,7 @@ rmdir /s /q "%ProgramData%\Microsoft\Office\Licenses\" %nul%
 for %%x in (15 16) do (
 for %%# in (%_sidlist%) do (
 reg delete HKU\%%#\Software\Microsoft\Office\%%x.0\Common\Licensing /f %nul%
+reg delete HKU\%%#\Software\Microsoft\Office\%%x.0\Common\Identity /f %nul%
 
 for /f "skip=2 tokens=2*" %%a in ('"reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\%%#" /v ProfileImagePath" %nul6%') do (
 rmdir /s /q "%%b\AppData\Local\Microsoft\Office\Licenses\" %nul%
@@ -1363,6 +1351,7 @@ if exist "%%b\AppData\Local\Packages\Microsoft.Office.Desktop_8wekyb3d8bbwe\Syst
 set defname=DEFTEMP-%%#
 reg load HKU\!defname! "%%b\AppData\Local\Packages\Microsoft.Office.Desktop_8wekyb3d8bbwe\SystemAppData\Helium\User.dat" %nul%
 reg delete HKU\!defname!\Software\Microsoft\Office\16.0\Common\Licensing /f %nul%
+reg delete HKU\!defname!\Software\Microsoft\Office\16.0\Common\Identity /f %nul%
 reg unload HKU\!defname! %nul%
 )
 )
@@ -1406,7 +1395,7 @@ echo Clearing Office License Blocks          [Successfully cleared from all %cou
 set defname=DEFTEMP-%random%
 for /f "skip=2 tokens=2*" %%a in ('"reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" /v Default" %nul6%') do call set "defdat=%%b"
 
-if defined o16c2r if defined ohookact (
+if defined o16c2r if defined officeact (
 if exist "%defdat%\NTUSER.DAT" (
 reg load HKU\%defname% "%defdat%\NTUSER.DAT" %nul%
 reg query HKU\%defname%\Software %nul% && (
@@ -1442,8 +1431,11 @@ set upk_result=0
 call :dk_actid 0ff1ce15-a989-479d-af46-f275c6370663
 
 if "%_actprojvis%"=="1" (
-for /f "delims=" %%a in ('%psc% "Get-WmiObject -Query 'SELECT ID, Description, LicenseFamily FROM %spp% WHERE ApplicationID=''0ff1ce15-a989-479d-af46-f275c6370663'' AND PartialProductKey IS NOT NULL' | Where-Object { $_.LicenseFamily -notmatch 'Project' -and $_.LicenseFamily -notmatch 'Visio' } | Select-Object -ExpandProperty ID" %nul6%') do call set "_allactid=%%a !_allactid!"
+set _allactid=
-for /f "delims=" %%a in ('%psc% "Get-WmiObject -Query 'SELECT ID, Description, LicenseFamily FROM %spp% WHERE ApplicationID=''0ff1ce15-a989-479d-af46-f275c6370663'' AND PartialProductKey IS NOT NULL' | Where-Object { '!_allactid!' -contains $_.ID -and ($_.LicenseFamily -match 'Project' -or $_.LicenseFamily -match 'Visio') } | Select-Object -ExpandProperty ID" %nul6%') do call set "_allactid=%%a !_allactid!"
+for /f "delims=" %%a in ('%psc% "(Get-WmiObject -Query 'SELECT ID, Description, LicenseFamily FROM %spp% WHERE ApplicationID=''0ff1ce15-a989-479d-af46-f275c6370663'' AND PartialProductKey IS NOT NULL' | Where-Object { $_.LicenseFamily -notmatch 'Project' -and $_.LicenseFamily -notmatch 'Visio' }).ID" %nul6%') do call set "_allactid=%%a !_allactid!"
+for /f "delims=" %%a in ('%psc% "(Get-WmiObject -Query 'SELECT ID, Description, LicenseFamily FROM %spp% WHERE ApplicationID=''0ff1ce15-a989-479d-af46-f275c6370663'' AND PartialProductKey IS NOT NULL' | Where-Object { $_.Description -match 'KMSCLIENT' -and ($_.LicenseFamily -match 'Project' -or $_.LicenseFamily -match 'Visio') }).ID" %nul6%') do call set "_allactid=%%a !_allactid!"
+) else (
+for /f "delims=" %%a in ('%psc% "(Get-WmiObject -Query 'SELECT ID FROM %spp% WHERE ApplicationID=''0ff1ce15-a989-479d-af46-f275c6370663'' AND LicenseStatus=1 AND GracePeriodRemaining=0 AND PartialProductKey IS NOT NULL').ID" %nul6%') do call set "_allactid=%%a !_allactid!"
 )
 
 for %%# in (%apps%) do (
@@ -1461,7 +1453,7 @@ set upk_result=2
 )
 )
 
-if defined ohookact if not %upk_result%==0 echo:
+if defined officeact if not %upk_result%==0 echo:
 if %upk_result%==1 echo Uninstalling Other/Grace Keys           [Successful]
 if %upk_result%==2 call :dk_color %Red% "Uninstalling Other/Grace Keys           [Failed]"
 exit /b
@@ -1840,7 +1832,8 @@ if defined t_name (
 echo %prodname% cannot be KMS-activated on this computer due to unqualified OEM BIOS [0xC004F035].
 ) else (
 call :dk_color %Red% "%prodname% cannot be KMS-activated on this computer due to unqualified OEM BIOS [0xC004F035]."
-call :dk_color %Blue% "Use TSforge activation option from the main menu."
+set fixes=%fixes% %mas%unsupported_products_activation
+call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%unsupported_products_activation"
 )
 set oemerr=1
 set showfix=1
@@ -2817,11 +2810,6 @@ echo %serv_e% | findstr /i "ClipSVC-1058 sppsvc-1058" %nul% && (
 call :dk_color %Blue% "Reboot your machine using the restart option to fix this error."
 set showfix=1
 )
-echo %serv_e% | findstr /i "sppsvc-1060" %nul% && (
-set fixes=%fixes% %mas%fix_service
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%fix_service"
-set showfix=1
-)
 )
 
 ::========================================================================================================================================
@@ -2840,10 +2828,10 @@ call :dk_color2 %Red% "Checking Boot Mode                      [%safeboot_option
 for /f "skip=2 tokens=2*" %%A in ('reg query "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Setup\State" /v ImageState') do (set imagestate=%%B)
 
 if /i not "%imagestate%"=="IMAGE_STATE_COMPLETE" (
-call :dk_color %Gray% "Checking Windows Setup State            [%imagestate%]"
-echo "%imagestate%" | find /i "RESEAL" %nul% && (
 set error=1
 set showfix=1
+call :dk_color %Gray% "Checking Windows Setup State            [%imagestate%]"
+echo "%imagestate%" | find /i "RESEAL" %nul% && (
 call :dk_color %Blue% "You need to run it in normal mode in case you are running it in Audit Mode."
 )
 echo "%imagestate%" | find /i "UNDEPLOYABLE" %nul% && (
@@ -2872,8 +2860,9 @@ echo Checking WPA Registry Count             [%wpainfo%]
 )
 
 
-if not defined notwinact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (
+if not defined officeact if exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion" /v EditionID %nul2% | find /i "Eval" %nul1% || (
+set error=1
 call :dk_color %Red% "Checking Eval Packages                  [Non-Eval Licenses are installed in Eval Windows]"
 set fixes=%fixes% %mas%evaluation_editions
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%evaluation_editions"
@@ -2895,17 +2884,19 @@ if "%osSKU%"=="164" set osedition=ProfessionalEducation
 if "%osSKU%"=="165" set osedition=ProfessionalEducationN
 )
 
-if not defined notwinact (
+if not defined officeact (
 if %osedition%==0 (
 call :dk_color %Red% "Checking Edition Name                   [Not Found In Registry]"
 ) else (
 
 if not exist "%SysPath%\spp\tokens\skus\%osedition%\%osedition%*.xrm-ms" if not exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-%osedition%\*-%osedition%-*.xrm-ms" (
+set error=1
 set skunotfound=1
 call :dk_color %Red% "Checking License Files                  [Not Found] [%osedition%]"
 )
 
 if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
+set error=1
 call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 )
 )
@@ -2936,7 +2927,7 @@ set showfix=1
 )
 
 
-if not defined notwinact (
+if not defined officeact (
 if %winbuild% GEQ 10240 (
 %nul% set /a "sum=%slcSKU%+%regSKU%+%wmiSKU%"
 set /a "sum/=3"
@@ -2969,7 +2960,11 @@ call :dk_color2 %Red% "Checking ClipSVC                        " %Blue% "[System
 ::  This "WLMS" service was included in previous Eval editions (which were activable) to automatically shut down the system every hour after the evaluation period expired and prevent SPPSVC from stopping.
 
 if exist "%SysPath%\wlms\wlms.exe" (
+if %winbuild% LSS 9200 (
 echo Checking Eval WLMS Service              [Found]
+) else (
+call :dk_color %Red% "Checking Eval WLMS Service              [Found]"
+)
 )
 
 
@@ -3000,13 +2995,14 @@ for /f "skip=2 tokens=2*" %%a in ('reg query "HKLM\SOFTWARE\Microsoft\Windows NT
 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v "SkipRearm" /t REG_DWORD /d "0" /f %nul%
 call :dk_color %Red% "Checking SkipRearm                      [Default 0 Value Not Found. Changing To 0]"
 %psc% "Start-Job { Stop-Service sppsvc -force } | Wait-Job -Timeout 20 | Out-Null"
+set error=1
 )
 
 
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || (
 call :dk_color %Red% "Checking SPP Registry Key               [Incorrect ModuleId Found]"
 set fixes=%fixes% %mas%issues_due_to_gaming_spoofers
-call :dk_color2 %Blue% "Most likely caused by gaming spoofers. Help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"
+call :dk_color2 %Blue% "Most likely caused by HWID spoofers. Help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers"
 set error=1
 set showfix=1
 )
@@ -3045,7 +3041,6 @@ set showfix=1
 )
 
 
-if not defined notwinact (
 call :dk_actid 55c92734-d682-4d71-983e-d6ec3f16059f
 if not defined apps (
 %psc% "Start-Job { Stop-Service sppsvc -force } | Wait-Job -Timeout 20 | Out-Null; $sls = Get-WmiObject SoftwareLicensingService; $f=[io.file]::ReadAllText('!_batp!') -split ':xrm\:.*';iex ($f[1]); ReinstallLicenses" %nul%
@@ -3054,13 +3049,12 @@ if not defined apps (
 set "_notfoundids=Key Not Installed / Act ID Not Found"
 call :dk_actids 55c92734-d682-4d71-983e-d6ec3f16059f
 if not defined allapps (
-set error=1
 set "_notfoundids=Not found"
 )
+set error=1
 call :dk_color %Red% "Checking Activation IDs                 [!_notfoundids!]"
 )
 )
-)
 
 
 if exist "%tokenstore%\" if not exist "%tokenstore%\tokens.dat" (
@@ -3070,15 +3064,12 @@ call :dk_color %Red% "Checking SPP tokens.dat                 [Not Found] [%toke
 
 
 if %winbuild% GEQ 9200 if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*EvalEdition~*.mum" (
-%psc% "Get-WmiObject -Query 'SELECT Description FROM SoftwareLicensingProduct WHERE PartialProductKey IS NOT NULL AND LicenseDependsOn IS NULL' | Select-Object -Property Description" %nul2% | findstr /i "KMS_" %nul1% || (
 for /f "delims=" %%a in ('%psc% "(Get-ScheduledTask -TaskName 'SvcRestartTask' -TaskPath '\Microsoft\Windows\SoftwareProtectionPlatform\').State" %nul6%') do (set taskinfo=%%a)
 echo !taskinfo! | find /i "Ready" %nul% || (
 reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform" /v "actionlist" /f %nul%
 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Schedule\TaskCache\Tree\Microsoft\Windows\SoftwareProtectionPlatform\SvcRestartTask" %nul% || set taskinfo=Removed
 if "!taskinfo!"=="" set "taskinfo=Not Found"
 call :dk_color %Red% "Checking SvcRestartTask Status          [!taskinfo!, System might deactivate later]"
-if not defined error call :dk_color %Blue% "Reboot your machine using the restart option."
-)
 )
 )
 
@@ -3220,7 +3211,10 @@ echo:
 if %_unattended%==1 timeout /t 2 & exit /b
 
 if defined fixes (
+call :dk_color %White% "                                   "
 call :dk_color %White% "Follow ALL the ABOVE blue lines.   "
+call :dk_color %White% "                                   "
+echo:
 call :dk_color2 %Blue% "Press [1] to Open Support Webpage " %Gray% " Press [0] to Ignore"
 choice /C:10 /N
 if !errorlevel!==1 (for %%# in (%fixes%) do (start %%#))
@@ -3281,13 +3275,10 @@ for %%# in (
 14_db3bbc9c-ce52-41d1-a46f-1a1d68059119_WordR
 :: Office 2013
 15_ab4d047b-97cf-4126-a69f-34df08e2f254_AccessRetail
-15_259de5be-492b-44b3-9d78-9645f848f7b0_AccessRuntimeRetail
 15_1b1d9bd5-12ea-4063-964c-16e7e87d6e08_ExcelRetail
 15_cfaf5356-49e3-48a8-ab3c-e729ab791250_GrooveRetail
 15_c02fb62e-1cd5-4e18-ba25-e0480467ffaa_HomeBusinessPipcRetail
 15_a2b90e7a-a797-4713-af90-f0becf52a1dd_HomeBusinessRetail
-15_1fdfb4e4-f9c9-41c4-b055-c80daf00697d_HomeStudentARMRetail
-15_ebef9f05-5273-404a-9253-c5e252f50555_HomeStudentPlusARMRetail
 15_f2de350d-3028-410a-bfae-283e00b44d0e_HomeStudentRetail
 15_44984381-406e-4a35-b1c3-e54f499556e2_InfoPathRetail
 15_9103f3ce-1084-447a-827e-d6097f68c895_LyncAcademicRetail
@@ -3329,8 +3320,6 @@ for %%# in (
 16_c02fb62e-1cd5-4e18-ba25-e0480467ffaa_HomeBusinessPipcRetail
 16_86834d00-7896-4a38-8fae-32f20b86fa2b_HomeBusinessRetail
 16_c28acdb8-d8b3-4199-baa4-024d09e97c99_HomeStudentRetail
-16_090896a0-ea98-48ac-b545-ba5da0eb0c9c_HomeStudentARMRetail
-16_6bbe2077-01a4-4269-bf15-5bf4d8efc0b2_HomeStudentPlusARMRetail
 16_e2127526-b60c-43e0-bed1-3c9dc3d5a468_HomeStudentVNextRetail
 16_69ec9152-153b-471a-bf35-77ec88683eae_MondoRetail
 16_436366de-5579-4f24-96db-3893e4400030_OneNoteFreeRetail
@@ -3529,7 +3518,6 @@ ea509e87-07a1-4a45-9edc-eba5a39f36af_D6QFG-VBYP2-XQHM7-J97RH-VV%f%RCK__14_SmallB
 2d0882e7-a4e7-423b-8ccc-70d91e0158b1_HVHB3-C6FV7-KQX9W-YQG79-CR%f%Y7T__14_WordVL
 :: Office 2013
 6ee7622c-18d8-4005-9fb7-92db644a279b_NG2JY-H4JBT-HQXYP-78QH9-4J%f%M2D__15_AccessVolume_-AccessRetail-
-259de5be-492b-44b3-9d78-9645f848f7b0_X3XNB-HJB7K-66THH-8DWQ3-XH%f%GJP__15_AccessRuntimeRetail_[Bypass]
 f7461d52-7c2b-43b2-8744-ea958e0bd09a_VGPNG-Y7HQW-9RHP7-TKPV3-BG%f%7GB__15_ExcelVolume_-ExcelRetail-
 fb4875ec-0c6b-450f-b82b-ab57d8d1677f_H7R7V-WPNXQ-WCYYC-76BGV-VT%f%7GH__15_GrooveVolume_-GrooveRetail-
 a30b8040-d68a-423f-b0b5-9ce292ea5a8f_DKT8B-N7VXH-D963P-Q4PHY-F8%f%894__15_InfoPathVolume_-InfoPathRetail-
@@ -3547,7 +3535,7 @@ efe1f3e6-aea2-4144-a208-32aa872b6545_TGN6P-8MMBC-37P2F-XHXXK-P3%f%4VW__15_OneNot
 b322da9c-a2e2-4058-9e4e-f59a6970bd69_YC7DK-G2NP3-2QQC3-J6H88-GV%f%GXT__15_ProPlusVolume_-ProPlusRetail-ProfessionalPipcRetail-ProfessionalRetail-
 00c79ff1-6850-443d-bf61-71cde0de305f_PN2WF-29XG2-T9HJ7-JQPJR-FC%f%XK4__15_PublisherVolume_-PublisherRetail-
 ba3e3833-6a7e-445a-89d0-7802a9a68588_3NY6J-WHT3F-47BDV-JHF36-23%f%43W__15_SPDRetail_[PrepidBypass]
-b13afb38-cd79-4ae5-9f7f-eed058d750ca_KBKQT-2NMXY-JJWGP-M62JB-92%f%CD4__15_StandardVolume_-StandardRetail-HomeBusinessPipcRetail-HomeBusinessRetail-HomeStudentARMRetail-HomeStudentPlusARMRetail-HomeStudentRetail-PersonalPipcRetail-PersonalRetail-
+b13afb38-cd79-4ae5-9f7f-eed058d750ca_KBKQT-2NMXY-JJWGP-M62JB-92%f%CD4__15_StandardVolume_-StandardRetail-HomeBusinessPipcRetail-HomeBusinessRetail-HomeStudentRetail-PersonalPipcRetail-PersonalRetail-
 e13ac10e-75d0-4aff-a0cd-764982cf541c_C2FG9-N6J68-H8BTJ-BW3QX-RM%f%3B3__15_VisioProVolume_-VisioProRetail-
 ac4efaf0-f81f-4f61-bdf7-ea32b02ab117_J484Y-4NKBF-W2HMG-DBMJC-PG%f%WR7__15_VisioStdVolume_-VisioStdRetail-
 d9f5b1c6-5386-495a-88f9-9ad6b41ac9b3_6Q7VD-NX8JD-WJ2VH-88V73-4G%f%BJ7__15_WordVolume_-WordRetail-
@@ -3570,7 +3558,7 @@ d450596f-894d-49e0-966a-fd39ed4c4c64_XQNVK-8JYDB-WJ9W3-YJ8YR-WF%f%G99__16_ProPlu
 9103f3ce-1084-447a-827e-d6097f68c895_6MDN4-WF3FV-4WH3Q-W699V-RG%f%CMY__16_SkypeServiceBypassRetail_[PrepidBypass]
 971cd368-f2e1-49c1-aedd-330909ce18b6_4N4D8-3J7Y3-YYW7C-73HD2-V8%f%RHY__16_SkypeforBusinessEntryRetail_[PrepidBypass]
 83e04ee1-fa8d-436d-8994-d31a862cab77_869NQ-FJ69K-466HW-QYCP2-DD%f%BV6__16_SkypeforBusinessVolume_-SkypeforBusinessRetail-
-dedfa23d-6ed1-45a6-85dc-63cae0546de6_JNRGM-WHDWX-FJJG3-K47QV-DR%f%TFM__16_StandardVolume_-StandardRetail-HomeBusinessPipcRetail-HomeBusinessRetail-HomeStudentARMRetail-HomeStudentPlusARMRetail-HomeStudentRetail-HomeStudentVNextRetail-PersonalPipcRetail-PersonalRetail-
+dedfa23d-6ed1-45a6-85dc-63cae0546de6_JNRGM-WHDWX-FJJG3-K47QV-DR%f%TFM__16_StandardVolume_-StandardRetail-HomeBusinessPipcRetail-HomeBusinessRetail-HomeStudentRetail-HomeStudentVNextRetail-PersonalPipcRetail-PersonalRetail-
 6bf301c1-b94a-43e9-ba31-d494598c47fb_PD3PC-RHNGV-FXJ29-8JK7D-RJ%f%RJK__16_VisioProVolume_-VisioProRetail-
 b234abe3-0857-4f9c-b05a-4dc314f85557_69WXN-MBYV6-22PQG-3WGHK-RM%f%6XC__16_VisioProXVolume
 aa2a7821-1827-4c2c-8f1d-4513a34dda97_7WHWN-4T7MP-G96JF-G33KR-W8%f%GF4__16_VisioStdVolume_-VisioStdRetail-
@@ -3588,17 +3576,14 @@ c8f8a301-19f5-4132-96ce-2de9d4adbd33_7HD7K-N4PVK-BHBCQ-YWQRW-XW%f%4VK__16_Outloo
 9d3e4cca-e172-46f1-a2f4-1d2107051444_G2KWX-3NW6P-PY93R-JXK2T-C9%f%Y9V__16_Publisher2019Volume_-Publisher2019Retail-
 734c6c6e-b0ba-4298-a891-671772b2bd1b_NCJ33-JHBBY-HTK98-MYCV8-HM%f%KHJ__16_SkypeforBusiness2019Volume_-SkypeforBusiness2019Retail-
 f88cfdec-94ce-4463-a969-037be92bc0e7_N9722-BV9H6-WTJTT-FPB93-97%f%8MK__16_SkypeforBusinessEntry2019Retail_[PrepidBypass]
-6912a74b-a5fb-401a-bfdb-2e3ab46f4b02_6NWWJ-YQWMR-QKGCB-6TMB3-9D%f%9HK__16_Standard2019Volume_-Standard2019Retail-HomeBusiness2019Retail-HomeStudentARM2019Retail-HomeStudentPlusARM2019Retail-HomeStudent2019Retail-Personal2019Retail-
+6912a74b-a5fb-401a-bfdb-2e3ab46f4b02_6NWWJ-YQWMR-QKGCB-6TMB3-9D%f%9HK__16_Standard2019Volume_-Standard2019Retail-HomeBusiness2019Retail-HomeStudent2019Retail-Personal2019Retail-
 5b5cf08f-b81a-431d-b080-3450d8620565_9BGNQ-K37YR-RQHF2-38RQ3-7V%f%CBB__16_VisioPro2019Volume_-VisioPro2019Retail-
 e06d7df3-aad0-419d-8dfb-0ac37e2bdf39_7TQNQ-K3YQQ-3PFH7-CCPPM-X4%f%VQ2__16_VisioStd2019Volume_-VisioStd2019Retail-
 059834fe-a8ea-4bff-b67b-4d006b5447d3_PBX3G-NWMT6-Q7XBW-PYJGG-WX%f%D33__16_Word2019Volume_-Word2019Retail-
 :: Office 2021
-:: OneNote2021Volume KMS license is not available
-844c36cb-851c-49e7-9079-12e62a049e2a_MNX9D-PB834-VCGY2-K2RW2-2D%f%P3D__16_AccessRuntime2021Retail_[Bypass]
 1fe429d8-3fa7-4a39-b6f0-03dded42fe14_WM8YG-YNGDD-4JHDC-PG3F4-FC%f%4T4__16_Access2021Volume_-Access2021Retail-
 ea71effc-69f1-4925-9991-2f5e319bbc24_NWG3X-87C9K-TC7YY-BC2G7-G6%f%RVC__16_Excel2021Volume_-Excel2021Retail-
 a5799e4c-f83c-4c6e-9516-dfe9b696150b_C9FM6-3N72F-HFJXB-TM3V9-T8%f%6R9__16_Outlook2021Volume_-Outlook2021Retail-
-778ccb9a-2f6a-44e5-853c-eb22b7609643_CNM3W-V94GB-QJQHH-BDQ3J-33%f%Y8H__16_OneNoteFree2021Retail_[Bypass]
 6e166cc3-495d-438a-89e7-d7c9e6fd4dea_TY7XF-NFRBR-KJ44C-G83KF-GX%f%27K__16_PowerPoint2021Volume_-PowerPoint2021Retail-
 76881159-155c-43e0-9db7-2d70a9a3a4ca_FTNWT-C6WBT-8HMGF-K9PRX-QV%f%9H8__16_ProjectPro2021Volume_-ProjectPro2021Retail-
 6dd72704-f752-4b71-94c7-11cec6bfc355_J2JDC-NJCYY-9RGQ4-YXWMH-T3%f%D4T__16_ProjectStd2021Volume_-ProjectStd2021Retail-

MAS/Separate-Files-Version/Activators/ReadMe.txt

@@ -0,0 +1,12 @@
+--------------------------------------------------------------------------------------
+Activation Type        Supported Product        Activation Period
+--------------------------------------------------------------------------------------
+
+HWID                -  Windows 10-11         -  Permanent                           
+Ohook               -  Office                -  Permanent                           
+KMS38               -  Windows 10-11-Server  -  Till the Year 2038                  
+Online KMS          -  Windows / Office      -  180 Days. Lifetime With Renewal Task
+
+--------------------------------------------------------------------------------------
+
+For more details, use the respective docs section here https://massgrave.dev/

MAS/Separate-Files-Version/Activators/_ReadMe.txt

@@ -1,13 +0,0 @@
---------------------------------------------------------------------------------------
-Activation Type        Supported Product        Activation Period
---------------------------------------------------------------------------------------
-
-HWID                -  Windows 10-11          -  Permanent                           
-Ohook               -  Office                 -  Permanent                           
-TSforge             -  Windows / ESU / Office -  Permanent                           
-KMS38               -  Windows 10-11-Server   -  Till the Year 2038                  
-Online KMS          -  Windows / Office       -  180 Days. Lifetime With Renewal Task
-
---------------------------------------------------------------------------------------
-
-For more details, check https://massgrave.dev/activations_comparison

MAS/Separate-Files-Version/Change_Office_Edition.cmd

@@ -1,4 +1,4 @@
-@set masver=3.0
+@set masver=2.8
 @echo off
 
 
@@ -69,7 +69,7 @@ echo:
 echo Null service is not running, script may crash...
 echo:
 echo:
-echo Help - %mas%fix_service
+echo Help - %mas%troubleshoot
 echo:
 echo:
 ping 127.0.0.1 -n 20
@@ -123,16 +123,6 @@ set "line=echo _________________________________________________________________
 
 ::========================================================================================================================================
 
-if %winbuild% EQU 1 (
-%eline%
-echo Failed to detect Windows build number.
-echo:
-setlocal EnableDelayedExpansion
-set fixes=%fixes% %mas%troubleshoot
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
-goto dk_done
-)
-
 if %winbuild% LSS 7600 (
 %nceline%
 echo Unsupported OS version detected [%winbuild%].
@@ -174,9 +164,9 @@ goto dk_done
 
 ::  Check PowerShell
 
-REM :PStest: $ExecutionContext.SessionState.LanguageMode :PStest:
+REM :PowerShellTest: $ExecutionContext.SessionState.LanguageMode :PowerShellTest:
 
-cmd /c "%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':PStest:\s*';iex ($f[1])"" | find /i "FullLanguage" %nul1% || (
+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:
@@ -257,13 +247,9 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
 
 set -=
 set old=
-set upver=%masver:.=%
 
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (
+for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not "%%#"=="" set old=1
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (
-if not "%%#"=="" set old=
-)
 )
 
 if defined old (
@@ -279,7 +265,7 @@ echo:
 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 %mas% & exit /b)
+if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
 )
 )
 
@@ -1078,7 +1064,10 @@ call :oe_tempcleanup
 
 echo:
 if defined fixes (
+call :dk_color %White% "                                   "
 call :dk_color %White% "Follow ALL the ABOVE blue lines.   "
+call :dk_color %White% "                                   "
+echo:
 call :dk_color2 %Blue% "Press [1] to Open Support Webpage " %Gray% " Press [0] to Ignore"
 choice /C:10 /N
 if !errorlevel!==1 (for %%# in (%fixes%) do (start %%#))
@@ -1431,7 +1420,10 @@ echo:
 if %_unattended%==1 timeout /t 2 & exit /b
 
 if defined fixes (
+call :dk_color %White% "                                   "
 call :dk_color %White% "Follow ALL the ABOVE blue lines.   "
+call :dk_color %White% "                                   "
+echo:
 call :dk_color2 %Blue% "Press [1] to Open Support Webpage " %Gray% " Press [0] to Ignore"
 choice /C:10 /N
 if !errorlevel!==1 (for %%# in (%fixes%) do (start %%#))

MAS/Separate-Files-Version/Change_Windows_Edition.cmd

@@ -1,4 +1,4 @@
-@set masver=3.0
+@set masver=2.8
 @echo off
 
 
@@ -74,7 +74,7 @@ echo:
 echo Null service is not running, script may crash...
 echo:
 echo:
-echo Help - %mas%fix_service
+echo Help - %mas%troubleshoot
 echo:
 echo:
 ping 127.0.0.1 -n 20
@@ -128,16 +128,6 @@ set "line=echo _________________________________________________________________
 
 ::========================================================================================================================================
 
-if %winbuild% EQU 1 (
-%eline%
-echo Failed to detect Windows build number.
-echo:
-setlocal EnableDelayedExpansion
-set fixes=%fixes% %mas%troubleshoot
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
-goto dk_done
-)
-
 if %winbuild% LSS 7600 (
 %nceline%
 echo Unsupported OS version detected [%winbuild%].
@@ -179,9 +169,9 @@ goto dk_done
 
 ::  Check PowerShell
 
-REM :PStest: $ExecutionContext.SessionState.LanguageMode :PStest:
+REM :PowerShellTest: $ExecutionContext.SessionState.LanguageMode :PowerShellTest:
 
-cmd /c "%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':PStest:\s*';iex ($f[1])"" | find /i "FullLanguage" %nul1% || (
+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:
@@ -262,13 +252,9 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
 
 set -=
 set old=
-set upver=%masver:.=%
 
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (
+for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not "%%#"=="" set old=1
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (
-if not "%%#"=="" set old=
-)
 )
 
 if defined old (
@@ -284,7 +270,7 @@ echo:
 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 %mas% & exit /b)
+if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
 )
 )
 
@@ -350,12 +336,12 @@ if defined UBR (set "fullbuild=%%G.!UBR!") else (set "fullbuild=%%G.%%H")
 
 ::========================================================================================================================================
 
-::  Check Activation IDs
+::  Check Activation ID
 
-call :dk_actids 55c92734-d682-4d71-983e-d6ec3f16059f
+call :dk_actid 55c92734-d682-4d71-983e-d6ec3f16059f
-if not defined allapps (
+if not defined apps (
 %eline%
-echo Failed to find activation IDs. Aborting...
+echo Either key is not insalled or script failed to get installed key's activation ID. Aborting...
 echo:
 set fixes=%fixes% %mas%troubleshoot
 call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
@@ -369,7 +355,7 @@ goto dk_done
 set osedition=
 set dismnotworking=
 
-for /f "tokens=3 delims=: " %%a in ('DISM /English /Online /Get-CurrentEdition %nul6% ^| find /i "Current Edition :"') do set "osedition=%%a"
+for /f "tokens=3 delims=: " %%a in ('DISM /English /Online /Get-CurrentEdition %nul6% ^| find /i "1Current Edition :"') do set "osedition=%%a"
 if not defined osedition set dismnotworking=1
 
 if %_wmic% EQU 1 set "chkedi=for /f "tokens=2 delims==" %%a in ('"wmic path %spp% where (ApplicationID='55c92734-d682-4d71-983e-d6ec3f16059f' AND LicenseDependsOn is NULL AND PartialProductKey IS NOT NULL) get LicenseFamily /VALUE" %nul6%')"
@@ -407,7 +393,7 @@ if %winbuild% GEQ 10240 for /f "tokens=4" %%a in ('dism /online /english /Get-Ta
 if %winbuild% LSS 10240 for /f "tokens=4" %%a in ('%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':cbsxml\:.*';& ([ScriptBlock]::Create($f[1])) -GetTargetEditions;" ^| findstr /i /c:"Target Edition : "') do (if defined _ptarget (set "_ptarget= !_ptarget! %%a ") else (set "_ptarget= %%a "))
 
 if %winbuild% GEQ 10240 if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-Server*Edition~*.mum" (
-if %winbuild% GEQ 17063 call :ced_edilist
+call :ced_edilist
 if /i "%osedition:~0,4%"=="Core" set _pro=Professional
 if /i "%osedition%"=="CoreN" set _pro=ProfessionalN
 set "_dtarget= %_dtarget% !_wtarget! !_pro! "
@@ -520,7 +506,7 @@ set _dismapi=0
 
 ::  Check if DISM API or slmgr.vbs is required for edition upgrade
 
-if not exist "%SysPath%\spp\tokens\skus\%targetedition%\%targetedition%*.xrm-ms" (
+if not exist "%SysPath%\spp\tokens\skus\%targetedition%\" (
 echo %_wtarget% | find /i " %targetedition% " || (
 set _dismapi=1
 )
@@ -848,14 +834,14 @@ if %_wmic% EQU 1 wmic path %sps% where __CLASS='%sps%' call RefreshLicenseStatus
 if %_wmic% EQU 0 %psc% "$null=(([WMICLASS]'%sps%').GetInstances()).RefreshLicenseStatus()" %nul%
 exit /b
 
-::  Get all products Activation IDs
+::  Get installed products Activation IDs
 
-:dk_actids
+:dk_actid
 
-set allapps=
+set apps=
-if %_wmic% EQU 1 set "chkapp=for /f "tokens=2 delims==" %%a in ('"wmic path %spp% where (ApplicationID='%1') get ID /VALUE" %nul6%')"
+if %_wmic% EQU 1 set "chkapp=for /f "tokens=2 delims==" %%a in ('"wmic path %spp% where (ApplicationID='%1' and PartialProductKey is not null) get ID /VALUE" %nul6%')"
-if %_wmic% EQU 0 set "chkapp=for /f "tokens=2 delims==" %%a in ('%psc% "(([WMISEARCHER]'SELECT ID FROM %spp% WHERE ApplicationID=''%1''').Get()).ID ^| %% {echo ('ID='+$_)}" %nul6%')"
+if %_wmic% EQU 0 set "chkapp=for /f "tokens=2 delims==" %%a in ('%psc% "(([WMISEARCHER]'SELECT ID FROM %spp% WHERE ApplicationID=''%1'' AND PartialProductKey IS NOT NULL').Get()).ID ^| %% {echo ('ID='+$_)}" %nul6%')"
-%chkapp% do (if defined allapps (call set "allapps=!allapps! %%a") else (call set "allapps=%%a"))
+%chkapp% do (if defined apps (call set "apps=!apps! %%a") else (call set "apps=%%a"))
 exit /b
 
 ::  Get Edition list
@@ -1010,7 +996,10 @@ echo:
 if %_unattended%==1 timeout /t 2 & exit /b
 
 if defined fixes (
+call :dk_color %White% "                                   "
 call :dk_color %White% "Follow ALL the ABOVE blue lines.   "
+call :dk_color %White% "                                   "
+echo:
 call :dk_color2 %Blue% "Press [1] to Open Support Webpage " %Gray% " Press [0] to Ignore"
 choice /C:10 /N
 if !errorlevel!==1 (for %%# in (%fixes%) do (start %%#))

MAS/Separate-Files-Version/Check_Activation_Status.cmd

@@ -47,40 +47,20 @@ choice /c 0 /n
 exit /b
 
 :sppmgr:
-param (
-    [Parameter()]
-    [switch]
-    $All,
-    [Parameter()]
-    [switch]
-    $Dlv,
-    [Parameter()]
-    [switch]
-    $IID,
-    [Parameter()]
-    [switch]
-    $Pass
-)
-
-function CONOUT($strObj)
-{
-	Out-Host -Input $strObj
-}
-
 function ExitScript($ExitCode = 0)
 {
 	Exit $ExitCode
 }
 
 if (-Not $PSVersionTable) {
-	"==== ERROR ====`r`n"
+	Write-Host "==== ERROR ====`r`n"
-	"Windows PowerShell 1.0 is not supported by this script."
+	Write-Host 'Windows PowerShell 1.0 is not supported by this script.'
 	ExitScript 1
 }
 
 if ($ExecutionContext.SessionState.LanguageMode.value__ -NE 0) {
-	"==== ERROR ====`r`n"
+	Write-Host "==== ERROR ====`r`n"
-	"Windows PowerShell is not running in Full Language Mode."
+	Write-Host 'Windows PowerShell is not running in Full Language Mode.'
 	ExitScript 1
 }
 
@@ -88,34 +68,21 @@ $winbuild = 1
 try {
 	$winbuild = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("$env:SystemRoot\System32\kernel32.dll").FileBuildPart
 } catch {
-	$winbuild = [int]([wmi]'Win32_OperatingSystem=@').BuildNumber
+	$winbuild = [int](Get-WmiObject Win32_OperatingSystem).BuildNumber
 }
 
 if ($winbuild -EQ 1) {
-	"==== ERROR ====`r`n"
+	Write-Host "==== ERROR ====`r`n"
-	"Could not detect Windows build."
+	Write-Host 'Could not detect Windows build.'
 	ExitScript 1
 }
 
 if ($winbuild -LT 2600) {
-	"==== ERROR ====`r`n"
+	Write-Host "==== ERROR ====`r`n"
-	"This build of Windows is not supported by this script."
+	Write-Host 'This build of Windows is not supported by this script.'
 	ExitScript 1
 }
 
-if ($All.IsPresent)
-{
-	$isAll = {CONOUT "`r"}
-	$noAll = {$null}
-}
-else
-{
-	$isAll = {$null}
-	$noAll = {CONOUT "`r"}
-}
-$Dlv = $Dlv.IsPresent
-$IID = $IID.IsPresent -Or $Dlv.IsPresent
-
 $NT6 = $winbuild -GE 6000
 $NT7 = $winbuild -GE 7600
 $NT9 = $winbuild -GE 9600
@@ -127,10 +94,10 @@ $line3 = "____________________________________________________________"
 
 function echoWindows
 {
-	CONOUT "$line2"
+	Write-Host "$line2"
-	CONOUT "===                   Windows Status                     ==="
+	Write-Host "===                   Windows Status                     ==="
-	CONOUT "$line2"
+	Write-Host "$line2"
-	& $noAll
+	if (!$All.IsPresent) {Write-Host}
 }
 
 function echoOffice
@@ -139,22 +106,18 @@ function echoOffice
 		return
 	}
 
-	& $isAll
+	if ($All.IsPresent) {Write-Host}
-	CONOUT "$line2"
+	Write-Host "$line2"
-	CONOUT "===                   Office Status                      ==="
+	Write-Host "===                   Office Status                      ==="
-	CONOUT "$line2"
+	Write-Host "$line2"
-	& $noAll
+	if (!$All.IsPresent) {Write-Host}
 
 	$script:doMSG = 0
 }
 
 function strGetRegistry($strKey, $strName)
 {
-	try {
+Get-ItemProperty -EA 0 $strKey | select -EA 0 -Expand $strName
-		return [Microsoft.Win32.Registry]::GetValue($strKey, $strName, $null)
-	} catch {
-		return $null
-	}
 }
 
 function CheckOhook
@@ -185,57 +148,55 @@ function CheckOhook
 		return
 	}
 
-	& $isAll
+	if ($All.IsPresent) {Write-Host}
-	CONOUT "$line2"
+	Write-Host "$line2"
-	CONOUT "===                Office Ohook Status                   ==="
+	Write-Host "===                Office Ohook Status                   ==="
-	CONOUT "$line2"
+	Write-Host "$line2"
-	$host.UI.WriteLine('Yellow', 'Black', "`r`nOhook for permanent Office activation is installed.`r`nYou can ignore the below mentioned Office activation status.")
+	Write-Host
-	& $noAll
+	Write-Host -back 'Black' -fore 'Yellow' 'Ohook for permanent Office activation is installed.'
+	Write-Host -back 'Black' -fore 'Yellow' 'You can ignore the below mentioned Office activation status.'
+	if (!$All.IsPresent) {Write-Host}
 }
 
 #region WMI
-function DetectID($strSLP, $strAppId)
+function DetectID($strSLP, $strAppId, [ref]$strAppVar)
 {
-	$ppk = (" AND PartialProductKey <> NULL)", ")")[$All.IsPresent]
+	$fltr = "ApplicationID='$strAppId'"
-	$fltr = "SELECT ID FROM $strSLP WHERE (ApplicationID='$strAppId'"
+	if (!$All.IsPresent) {
-	$clause = $fltr + $ppk
+		$fltr = $fltr + " AND PartialProductKey <> NULL"
-	$sWmi = [wmisearcher]$clause
+	}
-	$sWmi.Options.Rewindable = $false
+	Get-WmiObject $strSLP ID -Filter $fltr -EA 0 | select ID -EA 0 | foreach {
-	return ($sWmi.Get().Count -GT 0)
+		$strAppVar.Value = 1
+	}
 }
 
-function GetID($strSLP, $strAppId)
+function GetID($strSLP, $strAppId, $strProperty = "ID")
 {
 	$NT5 = ($strSLP -EQ $wslp -And $winbuild -LT 6001)
 	$IDs = [Collections.ArrayList]@()
-	$isAdd = (" AND LicenseDependsOn <> NULL)", ")")[$NT5]
-	$noAdd = " AND LicenseDependsOn IS NULL)"
-	$query = "SELECT ID FROM $strSLP WHERE (ApplicationID='$strAppId' AND PartialProductKey"
 
 	if ($All.IsPresent) {
-		$fltr = $query + " IS NULL"
+		$fltr = "ApplicationID='$strAppId' AND PartialProductKey IS NULL"
-		$clause = $fltr + $isAdd
+		$clause = $fltr
-		$sWmi = [wmisearcher]$clause
-		$sWmi.Options.Rewindable = $false
-		try {$sWmi.Get() | select -Expand Properties -EA 0 | foreach {$IDs += $_.Value}} catch {}
 		if (-Not $NT5) {
-		$clause = $fltr + $noAdd
+		$clause = $fltr + " AND LicenseDependsOn <> NULL"
-		$sWmi = [wmisearcher]$clause
+		}
-		$sWmi.Options.Rewindable = $false
+		Get-WmiObject $strSLP $strProperty -Filter $clause -EA 0 | select -Expand $strProperty -EA 0 | foreach {$IDs += $_}
-		try {$sWmi.Get() | select -Expand Properties -EA 0 | foreach {$IDs += $_.Value}} catch {}
+		if (-Not $NT5) {
+		$clause = $fltr + " AND LicenseDependsOn IS NULL"
+		Get-WmiObject $strSLP $strProperty -Filter $clause -EA 0 | select -Expand $strProperty -EA 0 | foreach {$IDs += $_}
 		}
 	}
 
-	$fltr = $query + " <> NULL"
+	$fltr = "ApplicationID='$strAppId' AND PartialProductKey <> NULL"
-	$clause = $fltr + $isAdd
+	$clause = $fltr
-	$sWmi = [wmisearcher]$clause
-	$sWmi.Options.Rewindable = $false
-	try {$sWmi.Get() | select -Expand Properties -EA 0 | foreach {$IDs += $_.Value}} catch {}
 	if (-Not $NT5) {
-	$clause = $fltr + $noAdd
+	$clause = $fltr + " AND LicenseDependsOn <> NULL"
-	$sWmi = [wmisearcher]$clause
+	}
-	$sWmi.Options.Rewindable = $false
+	Get-WmiObject $strSLP $strProperty -Filter $clause -EA 0 | select -Expand $strProperty -EA 0 | foreach {$IDs += $_}
-	try {$sWmi.Get() | select -Expand Properties -EA 0 | foreach {$IDs += $_.Value}} catch {}
+	if (-Not $NT5) {
+	$clause = $fltr + " AND LicenseDependsOn IS NULL"
+	Get-WmiObject $strSLP $strProperty -Filter $clause -EA 0 | select -Expand $strProperty -EA 0 | foreach {$IDs += $_}
 	}
 
 	return $IDs
@@ -272,45 +233,38 @@ function DetectSubscription {
 		if ($objSvc.SubscriptionEdition.Contains("UNKNOWN") -EQ $false) {$SubMsgEdition = $objSvc.SubscriptionEdition}
 	}
 
-	CONOUT "`nSubscription information:"
+	Write-Host
-	CONOUT "    Edition: $SubMsgEdition"
+	Write-Host "Subscription information:"
-	CONOUT "    Type   : $SubMsgType"
+	Write-Host "    Edition: $SubMsgEdition"
-	CONOUT "    Status : $SubMsgStatus"
+	Write-Host "    Type   : $SubMsgType"
-	CONOUT "    Expiry : $SubMsgExpiry"
+	Write-Host "    Status : $SubMsgStatus"
-}
+	Write-Host "    Expiry : $SubMsgExpiry"
-
-function DetectAdbaClient
-{
-	CONOUT "`nAD Activation client information:"
-	CONOUT "    Object Name: $ADActivationObjectName"
-	CONOUT "    Domain Name: $ADActivationObjectDN"
-	CONOUT "    CSVLK Extended PID: $ADActivationCsvlkPid"
-	CONOUT "    CSVLK Activation ID: $ADActivationCsvlkSkuId"
 }
 
 function DetectAvmClient
 {
-	CONOUT "`nAutomatic VM Activation client information:"
+	Write-Host
+	Write-Host "Automatic VM Activation client information:"
 	if (-Not [String]::IsNullOrEmpty($IAID)) {
-		CONOUT "    Guest IAID: $IAID"
+		Write-Host "    Guest IAID: $IAID"
 	} else {
-		CONOUT "    Guest IAID: Not Available"
+		Write-Host "    Guest IAID: Not Available"
 	}
 	if (-Not [String]::IsNullOrEmpty($AutomaticVMActivationHostMachineName)) {
-		CONOUT "    Host machine name: $AutomaticVMActivationHostMachineName"
+		Write-Host "    Host machine name: $AutomaticVMActivationHostMachineName"
 	} else {
-		CONOUT "    Host machine name: Not Available"
+		Write-Host "    Host machine name: Not Available"
 	}
 	if ($AutomaticVMActivationLastActivationTime.Substring(0,4) -NE "1601") {
 		$EED = [DateTime]::Parse([Management.ManagementDateTimeConverter]::ToDateTime($AutomaticVMActivationLastActivationTime),$null,48).ToString('yyyy-MM-dd hh:mm:ss tt')
-		CONOUT "    Activation time: $EED UTC"
+		Write-Host "    Activation time: $EED UTC"
 	} else {
-		CONOUT "    Activation time: Not Available"
+		Write-Host "    Activation time: Not Available"
 	}
 	if (-Not [String]::IsNullOrEmpty($AutomaticVMActivationHostDigitalPid2)) {
-		CONOUT "    Host Digital PID2: $AutomaticVMActivationHostDigitalPid2"
+		Write-Host "    Host Digital PID2: $AutomaticVMActivationHostDigitalPid2"
 	} else {
-		CONOUT "    Host Digital PID2: Not Available"
+		Write-Host "    Host Digital PID2: Not Available"
 	}
 }
 
@@ -340,30 +294,32 @@ function DetectKmsHost
 		$KeyManagementServiceLowPriority = "Normal"
 	}
 
-	CONOUT "`nKey Management Service host information:"
+	Write-Host
-	CONOUT "    Current count: $KeyManagementServiceCurrentCount"
+	Write-Host "Key Management Service host information:"
-	CONOUT "    Listening on Port: $KeyManagementServiceListeningPort"
+	Write-Host "    Current count: $KeyManagementServiceCurrentCount"
-	CONOUT "    DNS publishing: $KeyManagementServiceDnsPublishing"
+	Write-Host "    Listening on Port: $KeyManagementServiceListeningPort"
-	CONOUT "    KMS priority: $KeyManagementServiceLowPriority"
+	Write-Host "    DNS publishing: $KeyManagementServiceDnsPublishing"
+	Write-Host "    KMS priority: $KeyManagementServiceLowPriority"
 	if (-Not [String]::IsNullOrEmpty($KeyManagementServiceTotalRequests)) {
-		CONOUT "`nKey Management Service cumulative requests received from clients:"
+		Write-Host
-		CONOUT "    Total: $KeyManagementServiceTotalRequests"
+		Write-Host "Key Management Service cumulative requests received from clients:"
-		CONOUT "    Failed: $KeyManagementServiceFailedRequests"
+		Write-Host "    Total: $KeyManagementServiceTotalRequests"
-		CONOUT "    Unlicensed: $KeyManagementServiceUnlicensedRequests"
+		Write-Host "    Failed: $KeyManagementServiceFailedRequests"
-		CONOUT "    Licensed: $KeyManagementServiceLicensedRequests"
+		Write-Host "    Unlicensed: $KeyManagementServiceUnlicensedRequests"
-		CONOUT "    Initial grace period: $KeyManagementServiceOOBGraceRequests"
+		Write-Host "    Licensed: $KeyManagementServiceLicensedRequests"
-		CONOUT "    Expired or Hardware out of tolerance: $KeyManagementServiceOOTGraceRequests"
+		Write-Host "    Initial grace period: $KeyManagementServiceOOBGraceRequests"
-		CONOUT "    Non-genuine grace period: $KeyManagementServiceNonGenuineGraceRequests"
+		Write-Host "    Expired or Hardware out of tolerance: $KeyManagementServiceOOTGraceRequests"
-		if ($null -NE $KeyManagementServiceNotificationRequests) {CONOUT "    Notification: $KeyManagementServiceNotificationRequests"}
+		Write-Host "    Non-genuine grace period: $KeyManagementServiceNonGenuineGraceRequests"
+		Write-Host "    Notification: $KeyManagementServiceNotificationRequests"
 	}
 }
 
 function DetectKmsClient
 {
-	if ($null -NE $VLActivationTypeEnabled) {CONOUT "Configured Activation Type: $($VLActTypes[$VLActivationTypeEnabled])"}
+	if ($null -NE $VLActivationTypeEnabled) {Write-Host "Configured Activation Type: $($VLActTypes[$VLActivationTypeEnabled])"}
-	CONOUT "`r"
+	Write-Host
 	if ($LicenseStatus -NE 1) {
-		CONOUT "Please activate the product in order to update KMS client information values."
+		Write-Host "Please activate the product in order to update KMS client information values."
 		return
 	}
 
@@ -396,42 +352,33 @@ function DetectKmsClient
 		}
 	}
 
-	CONOUT "Key Management Service client information:"
+	Write-Host "Key Management Service client information:"
-	CONOUT "    Client Machine ID (CMID): $($objSvc.ClientMachineID)"
+	Write-Host "    Client Machine ID (CMID): $($objSvc.ClientMachineID)"
 	if ($null -EQ $KmsReg) {
-		CONOUT "    $KmsDns"
+		Write-Host "    $KmsDns"
-		CONOUT "    Registered KMS machine name: KMS name not available"
+		Write-Host "    Registered KMS machine name: KMS name not available"
 	} else {
-		CONOUT "    $KmsReg"
+		Write-Host "    $KmsReg"
 	}
-	if ($null -NE $DiscoveredKeyManagementServiceMachineIpAddress) {CONOUT "    KMS machine IP address: $DiscoveredKeyManagementServiceMachineIpAddress"}
+	if ($null -NE $DiscoveredKeyManagementServiceMachineIpAddress) {Write-Host "    KMS machine IP address: $DiscoveredKeyManagementServiceMachineIpAddress"}
-	CONOUT "    KMS machine extended PID: $KeyManagementServiceProductKeyID"
+	Write-Host "    KMS machine extended PID: $KeyManagementServiceProductKeyID"
-	CONOUT "    Activation interval: $VLActivationInterval minutes"
+	Write-Host "    Activation interval: $VLActivationInterval minutes"
-	CONOUT "    Renewal interval: $VLRenewalInterval minutes"
+	Write-Host "    Renewal interval: $VLRenewalInterval minutes"
-	if ($null -NE $KeyManagementServiceHostCaching) {CONOUT "    KMS host caching: $KeyManagementServiceHostCaching"}
+	if ($null -NE $KeyManagementServiceHostCaching) {Write-Host "    KMS host caching: $KeyManagementServiceHostCaching"}
-	if (-Not [String]::IsNullOrEmpty($KeyManagementServiceLookupDomain)) {CONOUT "    KMS SRV record lookup domain: $KeyManagementServiceLookupDomain"}
+	if (-Not [String]::IsNullOrEmpty($KeyManagementServiceLookupDomain)) {Write-Host "    KMS SRV record lookup domain: $KeyManagementServiceLookupDomain"}
 }
 
 function GetResult($strSLP, $strSLS, $strID)
 {
-	try
+	try {$objPrd = Get-WmiObject $strSLP -Filter "ID='$strID'" -EA 1} catch {return}
-	{
+	$objPrd | select -Expand Properties -EA 0 | foreach {
-		$objPrd = [wmisearcher]"SELECT * FROM $strSLP WHERE ID='$strID'"
+		if (-Not [String]::IsNullOrEmpty($_.Value)) {set $_.Name $_.Value}
-		$objPrd.Options.Rewindable = $false
-		$objPrd.Get() | select -Expand Properties -EA 0 | foreach { if (-Not [String]::IsNullOrEmpty($_.Value)) {set $_.Name $_.Value} }
-		$objPrd.Dispose()
-	}
-	catch
-	{
-		return
 	}
 
 	$winID = ($ApplicationID -EQ $winApp)
 	$winPR = ($winID -And -Not $LicenseIsAddon)
 	$Vista = ($winID -And $NT6 -And -Not $NT7)
 	$NT5 = ($strSLP -EQ $wslp -And $winbuild -LT 6001)
-	$reapp = ("Windows", "App")[!$winID]
-	$prmnt = ("machine", "product")[!$winPR]
 
 	if ($Description | Select-String "VOLUME_KMSCLIENT") {$cKmsClient = 1; $_mTag = "Volume"}
 	if ($Description | Select-String "TIMEBASED_") {$cTblClient = 1; $_mTag = "Timebased"}
@@ -456,7 +403,7 @@ function GetResult($strSLP, $strSLS, $strID)
 		$LicenseInf = "Licensed"
 		$LicenseMsg = $null
 		if ($GracePeriodRemaining -EQ 0) {
-			$ExpireMsg = "The $prmnt is permanently activated."
+			if ($winPR) {$ExpireMsg = "The machine is permanently activated."} else {$ExpireMsg = "The product is permanently activated."}
 		} else {
 			$LicenseMsg = "$_mTag activation expiration: $GracePeriodRemaining minute(s) ($_gpr day(s))"
 			if ($null -NE $_xpr) {$ExpireMsg = "$_mTag activation will expire $_xpr"}
@@ -477,9 +424,8 @@ function GetResult($strSLP, $strSLS, $strID)
 	if ($LicenseStatus -EQ 5 -And -Not $NT5) {
 		$LicenseInf = "Notification"
 		$LicenseMsg = "Notification Reason: $LicenseReason"
-		if ($LicenseReason -EQ "0xC004F00F") {if ($null -NE $cKmsClient) {$LicenseMsg = $LicenseMsg + " (KMS license expired)."} else {$LicenseMsg = $LicenseMsg + " (hardware out of tolerance)."}}
 		if ($LicenseReason -EQ "0xC004F200") {$LicenseMsg = $LicenseMsg + " (non-genuine)."}
-		if ($LicenseReason -EQ "0xC004F009" -Or $LicenseReason -EQ "0xC004F064") {$LicenseMsg = $LicenseMsg + " (grace time expired)."}
+		if ($LicenseReason -EQ "0xC004F009") {$LicenseMsg = $LicenseMsg + " (grace time expired)."}
 	}
 	if ($LicenseStatus -GT 5 -Or ($LicenseStatus -GT 4 -And $NT5)) {
 		$LicenseInf = "Unknown"
@@ -491,61 +437,25 @@ function GetResult($strSLP, $strSLS, $strID)
 	}
 
 	if ($winPR -And $PartialProductKey -And -Not $NT9) {
-		$dp4 = strGetRegistry "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" "DigitalProductId4"
+		$dp4 = Get-ItemProperty -EA 0 "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" | select -EA 0 -Expand DigitalProductId4
 		if ($null -NE $dp4) {
 			$ProductKeyChannel = ([System.Text.Encoding]::Unicode.GetString($dp4, 1016, 128)).Trim([char]$null)
 		}
 	}
 
-	if ($winPR -And $Dlv -And $NT7 -And $null -EQ $RemainingAppReArmCount) {
+	if ($All.IsPresent) {Write-Host}
-		try
+	Write-Host "Name: $Name"
-		{
+	Write-Host "Description: $Description"
-			$tmp = [wmisearcher]"SELECT RemainingWindowsReArmCount FROM $strSLS"
+	Write-Host "Activation ID: $ID"
-			$tmp.Options.Rewindable = $false
+	if ($null -NE $ProductKeyID) {Write-Host "Extended PID: $ProductKeyID"}
-			$tmp.Get() | select -Expand Properties -EA 0 | foreach {set $_.Name $_.Value}
+	if ($null -NE $OfflineInstallationId -And $IID.IsPresent) {Write-Host "Installation ID: $OfflineInstallationId"}
-			$tmp.Dispose()
+	if ($null -NE $ProductKeyChannel) {Write-Host "Product Key Channel: $ProductKeyChannel"}
-		}
+	if ($null -NE $PartialProductKey) {Write-Host "Partial Product Key: $PartialProductKey"} else {Write-Host "Product Key: Not installed"}
-		catch
+	Write-Host "License Status: $LicenseInf"
-		{
+	if ($null -NE $LicenseMsg) {Write-Host "$LicenseMsg"}
-		}
-	}
-
-	$add_on = $Name.IndexOf("add-on for", 5)
-
-	& $isAll
-	if ($add_on -EQ -1) {CONOUT "Name: $Name"} else {CONOUT "Name: $($Name.Substring(0, $add_on + 7))"}
-	CONOUT "Description: $Description"
-	CONOUT "Activation ID: $ID"
-	if ($null -NE $ProductKeyID) {CONOUT "Extended PID: $ProductKeyID"}
-	if ($null -NE $ProductKeyID2 -And $Dlv) {CONOUT "Product ID: $ProductKeyID2"}
-	if ($null -NE $OfflineInstallationId -And $IID) {CONOUT "Installation ID: $OfflineInstallationId"}
-	if ($null -NE $ProductKeyChannel) {CONOUT "Product Key Channel: $ProductKeyChannel"}
-	if ($null -NE $PartialProductKey) {CONOUT "Partial Product Key: $PartialProductKey"}
-	CONOUT "License Status: $LicenseInf"
-	if ($null -NE $LicenseMsg) {CONOUT "$LicenseMsg"}
 	if ($LicenseStatus -NE 0 -And $EvaluationEndDate.Substring(0,4) -NE "1601") {
 		$EED = [DateTime]::Parse([Management.ManagementDateTimeConverter]::ToDateTime($EvaluationEndDate),$null,48).ToString('yyyy-MM-dd hh:mm:ss tt')
-		CONOUT "Evaluation End Date: $EED UTC"
+		Write-Host "Evaluation End Date: $EED UTC"
-	}
-	if ($Dlv) {
-		if ($null -NE $RemainingWindowsReArmCount) {
-			CONOUT "Remaining Windows rearm count: $RemainingWindowsReArmCount"
-		}
-		if ($null -NE $RemainingSkuReArmCount -And $RemainingSkuReArmCount -NE 4294967295) {
-			CONOUT "Remaining $reapp rearm count: $RemainingAppReArmCount"
-			CONOUT "Remaining SKU rearm count: $RemainingSkuReArmCount"
-		}
-		if ($null -NE $TrustedTime -And $LicenseStatus -NE 0) {
-			$TTD = [DateTime]::Parse([Management.ManagementDateTimeConverter]::ToDateTime($TrustedTime),$null,32).ToString('yyyy-MM-dd hh:mm:ss tt')
-			CONOUT "Trusted time: $TTD"
-		}
-	}
-	if ($LicenseStatus -EQ 0) {
-		return
-	}
-
-	if ($strSLP -EQ $wslp -And $null -NE $PartialProductKey -And $null -NE $ADActivationObjectName -And $VLActivationType -EQ 1) {
-		DetectAdbaClient
 	}
 
 	if ($winID -And $null -NE $cAvmClient -And $null -NE $PartialProductKey) {
@@ -557,22 +467,16 @@ function GetResult($strSLP, $strSLS, $strID)
 	$chkSLS = ($null -NE $PartialProductKey) -And ($null -NE $cKmsClient -Or $null -NE $cKmsHost -Or $chkSub)
 
 	if (!$chkSLS) {
-		if ($null -NE $ExpireMsg) {CONOUT "`n    $ExpireMsg"}
+		if ($null -NE $ExpireMsg) {Write-Host; Write-Host "    $ExpireMsg"}
 		return
 	}
 
-	try
+	$objSvc = Get-WmiObject $strSLS -EA 0
-	{
+
-		$objSvc = New-Object PSObject
+	if ($Vista) {
-		$wmiSvc = [wmisearcher]"SELECT * FROM $strSLS"
+		$objSvc | select -Expand Properties -EA 0 | foreach {
-		$wmiSvc.Options.Rewindable = $false
+			if (-Not [String]::IsNullOrEmpty($_.Value)) {set $_.Name $_.Value}
-		$wmiSvc.Get() | select -Expand Properties -EA 0 | foreach { if (-Not [String]::IsNullOrEmpty($_.Value)) {$objSvc | Add-Member 8 $_.Name $_.Value} }
+		}
-		$wmiSvc.Dispose()
-		if ($null -EQ $IsKeyManagementServiceMachine) {$objSvc.PSObject.Properties | foreach {set $_.Name $_.Value}}
-	}
-	catch
-	{
-		return
 	}
 
 	if ($strSLS -EQ $wsls -And $NT9) {
@@ -582,7 +486,6 @@ function GetResult($strSLP, $strSLS, $strID)
 	}
 
 	if ($null -NE $cKmsHost -And $IsKeyManagementServiceMachine -GT 0) {
-		if ($null -NE $ExpireMsg) {CONOUT "`n    $ExpireMsg"}
 		DetectKmsHost
 	}
 
@@ -590,9 +493,7 @@ function GetResult($strSLP, $strSLS, $strID)
 		DetectKmsClient
 	}
 
-	if ($null -EQ $cKmsHost) {
+	if ($null -NE $ExpireMsg) {Write-Host; Write-Host "    $ExpireMsg"}
-		if ($null -NE $ExpireMsg) {CONOUT "`n    $ExpireMsg"}
-	}
 
 	if ($chkSub) {
 		DetectSubscription
@@ -632,10 +533,11 @@ function PrintModePerPridFromRegistry
 	$vNextPrids = Get-Item -Path $vNextRegkey -ErrorAction SilentlyContinue | Select-Object -ExpandProperty 'property' -ErrorAction SilentlyContinue | Where-Object -FilterScript {$_.ToLower() -like "*retail" -or $_.ToLower() -like "*volume"}
 	If ($null -Eq $vNextPrids)
 	{
-		CONOUT "`nNo registry keys found."
+		Write-Host
+		Write-Host "No registry keys found."
 		Return
 	}
-	CONOUT "`r"
+	Write-Host
 	$vNextPrids | ForEach `
 	{
 		$mode = (Get-ItemProperty -Path $vNextRegkey -Name $_).$_
@@ -645,7 +547,7 @@ function PrintModePerPridFromRegistry
 			3 { $mode = "Device"; Break }
 			Default { $mode = "Legacy"; Break }
 		}
-		CONOUT "$_ = $mode"
+		Write-Host $_ = $mode
 	}
 }
 
@@ -659,7 +561,8 @@ function PrintSharedComputerLicensing
 	$scaPolicyValue = Get-ItemProperty -Path $scaPolicyKey -ErrorAction SilentlyContinue | Select-Object -ExpandProperty "SharedComputerLicensing" -ErrorAction SilentlyContinue
 	If ($null -Eq $scaValue -And $null -Eq $scaValue2 -And $null -Eq $scaPolicyValue)
 	{
-		CONOUT "`nNo registry keys found."
+		Write-Host
+		Write-Host "No registry keys found."
 		Return
 	}
 	$scaModeValue = $scaValue -Or $scaValue2 -Or $scaPolicyValue
@@ -671,17 +574,23 @@ function PrintSharedComputerLicensing
 	{
 		$scaMode = "Enabled"
 	}
-	CONOUT "`nStatus: $scaMode"
+	Write-Host
-	CONOUT "`r"
+	Write-Host "Status:" $scaMode
+	Write-Host
 	$tokenFiles = $null
 	$tokenPath = "${env:LOCALAPPDATA}\Microsoft\Office\16.0\Licensing"
 	If (Test-Path $tokenPath)
 	{
 		$tokenFiles = Get-ChildItem -Path $tokenPath -Filter "*authString*" -Recurse | Where-Object { !$_.PSIsContainer }
 	}
-	If ($null -Eq $tokenFiles -Or $tokenFiles.Length -Eq 0)
+	If ($null -Eq $tokenFiles)
 	{
-		CONOUT "No tokens found."
+		Write-Host "No tokens found."
+		Return
+	}
+	If ($tokenFiles.Length -Eq 0)
+	{
+		Write-Host "No tokens found."
 		Return
 	}
 	$tokenFiles | ForEach `
@@ -715,9 +624,16 @@ function PrintLicensesInformation
 	{
 		$licenseFiles = Get-ChildItem -Path $licensePath -Recurse | Where-Object { !$_.PSIsContainer }
 	}
-	If ($null -Eq $licenseFiles -Or $licenseFiles.Length -Eq 0)
+	If ($null -Eq $licenseFiles)
 	{
-		CONOUT "`nNo licenses found."
+		Write-Host
+		Write-Host "No licenses found."
+		Return
+	}
+	If ($licenseFiles.Length -Eq 0)
+	{
+		Write-Host
+		Write-Host "No licenses found."
 		Return
 	}
 	$licenseFiles | ForEach `
@@ -774,20 +690,24 @@ function vNextDiagRun
 		Return
 	}
 
-	& $isAll
+	if ($All.IsPresent) {Write-Host}
-	CONOUT "$line2"
+	Write-Host "$line2"
-	CONOUT "===                  Office vNext Status                 ==="
+	Write-Host "===                  Office vNext Status                 ==="
-	CONOUT "$line2"
+	Write-Host "$line2"
-	CONOUT "`n========== Mode per ProductReleaseId =========="
+	Write-Host
+	Write-Host "========== Mode per ProductReleaseId =========="
 	PrintModePerPridFromRegistry
-	CONOUT "`n========== Shared Computer Licensing =========="
+	Write-Host
+	Write-Host "========== Shared Computer Licensing =========="
 	PrintSharedComputerLicensing
-	CONOUT "`n========== vNext licenses ==========="
+	Write-Host
+	Write-Host "========== vNext licenses ==========="
 	PrintLicensesInformation -Mode "NUL"
-	CONOUT "`n========== Device licenses =========="
+	Write-Host
+	Write-Host "========== Device licenses =========="
 	PrintLicensesInformation -Mode "Device"
-	CONOUT "$line3"
+	Write-Host "$line3"
-	CONOUT "`r"
+	Write-Host
 }
 #endregion
 
@@ -870,13 +790,13 @@ function PrintStateData {
 	}
 
 	[string[]]$pwszStateString = $Marshal::PtrToStringUni($pwszStateData) -replace ";", "`n    "
-	CONOUT ("    $pwszStateString")
+	Write-Host "    $pwszStateString"
 
 	$Marshal::FreeHGlobal($pwszStateData)
 	return $TRUE
 }
 
-function PrintLastActivationHResult {
+function PrintLastActivationHRresult {
 	$pdwLastHResult = 0
 	$cbSize = 0
 
@@ -889,34 +809,12 @@ function PrintLastActivationHResult {
 		return $FALSE
 	}
 
-	CONOUT ("    LastActivationHResult=0x{0:x8}" -f $Marshal::ReadInt32($pdwLastHResult))
+	Write-Host ("    LastActivationHResult=0x{0:x8}" -f $Marshal::ReadInt32($pdwLastHResult))
 
 	$Marshal::FreeHGlobal($pdwLastHResult)
 	return $TRUE
 }
 
-function PrintLastActivationTime {
-	$pdwLastTime = 0
-	$cbSize = 0
-
-	if ($Win32::SLGetWindowsInformation(
-		"Security-SPP-LastWindowsActivationTime",
-		[ref]$null,
-		[ref]$cbSize,
-		[ref]$pdwLastTime
-	)) {
-		return $FALSE
-	}
-
-	$actTime = $Marshal::ReadInt64($pdwLastTime)
-	if ($actTime -ne 0) {
-		CONOUT ("    LastActivationTime={0}" -f [DateTime]::FromFileTimeUtc($actTime).ToString("yyyy/MM/dd:HH:mm:ss"))
-	}
-
-	$Marshal::FreeHGlobal($pdwLastTime)
-	return $TRUE
-}
-
 function PrintIsWindowsGenuine {
 	$dwGenuine = 0
 	$ppwszGenuineStates = @(
@@ -932,9 +830,9 @@ function PrintIsWindowsGenuine {
 	}
 
 	if ($dwGenuine -lt 5) {
-		CONOUT ("    IsWindowsGenuine={0}" -f $ppwszGenuineStates[$dwGenuine])
+		Write-Host ("    IsWindowsGenuine={0}" -f $ppwszGenuineStates[$dwGenuine])
 	} else {
-		CONOUT ("    IsWindowsGenuine={0}" -f $dwGenuine)
+		Write-Host ("    IsWindowsGenuine={0}" -f $dwGenuine)
 	}
 
 	return $TRUE
@@ -958,7 +856,7 @@ function PrintDigitalLicenseStatus {
 	[bool]$bDigitalLicense = $FALSE
 
 	$bDigitalLicense = (($dwReturnCode -ge 0) -and ($dwReturnCode -ne 1))
-	CONOUT ("    IsDigitalLicense={0}" -f (BoolToWStr $bDigitalLicense))
+	Write-Host ("    IsDigitalLicense={0}" -f (BoolToWStr $bDigitalLicense))
 
 	return $TRUE
 }
@@ -976,7 +874,7 @@ function PrintSubscriptionStatus {
 		return $FALSE
 	}
 
-	CONOUT ("    SubscriptionSupportedEdition={0}" -f (BoolToWStr $dwSupported))
+	Write-Host ("    SubscriptionSupportedEdition={0}" -f (BoolToWStr $dwSupported))
 
 	$pStatus = $Marshal::AllocHGlobal($Marshal::SizeOf([Type]$SubStatus))
 	if ($Win32::ClipGetSubscriptionStatus([ref]$pStatus)) {
@@ -987,26 +885,25 @@ function PrintSubscriptionStatus {
 	$sStatus = $Marshal::PtrToStructure($pStatus, [Type]$SubStatus)
 	$Marshal::FreeHGlobal($pStatus)
 
-	CONOUT ("    SubscriptionEnabled={0}" -f (BoolToWStr $sStatus.dwEnabled))
+	Write-Host ("    SubscriptionEnabled={0}" -f (BoolToWStr $sStatus.dwEnabled))
 
 	if ($sStatus.dwEnabled -eq 0) {
 		return $TRUE
 	}
 
-	CONOUT ("    SubscriptionSku={0}" -f $sStatus.dwSku)
+	Write-Host ("    SubscriptionSku={0}" -f $sStatus.dwSku)
-	CONOUT ("    SubscriptionState={0}" -f $sStatus.dwState)
+	Write-Host ("    SubscriptionState={0}" -f $sStatus.dwState)
 
 	return $TRUE
 }
 
 function ClicRun
 {
-	& $isAll
+	if ($All.IsPresent) {Write-Host}
-	CONOUT "Client Licensing Check information:"
+	Write-Host "Client Licensing Check information:"
 
 	$null = PrintStateData
-	$null = PrintLastActivationHResult
+	$null = PrintLastActivationHRresult
-	$null = PrintLastActivationTime
 	$null = PrintIsWindowsGenuine
 
 	if ($DllDigital) {
@@ -1017,15 +914,15 @@ function ClicRun
 		$null = PrintSubscriptionStatus
 	}
 
-	CONOUT "$line3"
+	Write-Host "$line3"
-	& $noAll
+	if (!$All.IsPresent) {Write-Host}
 }
 #endregion
 
 $Host.UI.RawUI.WindowTitle = "Check Activation Status"
+
 if ($All.IsPresent) {
-	$B=$Host.UI.RawUI.BufferSize;$B.Height=3000;$Host.UI.RawUI.BufferSize=$B;
+	$B=$Host.UI.RawUI.BufferSize;$B.Height=3000;$Host.UI.RawUI.BufferSize=$B;clear;
-	if (!$Pass.IsPresent) {clear;}
 }
 
 $SysPath = "$env:SystemRoot\System32"
@@ -1044,43 +941,46 @@ $cSub = ($winbuild -GE 19041) -And (Select-String -Path "$SysPath\wbem\sppwmi.mo
 $DllDigital = ($winbuild -GE 14393) -And (Test-Path "$SysPath\EditionUpgradeManagerObj.dll")
 $DllSubscription = ($winbuild -GE 14393) -And (Test-Path "$SysPath\Clipc.dll")
 $VLActTypes = @("All", "AD", "KMS", "Token")
-$SLKeyPath = "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SL"
+$SLKeyPath = "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SL"
-$NSKeyPath = "HKEY_USERS\S-1-5-20\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SL"
+$NSKeyPath = "Registry::HKEY_USERS\S-1-5-20\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SL"
 
-'cW1nd0ws', 'c0ff1ce15', 'c0ff1ce14', 'ospp14', 'ospp15' | foreach {set $_ $false}
+'cW1nd0ws', 'c0ff1ce15', 'c0ff1ce14', 'ospp14', 'ospp15' | foreach {set $_ $null}
 
-$offsvc = "osppsvc"
+$OsppHook = 1
-if ($NT7 -Or -Not $NT6) {$winsvc = "sppsvc"} else {$winsvc = "slsvc"}
+try {gsv osppsvc -EA 1 | Out-Null} catch {$OsppHook = 0}
 
-try {gsv $winsvc -EA 1 | Out-Null; $WsppHook = 1} catch {$WsppHook = 0}
+if ($NT7 -Or -Not $NT6) {
-try {gsv $offsvc -EA 1 | Out-Null; $OsppHook = 1} catch {$OsppHook = 0}
+	try {sasv sppsvc -EA 1} catch {}
-
-if ($WsppHook -NE 0) {
-	try {sasv $winsvc -EA 1} catch {}
-	$cW1nd0ws  = DetectID $wslp $winApp
-	$c0ff1ce15 = DetectID $wslp $o15App
-	$c0ff1ce14 = DetectID $wslp $o14App
 }
+else
+{
+	try {sasv slsvc -EA 1} catch {}
+}
+
+DetectID $wslp $winApp ([ref]$cW1nd0ws)
+DetectID $wslp $o15App ([ref]$c0ff1ce15)
+DetectID $wslp $o14App ([ref]$c0ff1ce14)
 
 if ($OsppHook -NE 0) {
-	try {sasv $offsvc -EA 1} catch {}
+	try {sasv osppsvc -EA 1} catch {}
-	$ospp15 = DetectID $oslp $o15App
+	DetectID $oslp $o15App ([ref]$ospp15)
-	$ospp14 = DetectID $oslp $o14App
+	DetectID $oslp $o14App ([ref]$ospp14)
 }
 
-if ($cW1nd0ws)
+if ($null -NE $cW1nd0ws)
 {
 	echoWindows
 	GetID $wslp $winApp | foreach -EA 1 {
 	GetResult $wslp $wsls $_
-	CONOUT "$line3"
+	Write-Host "$line3"
-	& $noAll
+	if (!$All.IsPresent) {Write-Host}
 	}
 }
 elseif ($NT6)
 {
 	echoWindows
-	CONOUT "`nError: product key not found."
+	Write-Host
+	Write-Host "Error: product key not found."
 }
 
 if ($winbuild -GE 9200) {
@@ -1094,43 +994,39 @@ if ($c0ff1ce15 -Or $ospp15) {
 
 $doMSG = 1
 
-if ($c0ff1ce15)
+if ($null -NE $c0ff1ce15) {
-{
 	echoOffice
 	GetID $wslp $o15App | foreach -EA 1 {
 	GetResult $wslp $wsls $_
-	CONOUT "$line3"
+	Write-Host "$line3"
-	& $noAll
+	if (!$All.IsPresent) {Write-Host}
 	}
 }
 
-if ($c0ff1ce14)
+if ($null -NE $c0ff1ce14) {
-{
 	echoOffice
 	GetID $wslp $o14App | foreach -EA 1 {
 	GetResult $wslp $wsls $_
-	CONOUT "$line3"
+	Write-Host "$line3"
-	& $noAll
+	if (!$All.IsPresent) {Write-Host}
 	}
 }
 
-if ($ospp15)
+if ($null -NE $ospp15) {
-{
 	echoOffice
 	GetID $oslp $o15App | foreach -EA 1 {
 	GetResult $oslp $osls $_
-	CONOUT "$line3"
+	Write-Host "$line3"
-	& $noAll
+	if (!$All.IsPresent) {Write-Host}
 	}
 }
 
-if ($ospp14)
+if ($null -NE $ospp14) {
-{
 	echoOffice
 	GetID $oslp $o14App | foreach -EA 1 {
 	GetResult $oslp $osls $_
-	CONOUT "$line3"
+	Write-Host "$line3"
-	& $noAll
+	if (!$All.IsPresent) {Write-Host}
 	}
 }
 

MAS/Separate-Files-Version/Extract_OEM_Folder.cmd

@@ -1,4 +1,4 @@
-@set masver=3.0
+@set masver=2.8
 @echo off
 
 
@@ -69,7 +69,7 @@ echo:
 echo Null service is not running, script may crash...
 echo:
 echo:
-echo Help - %mas%fix_service
+echo Help - %mas%troubleshoot
 echo:
 echo:
 ping 127.0.0.1 -n 20
@@ -122,16 +122,6 @@ call :dk_setvar
 
 ::========================================================================================================================================
 
-if %winbuild% EQU 1 (
-%eline%
-echo Failed to detect Windows build number.
-echo:
-setlocal EnableDelayedExpansion
-set fixes=%fixes% %mas%troubleshoot
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
-goto dk_done
-)
-
 if %winbuild% LSS 7600 (
 %nceline%
 echo Unsupported OS version detected [%winbuild%].
@@ -173,9 +163,9 @@ goto done2
 
 ::  Check PowerShell
 
-REM :PStest: $ExecutionContext.SessionState.LanguageMode :PStest:
+REM :PowerShellTest: $ExecutionContext.SessionState.LanguageMode :PowerShellTest:
 
-cmd /c "%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':PStest:\s*';iex ($f[1])"" | find /i "FullLanguage" %nul1% || (
+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:
@@ -256,13 +246,9 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
 
 set -=
 set old=
-set upver=%masver:.=%
 
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (
+for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not "%%#"=="" set old=1
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (
-if not "%%#"=="" set old=
-)
 )
 
 if defined old (
@@ -278,7 +264,7 @@ echo:
 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 %mas% & exit /b)
+if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
 )
 )
 
@@ -319,7 +305,6 @@ set HWID_Activation.cmd=Activators\HWID_Activation.cmd
 set KMS38_Activation.cmd=Activators\KMS38_Activation.cmd
 set Online_KMS_Activation.cmd=Activators\Online_KMS_Activation.cmd
 set Ohook_Activation_AIO.cmd=Activators\Ohook_Activation_AIO.cmd
-set TSforge_Activation.cmd=Activators\TSforge_Activation.cmd
 pushd "!_work!"
 
 set _nofile=
@@ -328,7 +313,6 @@ for %%# in (
 %KMS38_Activation.cmd%
 %Online_KMS_Activation.cmd%
 %Ohook_Activation_AIO.cmd%
-%TSforge_Activation.cmd%
 ) do (
 if not exist "%%#" set _nofile=1
 )
@@ -354,34 +338,36 @@ echo:
 echo:
 echo:
 echo:                     Extract $OEM$ folder on the desktop           
-echo:         ____________________________________________________________
+echo:           ________________________________________________________
 echo:
-echo:            [1] HWID             [Windows]
+echo:              [1] HWID
-echo:            [2] Ohook            [Office]
+echo:              [2] Ohook
-echo:            [3] TSforge          [Windows / ESU / Office]
+echo:              [3] KMS38
-echo:            [4] KMS38            [Windows]
+echo:              [4] Online KMS
-echo:            [5] Online KMS       [Windows / Office]
 echo:
-echo:            [6] HWID    [Windows] ^+ Ohook [Office]
+echo:              [5] HWID       ^(Windows^) ^+ Ohook      ^(Office^)
-echo:            [7] HWID    [Windows] ^+ Ohook [Office] ^+ TSforge [ESU]
+echo:              [6] HWID       ^(Windows^) ^+ Online KMS ^(Office^)
-echo:            [8] TSforge [Windows] ^+ Online KMS [Office]
+echo:              [7] KMS38      ^(Windows^) ^+ Ohook      ^(Office^)
+echo:              [8] KMS38      ^(Windows^) ^+ Online KMS ^(Office^)
+echo:              [9] Online KMS ^(Windows^) ^+ Ohook      ^(Office^)
 echo:
-call :dk_color2 %_White% "            [R] " %_Green% "ReadMe"
+call :dk_color2 %_White% "              [R] " %_Green% "ReadMe"
-echo:            [0] Exit
+echo:              [0] Exit
-echo:         ____________________________________________________________
+echo:           ________________________________________________________
 echo:  
 call :dk_color2 %_White% "             " %_Green% "Choose a menu option using your keyboard :"
-choice /C:12345678R0 /N
+choice /C:123456789R0 /N
 set _erl=%errorlevel%
 
-if %_erl%==10 exit /b
+if %_erl%==11 exit /b
-if %_erl%==9 start %mas%oem-folder &goto :Menu
+if %_erl%==10 start %mas%oem-folder &goto :Menu
-if %_erl%==8 goto:tsforge_kms
+if %_erl%==9 goto:kms_ohook
-if %_erl%==7 goto:hwid_ohook_tsforge
+if %_erl%==8 goto:kms38_kms
-if %_erl%==6 goto:hwid_ohook
+if %_erl%==7 goto:kms38_ohook
-if %_erl%==5 goto:kms
+if %_erl%==6 goto:hwid_kms
-if %_erl%==4 goto:kms38
+if %_erl%==5 goto:hwid_ohook
-if %_erl%==3 goto:tsforge
+if %_erl%==4 goto:kms
+if %_erl%==3 goto:kms38
 if %_erl%==2 goto:ohook
 if %_erl%==1 goto:hwid
 goto :Menu
@@ -448,36 +434,6 @@ cd \
 
 ::========================================================================================================================================
 
-:tsforge
-
-cls
-md "!desktop!\$OEM$\$$\Setup\Scripts"
-pushd "!_work!"
-copy /y /b "%TSforge_Activation.cmd%" "!_dir!\TSforge_Activation.cmd" %nul%
-popd
-call :export tsforge_setup
-
-set _error=
-if not exist "!_dir!\TSforge_Activation.cmd" set _error=1
-if not exist "!_dir!\SetupComplete.cmd" set _error=1
-if defined _error goto errorfound
-
-set oem=TSforge
-goto done
-
-:tsforge_setup:
-@echo off
-
-fltmc >nul || exit /b
-
-call "%~dp0TSforge_Activation.cmd" /Z-WindowsESUOffice
-
-cd \
-(goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")
-:tsforge_setup:
-
-::========================================================================================================================================
-
 :kms38
 
 cls
@@ -576,28 +532,26 @@ cd \
 
 ::========================================================================================================================================
 
-:hwid_ohook_tsforge
+:hwid_kms
 
 cls
 md "!desktop!\$OEM$\$$\Setup\Scripts"
 pushd "!_work!"
 copy /y /b "%HWID_Activation.cmd%" "!_dir!\HWID_Activation.cmd" %nul%
-copy /y /b "%Ohook_Activation_AIO.cmd%" "!_dir!\Ohook_Activation_AIO.cmd" %nul%
+copy /y /b "%Online_KMS_Activation.cmd%" "!_dir!\Online_KMS_Activation.cmd" %nul%
-copy /y /b "%TSforge_Activation.cmd%" "!_dir!\TSforge_Activation.cmd" %nul%
 popd
-call :export hwid_ohook_tsforge_setup
+call :export hwid_kms_setup
 
 set _error=
 if not exist "!_dir!\HWID_Activation.cmd" set _error=1
-if not exist "!_dir!\Ohook_Activation_AIO.cmd" set _error=1
+if not exist "!_dir!\Online_KMS_Activation.cmd" set _error=1
-if not exist "!_dir!\TSforge_Activation.cmd" set _error=1
 if not exist "!_dir!\SetupComplete.cmd" set _error=1
 if defined _error goto errorfound
 
-set oem=HWID [Windows] + Ohook [Office] + TSforge [ESU]
+set oem=HWID [Windows] + Online KMS [Office]
 goto done
 
-:hwid_ohook_tsforge_setup:
+:hwid_kms_setup:
 @echo off
 
 fltmc >nul || exit /b
@@ -607,45 +561,79 @@ call "%~dp0HWID_Activation.cmd" /HWID
 endlocal
 
 setlocal
-call "%~dp0Ohook_Activation_AIO.cmd" /Ohook
+call "%~dp0Online_KMS_Activation.cmd" /K-Office
-endlocal
-
-setlocal
-call "%~dp0TSforge_Activation.cmd" /Z-ESU
 endlocal
 
 cd \
 (goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")
-:hwid_ohook_tsforge_setup:
+:hwid_kms_setup:
 
 ::========================================================================================================================================
 
-:tsforge_kms
+:kms38_ohook
 
 cls
 md "!desktop!\$OEM$\$$\Setup\Scripts"
 pushd "!_work!"
-copy /y /b "%TSforge_Activation.cmd%" "!_dir!\TSforge_Activation.cmd" %nul%
+copy /y /b "%KMS38_Activation.cmd%" "!_dir!\KMS38_Activation.cmd" %nul%
-copy /y /b "%Online_KMS_Activation.cmd%" "!_dir!\Online_KMS_Activation.cmd" %nul%
+copy /y /b "%Ohook_Activation_AIO.cmd%" "!_dir!\Ohook_Activation_AIO.cmd" %nul%
 popd
-call :export tsforge_kms_setup
+call :export kms38_ohook_setup
 
 set _error=
-if not exist "!_dir!\TSforge_Activation.cmd" set _error=1
+if not exist "!_dir!\KMS38_Activation.cmd" set _error=1
-if not exist "!_dir!\Online_KMS_Activation.cmd" set _error=1
+if not exist "!_dir!\Ohook_Activation_AIO.cmd" set _error=1
 if not exist "!_dir!\SetupComplete.cmd" set _error=1
 if defined _error goto errorfound
 
-set oem=TSforge [Windows] + Online KMS [Office]
+set oem=KMS38 [Windows] + Ohook [Office]
 goto done
 
-:tsforge_kms_setup:
+:kms38_ohook_setup:
 @echo off
 
 fltmc >nul || exit /b
 
 setlocal
-call "%~dp0TSforge_Activation.cmd" /Z-Windows
+call "%~dp0KMS38_Activation.cmd" /KMS38
+endlocal
+
+setlocal
+call "%~dp0Ohook_Activation_AIO.cmd" /Ohook
+endlocal
+
+cd \
+(goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")
+:kms38_ohook_setup:
+
+::========================================================================================================================================
+
+:kms38_kms
+
+cls
+md "!desktop!\$OEM$\$$\Setup\Scripts"
+pushd "!_work!"
+copy /y /b "%KMS38_Activation.cmd%" "!_dir!\KMS38_Activation.cmd" %nul%
+copy /y /b "%Online_KMS_Activation.cmd%" "!_dir!\Online_KMS_Activation.cmd" %nul%
+popd
+call :export kms38_kms_setup
+
+set _error=
+if not exist "!_dir!\KMS38_Activation.cmd" set _error=1
+if not exist "!_dir!\Online_KMS_Activation.cmd" set _error=1
+if not exist "!_dir!\SetupComplete.cmd" set _error=1
+if defined _error goto errorfound
+
+set oem=KMS38 [Windows] + Online KMS [Office]
+goto done
+
+:kms38_kms_setup:
+@echo off
+
+fltmc >nul || exit /b
+
+setlocal
+call "%~dp0KMS38_Activation.cmd" /KMS38
 endlocal
 
 setlocal
@@ -654,7 +642,45 @@ endlocal
 
 cd \
 (goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")
-:tsforge_kms_setup:
+:kms38_kms_setup:
+
+::========================================================================================================================================
+
+:kms_ohook
+
+cls
+md "!desktop!\$OEM$\$$\Setup\Scripts"
+pushd "!_work!"
+copy /y /b "%Online_KMS_Activation.cmd%" "!_dir!\Online_KMS_Activation.cmd" %nul%
+copy /y /b "%Ohook_Activation_AIO.cmd%" "!_dir!\Ohook_Activation_AIO.cmd" %nul%
+popd
+call :export kms_ohook_setup
+
+set _error=
+if not exist "!_dir!\Online_KMS_Activation.cmd" set _error=1
+if not exist "!_dir!\Ohook_Activation_AIO.cmd" set _error=1
+if not exist "!_dir!\SetupComplete.cmd" set _error=1
+if defined _error goto errorfound
+
+set oem=Online KMS [Windows] + Ohook [Office]
+goto done
+
+:kms_ohook_setup:
+@echo off
+
+fltmc >nul || exit /b
+
+setlocal
+call "%~dp0Online_KMS_Activation.cmd" /K-Windows
+endlocal
+
+setlocal
+call "%~dp0Ohook_Activation_AIO.cmd" /Ohook
+endlocal
+
+cd \
+(goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")
+:kms_ohook_setup:
 
 ::========================================================================================================================================
 
@@ -672,7 +698,7 @@ call :dk_color %Blue% "%oem%"
 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],
+echo To KMS38 activate Server Cor/Acor editions ^(No GUI Versions^),
 echo Check this page %mas%oem-folder
 )
 echo ______________________________________________________________
@@ -681,7 +707,10 @@ echo ______________________________________________________________
 
 echo:
 if defined fixes (
+call :dk_color %White% "                                   "
 call :dk_color %White% "Follow ALL the ABOVE blue lines.   "
+call :dk_color %White% "                                   "
+echo:
 call :dk_color2 %Blue% "Press [1] to Open Support Webpage " %Gray% " Press [0] to Ignore"
 choice /C:10 /N
 if !errorlevel!==1 (for %%# in (%fixes%) do (start %%#))

MAS/Separate-Files-Version/Troubleshoot.cmd

@@ -1,4 +1,4 @@
-@set masver=3.0
+@set masver=2.8
 @echo off
 
 
@@ -69,7 +69,7 @@ echo:
 echo Null service is not running, script may crash...
 echo:
 echo:
-echo Help - %mas%fix_service
+echo Help - %mas%troubleshoot
 echo:
 echo:
 ping 127.0.0.1 -n 20
@@ -123,16 +123,6 @@ set "line=______________________________________________________________________
 
 ::========================================================================================================================================
 
-if %winbuild% EQU 1 (
-%eline%
-echo Failed to detect Windows build number.
-echo:
-setlocal EnableDelayedExpansion
-set fixes=%fixes% %mas%troubleshoot
-call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
-goto dk_done
-)
-
 if %winbuild% LSS 7600 (
 %nceline%
 echo Unsupported OS version detected [%winbuild%].
@@ -174,9 +164,9 @@ goto dk_done
 
 ::  Check PowerShell
 
-REM :PStest: $ExecutionContext.SessionState.LanguageMode :PStest:
+REM :PowerShellTest: $ExecutionContext.SessionState.LanguageMode :PowerShellTest:
 
-cmd /c "%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':PStest:\s*';iex ($f[1])"" | find /i "FullLanguage" %nul1% || (
+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:
@@ -257,13 +247,9 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
 
 set -=
 set old=
-set upver=%masver:.=%
 
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (
+for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not "%%#"=="" set old=1
+if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (
-if not "%%#"=="" set old=
-)
 )
 
 if defined old (
@@ -279,7 +265,7 @@ echo:
 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 %mas% & exit /b)
+if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
 )
 )
 
@@ -1398,7 +1384,10 @@ $key.SetAccessControl($acl)
 
 echo:
 if defined fixes (
+call :dk_color %White% "                                   "
 call :dk_color %White% "Follow ALL the ABOVE blue lines.   "
+call :dk_color %White% "                                   "
+echo:
 call :dk_color2 %Blue% "Press [1] to Open Support Webpage " %Gray% " Press [0] to Ignore"
 choice /C:10 /N
 if !errorlevel!==1 (for %%# in (%fixes%) do (start %%#))

README.md

@@ -2,7 +2,7 @@
 
 <h1 align="center">Microsoft  Activation  Scripts (MAS)</h1>
 
-<p align="center">Open-source Windows and Office activator featuring HWID, Ohook, TSforge, KMS38, and Online KMS activation methods, along with advanced troubleshooting.</p>
+<p align="center">Open-source Windows and Office activator featuring HWID, Ohook, KMS38, and Online KMS activation methods, along with advanced troubleshooting.</p>
 
 <hr>
   
@@ -15,12 +15,19 @@
 ```
 irm https://get.activated.win | iex
 ```
-Alternatively, you can use the following (It will be deprecated in the future.)  
+3.   You will see the activation options. Choose (1) HWID for Windows activation. Choose (2) Ohook for Office activation.
+4.   That's all.
+
+<details>
+  <summary>More options</summary>
+
+- Alternatively, you can use the following (It will be deprecated in the future.)
 ```
 irm https://massgrave.dev/get | iex
 ```
-3.   You will see the activation options. Choose (1) HWID for Windows activation. Choose (2) Ohook for Office activation.
+- The URL `get.activated.win` might be blocked by some DNS services because it is a new domain.
-4.   That's all.
+
+</details>
 
 ---
 
@@ -29,10 +36,7 @@ irm https://massgrave.dev/get | iex
 <details>
   <summary>Click here for info</summary>
 
-1.   Download the file using the links provided below.  
+1.   Download the file under the code button from [GitHub](https://github.com/massgravel/Microsoft-Activation-Scripts) or [Azure DevOps](https://dev.azure.com/massgrave/_git/Microsoft-Activation-Scripts) or [Self-hosted Git](https://git.activated.win/massgrave/Microsoft-Activation-Scripts)
-`https://github.com/massgravel/Microsoft-Activation-Scripts/archive/refs/heads/master.zip`  
-or  
-`https://git.activated.win/massgrave/Microsoft-Activation-Scripts/archive/master.zip`
 2.   Right-click on the downloaded zip file and extract
 3.   In the extracted folder, find the folder named `All-In-One-Version`
 4.   Run the file named `MAS_AIO.cmd`
@@ -43,14 +47,6 @@ or
 
 ---
 
-### Not working ❓
-
-- If you are **unable to launch MAS** using the PowerShell method, please refer to **Method 2** listed above.
-- If MAS is launched and the script shows any errors, check for any troubleshooting steps mentioned in blue color and try to follow those.
-- If you have any issues, please feel free to reach out to us [here](https://massgrave.dev/troubleshoot).
-
----
-
 > [!NOTE]
 >
 > - The IRM command in PowerShell downloads a script from a specified URL, and the IEX command executes it.
@@ -62,8 +58,8 @@ or
 To run the scripts in unattended mode, check [here](https://massgrave.dev/command_line_switches).
 
 ```
-Latest Version: 3.0
+Latest Version: 2.8
-Release date: 14-Feb-2025
+Release date: 9-Nov-2024
 ```
 
 ### [Troubleshooting / Help](https://massgrave.dev/troubleshoot)
@@ -75,34 +71,19 @@ Release date: 14-Feb-2025
 [![1.1]][1]
 [![1.2]][2]
 [![1.3]][3]
-
-</div>
-
-<div align="center">
-  
 [![1.4]][4]
-[![1.5]][5]
-[![1.6]][6]
-[![1.7]][7]
 
 </div>
 
-[1.1]: https://massgrave.dev/img/logo_github.png (GitHub)
+[1.1]: https://massgrave.dev/img/logo_discord.png (Chat with us without signup)
-[1.2]: https://massgrave.dev/img/logo_azuredevops.png (AzureDevOps)
+[1.2]: https://massgrave.dev/img/logo_github.png (GitHub)
-[1.3]: https://massgrave.dev/img/logo_gitea.png (Self-hosted Git)
+[1.3]: https://massgrave.dev/img/logo_reddit.png (Reddit)
+[1.4]: https://massgrave.dev/img/logo_x.png (Follow us on X)
 
-[1.4]: https://massgrave.dev/img/logo_discord.png (Chat with us without signup)
+[1]: https://discord.gg/tVFN4N84PP
-[1.5]: https://massgrave.dev/img/logo_reddit.png (Reddit)
+[2]: https://github.com/massgravel/Microsoft-Activation-Scripts
-[1.6]: https://massgrave.dev/img/logo_bluesky.png (Bluesky)
+[3]: https://www.reddit.com/r/MAS_Activator
-[1.7]: https://massgrave.dev/img/logo_x.png (Twitter)
+[4]: https://twitter.com/massgravel
-
-[1]: https://github.com/massgravel/Microsoft-Activation-Scripts
-[2]: https://dev.azure.com/massgrave/_git/Microsoft-Activation-Scripts
-[3]: https://git.activated.win/massgrave/Microsoft-Activation-Scripts
-[4]: https://discord.gg/j2yFsV5ZVC
-[5]: https://www.reddit.com/r/MAS_Activator
-[6]: https://bsky.app/profile/massgrave.dev
-[7]: https://twitter.com/massgravel
 
 ---