2025-09-14 11:59:49 +00:00
11 changed files with 112 additions and 146 deletions
--- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd
+++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
@ -1,5 +1,5 @@
@::r45f3r3-random
-@set masver=3.6
+@set masver=3.5
@setlocal DisableDelayedExpansion
@echo off

@ -2171,22 +2171,19 @@ call :dk_color %Gray% "Checking SkipRearm                      [Default 0 Value

 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% "$s=New-Object -ComObject 'Schedule.Service'; $s.Connect(); $state=$s.GetFolder('\Microsoft\Windows\SoftwareProtectionPlatform').GetTask('SvcRestartTask').State; @{0='Unknown';1='Disabled';2='Queued';3='Ready';4='Running'}[$state]" %nul6%') do (set taskinfo=%%a)
+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 %Gray% "Checking SvcRestartTask Status          [!taskinfo!. System might deactivate later.]"
+call :dk_color %Red% "Checking SvcRestartTask Status          [!taskinfo!, system might deactivate later]"
 if not defined showfix (
 echo:
-echo "!taskinfo!" | findstr /i "Removed Not Found" %nul1% && (
-set fixes=%fixes% %mas%in-place_repair_upgrade
-call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade"
-) || (
 call :dk_color %Blue% "Reboot your machine using the restart option and run the script again."
-)
+set fixes=%fixes% %mas%troubleshoot
+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot"
 echo:
 )
 )
@ -3724,6 +3721,7 @@ exit /b

 14_4eaff0d0-c6cb-4187-94f3-c7656d49a0aa_Retail________ExcelR_[HSExcelR]
 14_7004b7f0-6407-4f45-8eac-966e5f868bde_Retail________GrooveR
+14_fbf4ac36-31c8-4340-8666-79873129cf40_Retail________OutlookR
 14_133c8359-4e93-4241-8118-30bb18737ea0_Retail________PowerPointR_[HSPowerPointR]
 14_db3bbc9c-ce52-41d1-a46f-1a1d68059119_Retail________WordR_[HSWordR]
 14_dbe3aee0-5183-4ff7-8142-66050173cb01_Retail________SmallBusBasicsR_[SmallBusBasicsMSDNR]
@ -3752,7 +3750,6 @@ for %%# in (
 14_85e22450-b741-430c-a172-a37962c938af_6GKT2-KMJPK-4RRBF-8VQKB-JB%f%6G6_MAK___________InfoPathVL
 14_3f7aa693-9a7e-44fc-9309-bb3d8e604925_2TG3P-9DB76-4YT99-8RXGD-CW%f%XBP_Retail________OneNoteR_[HSOneNoteR]
 14_6860b31f-6a67-48b8-84b9-e312b3485c4b_CV64P-F4VRH-BJ33D-PH6MR-X6%f%9RY_MAK___________OneNoteVL
-14_fbf4ac36-31c8-4340-8666-79873129cf40_9D8FR-7GYBW-4YG8M-V36JK-VD%f%7CM_Retail________OutlookR
 14_a9aeabd8-63b8-4079-a28e-f531807fd6b8_J8C9M-YXMH2-9CX44-2C3YG-V7%f%692_MAK___________OutlookVL
 14_acb51361-c0db-4895-9497-1831c41f31a6_GMBWM-WVX26-7WHV4-DB43D-WV%f%DY2_Retail________PersonalR_[PersonalDemoR,PersonalPrepaidR]
 14_38252940-718c-4aa6-81a4-135398e53851_HPBQP-RJHDR-Q3472-PT9Q6-PB%f%B72_MAK___________PowerPointVL
@ -4283,7 +4280,7 @@ set tsids=
 set _resall=0

 ::  Choose activation method:
-::  In builds 26100 and later, the script will auto select StaticCID (requires internet). If no internet is detected, it will then auto select the KMS4k method. For builds lower than 26100, the script will auto select ZeroCID.
+::  In builds 19041 and later, the script will auto select StaticCID (requires internet). If no internet is detected, it will then auto select the KMS4k method. For builds lower than 19041, the script will auto select ZeroCID.
 ::  To change the activation method, run the script with the parameters "/Z-SCID", "/Z-ZCID", or "/Z-KMS4k", or modify the option from Auto to SCID, ZCID, or KMS4k in the line below.
 set _actmethod=Auto

@ -4418,8 +4415,8 @@ echo:
 echo        ______________________________________________________________
 echo: 
 call :dk_color2 %_White% "             [1] " %_Green% "Auto"
-echo                  Builds ^>= 26100 - StaticCID (KMS4k if offline)
-echo                  Builds ^<  26100 - ZeroCID
+echo                  Builds ^>= 19041 - StaticCID (KMS4k if offline)
+echo                  Builds ^<  19041 - ZeroCID
 echo              __________________________________________________
 echo: 
 echo              [2] StaticCID
@ -4428,7 +4425,8 @@ echo                  Not for Windows 7 or older
 echo              __________________________________________________
 echo:
 echo              [3] ZeroCID
-echo                  Works reliably on builds below 26100
+echo                  Works reliably on builds below 19041
+echo                  May break on builds between 19041-26100
 echo                  Does not work on builds above 26100.4188
 echo              __________________________________________________
 echo:
@ -4540,7 +4538,7 @@ if /i %_actmethod%==ZCID set tsmethod=ZeroCID
 if /i %_actmethod%==KMS4k set tsmethod=KMS4k

 if /i %_actmethod%==Auto (
-if %winbuild% GEQ 26100 (
+if %winbuild% GEQ 19041 (
 set tsmethod=StaticCID
 ) else (
 set tsmethod=ZeroCID
@ -6322,7 +6320,7 @@ using System.Xml.Linq;
 }
 #endif

-// LibTSforge/Common.cs
+// Common.cs
 namespace LibTSforge
 {
    using System;
@ -6564,7 +6562,7 @@ namespace LibTSforge
 }


-// LibTSforge/SPP/PKeyConfig.cs
+// SPP/PKeyConfig.cs
 namespace LibTSforge.SPP
 {
    using System;
@ -6590,7 +6588,7 @@ namespace LibTSforge.SPP

        public bool Contains(int n)
        {
-            return Start <= n && n <= End;
+            return Start <= n && End <= n;
        }
    }

@ -6720,19 +6718,10 @@ namespace LibTSforge.SPP
                    string refActIdStr = configNode.SelectSingleNode("./p:ActConfigId", nsmgr).InnerText;
                    Guid refActId = new Guid(refActIdStr);
                    int group = int.Parse(configNode.SelectSingleNode("./p:RefGroupId", nsmgr).InnerText);
-                    List<KeyRange> keyRanges;
-                    ranges.TryGetValue(refActIdStr, out keyRanges);
-
-                    if (keyRanges == null) 
-                    {
-                        continue;
-                    }
+                    List<KeyRange> keyRanges = ranges[refActIdStr];

                    if (keyRanges.Count > 0 && !Products.ContainsKey(refActId))
                    {
-                        PKeyAlgorithm algorithm;
-                        algorithms.TryGetValue(group, out algorithm);
-
                        ProductConfig productConfig = new ProductConfig
                        {
                            GroupId = group,
@ -6740,7 +6729,7 @@ namespace LibTSforge.SPP
                            Description = configNode.SelectSingleNode("./p:ProductDescription", nsmgr).InnerText,
                            Channel = configNode.SelectSingleNode("./p:ProductKeyType", nsmgr).InnerText,
                            Randomized = configNode.SelectSingleNode("./p:ProductKeyType", nsmgr).InnerText.ToLower() == "true",
-                            Algorithm = algorithm,
+                            Algorithm = algorithms[group],
                            Ranges = keyRanges,
                            ActivationId = refActId
                        };
@ -6790,7 +6779,7 @@ namespace LibTSforge.SPP
 }


-// LibTSforge/SPP/ProductKey.cs
+// SPP/ProductKey.cs
 namespace LibTSforge.SPP
 {
    using System;
@ -7106,7 +7095,7 @@ namespace LibTSforge.SPP
 }


-// LibTSforge/SPP/SLAPI.cs
+// SPP/SLAPI.cs
 namespace LibTSforge.SPP
 {
    using System;
@ -7519,7 +7508,7 @@ namespace LibTSforge.SPP
 }


-// LibTSforge/SPP/SPPUtils.cs
+// SPP/SPPUtils.cs
 namespace LibTSforge.SPP
 {
    using Microsoft.Win32;
@ -7856,7 +7845,7 @@ namespace LibTSforge.SPP
 }


-// LibTSforge/SPP/SPSys.cs
+// SPP/SPSys.cs
 namespace LibTSforge.SPP
 {
    using Microsoft.Win32.SafeHandles;
@ -7903,7 +7892,7 @@ namespace LibTSforge.SPP
 }


-// LibTSforge/Crypto/CryptoUtils.cs
+// Crypto/CryptoUtils.cs
 namespace LibTSforge.Crypto
 {
    using System;
@ -8038,7 +8027,7 @@ namespace LibTSforge.Crypto
 }


-// LibTSforge/Crypto/Keys.cs
+// Crypto/Keys.cs
 namespace LibTSforge.Crypto
 {
    public static class Keys
@ -8128,7 +8117,7 @@ namespace LibTSforge.Crypto
 }


-// LibTSforge/Crypto/PhysStoreCrypto.cs
+// Crypto/PhysStoreCrypto.cs
 namespace LibTSforge.Crypto
 {
    using System;
@ -8213,7 +8202,7 @@ namespace LibTSforge.Crypto
 }


-// LibTSforge/Modifiers/GenPKeyInstall.cs
+// Modifiers/GenPKeyInstall.cs
 namespace LibTSforge.Modifiers
 {
    using System;
@ -8424,7 +8413,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/GracePeriodReset.cs
+// Modifiers/GracePeriodReset.cs
 namespace LibTSforge.Modifiers
 {
    using System.Collections.Generic;
@ -8457,7 +8446,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/KeyChangeLockDelete.cs
+// Modifiers/KeyChangeLockDelete.cs
 namespace LibTSforge.Modifiers
 {
    using System.Collections.Generic;
@ -8497,7 +8486,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/KMSHostCharge.cs
+// Modifiers/KMSHostCharge.cs
 namespace LibTSforge.Modifiers
 {
    using System;
@ -8658,7 +8647,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/RearmReset.cs
+// Modifiers/RearmReset.cs
 namespace LibTSforge.Modifiers
 {
    using System.Collections.Generic;
@ -8714,7 +8703,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/SetIIDParams.cs
+// Modifiers/SetIIDParams.cs
 namespace LibTSforge.Modifiers
 {
    using PhysicalStore;
@ -8783,7 +8772,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/TamperedFlagsDelete.cs
+// Modifiers/TamperedFlagsDelete.cs
 namespace LibTSforge.Modifiers
 {
    using System.Linq;
@ -8833,7 +8822,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/UniqueIdDelete.cs
+// Modifiers/UniqueIdDelete.cs
 namespace LibTSforge.Modifiers
 {
    using System;
@ -8892,7 +8881,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Activators/KMS4K.cs
+// Activators/KMS4K.cs
 namespace LibTSforge.Activators
 {
    using System;
@ -9103,7 +9092,7 @@ namespace LibTSforge.Activators
 }


-// LibTSforge/Activators/ZeroCID.cs
+// Activators/ZeroCID.cs
 namespace LibTSforge.Activators
 {
    using System;
@ -9292,7 +9281,7 @@ namespace LibTSforge.Activators
 }


-// LibTSforge/TokenStore/Common.cs
+// TokenStore/Common.cs
 namespace LibTSforge.TokenStore
 {
    using System.Collections.Generic;
@ -9362,7 +9351,7 @@ namespace LibTSforge.TokenStore
 }


-// LibTSforge/TokenStore/ITokenStore.cs
+// TokenStore/ITokenStore.cs
 namespace LibTSforge.TokenStore
 {
    using System;
@ -9382,7 +9371,7 @@ namespace LibTSforge.TokenStore
 }


-// LibTSforge/TokenStore/TokenStoreModern.cs
+// TokenStore/TokenStoreModern.cs
 namespace LibTSforge.TokenStore
 {
    using System;
@ -9668,7 +9657,7 @@ namespace LibTSforge.TokenStore
 }


-// LibTSforge/PhysicalStore/Common.cs
+// PhysicalStore/Common.cs
 namespace LibTSforge.PhysicalStore
 {
    using System.Runtime.InteropServices;
@ -9699,7 +9688,7 @@ namespace LibTSforge.PhysicalStore
 }


-// LibTSforge/PhysicalStore/IPhysicalStore.cs
+// PhysicalStore/IPhysicalStore.cs
 namespace LibTSforge.PhysicalStore
 {
    using System;
@ -9794,7 +9783,7 @@ namespace LibTSforge.PhysicalStore
 }


-// LibTSforge/PhysicalStore/PhysicalStoreModern.cs
+// PhysicalStore/PhysicalStoreModern.cs
 namespace LibTSforge.PhysicalStore
 {
    using System;
@ -10212,7 +10201,7 @@ namespace LibTSforge.PhysicalStore
 }


-// LibTSforge/PhysicalStore/PhysicalStoreVista.cs
+// PhysicalStore/PhysicalStoreVista.cs
 namespace LibTSforge.PhysicalStore
 {
    using System;
@ -10571,7 +10560,7 @@ namespace LibTSforge.PhysicalStore
 }


-// LibTSforge/PhysicalStore/PhysicalStoreWin7.cs
+// PhysicalStore/PhysicalStoreWin7.cs
 namespace LibTSforge.PhysicalStore
 {
    using System;
@ -10948,7 +10937,7 @@ namespace LibTSforge.PhysicalStore
 }


-// LibTSforge/PhysicalStore/VariableBag.cs
+// PhysicalStore/VariableBag.cs
 namespace LibTSforge.PhysicalStore
 {
    using System;
--- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
@ -1,4 +1,4 @@
-@set masver=3.6
+@set masver=3.5
@echo off


@ -1855,22 +1855,19 @@ call :dk_color %Gray% "Checking SkipRearm                      [Default 0 Value

 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% "$s=New-Object -ComObject 'Schedule.Service'; $s.Connect(); $state=$s.GetFolder('\Microsoft\Windows\SoftwareProtectionPlatform').GetTask('SvcRestartTask').State; @{0='Unknown';1='Disabled';2='Queued';3='Ready';4='Running'}[$state]" %nul6%') do (set taskinfo=%%a)
+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 %Gray% "Checking SvcRestartTask Status          [!taskinfo!. System might deactivate later.]"
+call :dk_color %Red% "Checking SvcRestartTask Status          [!taskinfo!, system might deactivate later]"
 if not defined showfix (
 echo:
-echo "!taskinfo!" | findstr /i "Removed Not Found" %nul1% && (
-set fixes=%fixes% %mas%in-place_repair_upgrade
-call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade"
-) || (
 call :dk_color %Blue% "Reboot your machine using the restart option and run the script again."
-)
+set fixes=%fixes% %mas%troubleshoot
+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot"
 echo:
 )
 )
--- a/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
@ -1,4 +1,4 @@
-@set masver=3.6
+@set masver=3.5
@echo off


@ -1940,22 +1940,19 @@ call :dk_color %Gray% "Checking SkipRearm                      [Default 0 Value

 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% "$s=New-Object -ComObject 'Schedule.Service'; $s.Connect(); $state=$s.GetFolder('\Microsoft\Windows\SoftwareProtectionPlatform').GetTask('SvcRestartTask').State; @{0='Unknown';1='Disabled';2='Queued';3='Ready';4='Running'}[$state]" %nul6%') do (set taskinfo=%%a)
+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 %Gray% "Checking SvcRestartTask Status          [!taskinfo!. System might deactivate later.]"
+call :dk_color %Red% "Checking SvcRestartTask Status          [!taskinfo!, system might deactivate later]"
 if not defined showfix (
 echo:
-echo "!taskinfo!" | findstr /i "Removed Not Found" %nul1% && (
-set fixes=%fixes% %mas%in-place_repair_upgrade
-call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade"
-) || (
 call :dk_color %Blue% "Reboot your machine using the restart option and run the script again."
-)
+set fixes=%fixes% %mas%troubleshoot
+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot"
 echo:
 )
 )
--- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
+++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
@ -1,4 +1,4 @@
-@set masver=3.6
+@set masver=3.5
@echo off


@ -2541,22 +2541,19 @@ call :dk_color %Gray% "Checking SkipRearm                      [Default 0 Value

 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% "$s=New-Object -ComObject 'Schedule.Service'; $s.Connect(); $state=$s.GetFolder('\Microsoft\Windows\SoftwareProtectionPlatform').GetTask('SvcRestartTask').State; @{0='Unknown';1='Disabled';2='Queued';3='Ready';4='Running'}[$state]" %nul6%') do (set taskinfo=%%a)
+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 %Gray% "Checking SvcRestartTask Status          [!taskinfo!. System might deactivate later.]"
+call :dk_color %Red% "Checking SvcRestartTask Status          [!taskinfo!, system might deactivate later]"
 if not defined showfix (
 echo:
-echo "!taskinfo!" | findstr /i "Removed Not Found" %nul1% && (
-set fixes=%fixes% %mas%in-place_repair_upgrade
-call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade"
-) || (
 call :dk_color %Blue% "Reboot your machine using the restart option and run the script again."
-)
+set fixes=%fixes% %mas%troubleshoot
+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot"
 echo:
 )
 )
@ -2686,6 +2683,7 @@ exit /b

 14_4eaff0d0-c6cb-4187-94f3-c7656d49a0aa_Retail________ExcelR_[HSExcelR]
 14_7004b7f0-6407-4f45-8eac-966e5f868bde_Retail________GrooveR
+14_fbf4ac36-31c8-4340-8666-79873129cf40_Retail________OutlookR
 14_133c8359-4e93-4241-8118-30bb18737ea0_Retail________PowerPointR_[HSPowerPointR]
 14_db3bbc9c-ce52-41d1-a46f-1a1d68059119_Retail________WordR_[HSWordR]
 14_dbe3aee0-5183-4ff7-8142-66050173cb01_Retail________SmallBusBasicsR_[SmallBusBasicsMSDNR]
@ -2714,7 +2712,6 @@ for %%# in (
 14_85e22450-b741-430c-a172-a37962c938af_6GKT2-KMJPK-4RRBF-8VQKB-JB%f%6G6_MAK___________InfoPathVL
 14_3f7aa693-9a7e-44fc-9309-bb3d8e604925_2TG3P-9DB76-4YT99-8RXGD-CW%f%XBP_Retail________OneNoteR_[HSOneNoteR]
 14_6860b31f-6a67-48b8-84b9-e312b3485c4b_CV64P-F4VRH-BJ33D-PH6MR-X6%f%9RY_MAK___________OneNoteVL
-14_fbf4ac36-31c8-4340-8666-79873129cf40_9D8FR-7GYBW-4YG8M-V36JK-VD%f%7CM_Retail________OutlookR
 14_a9aeabd8-63b8-4079-a28e-f531807fd6b8_J8C9M-YXMH2-9CX44-2C3YG-V7%f%692_MAK___________OutlookVL
 14_acb51361-c0db-4895-9497-1831c41f31a6_GMBWM-WVX26-7WHV4-DB43D-WV%f%DY2_Retail________PersonalR_[PersonalDemoR,PersonalPrepaidR]
 14_38252940-718c-4aa6-81a4-135398e53851_HPBQP-RJHDR-Q3472-PT9Q6-PB%f%B72_MAK___________PowerPointVL
--- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
@ -1,4 +1,4 @@
-@set masver=3.6
+@set masver=3.5
@echo off


@ -3604,22 +3604,19 @@ call :dk_color %Gray% "Checking SkipRearm                      [Default 0 Value

 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% "$s=New-Object -ComObject 'Schedule.Service'; $s.Connect(); $state=$s.GetFolder('\Microsoft\Windows\SoftwareProtectionPlatform').GetTask('SvcRestartTask').State; @{0='Unknown';1='Disabled';2='Queued';3='Ready';4='Running'}[$state]" %nul6%') do (set taskinfo=%%a)
+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 %Gray% "Checking SvcRestartTask Status          [!taskinfo!. System might deactivate later.]"
+call :dk_color %Red% "Checking SvcRestartTask Status          [!taskinfo!, system might deactivate later]"
 if not defined showfix (
 echo:
-echo "!taskinfo!" | findstr /i "Removed Not Found" %nul1% && (
-set fixes=%fixes% %mas%in-place_repair_upgrade
-call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade"
-) || (
 call :dk_color %Blue% "Reboot your machine using the restart option and run the script again."
-)
+set fixes=%fixes% %mas%troubleshoot
+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot"
 echo:
 )
 )
--- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
@ -1,4 +1,4 @@
-@set masver=3.6
+@set masver=3.5
@echo off


@ -46,7 +46,7 @@ set tsids=
 set _resall=0

 ::  Choose activation method:
-::  In builds 26100 and later, the script will auto select StaticCID (requires internet). If no internet is detected, it will then auto select the KMS4k method. For builds lower than 26100, the script will auto select ZeroCID.
+::  In builds 19041 and later, the script will auto select StaticCID (requires internet). If no internet is detected, it will then auto select the KMS4k method. For builds lower than 19041, the script will auto select ZeroCID.
 ::  To change the activation method, run the script with the parameters "/Z-SCID", "/Z-ZCID", or "/Z-KMS4k", or modify the option from Auto to SCID, ZCID, or KMS4k in the line below.
 set _actmethod=Auto

@ -545,8 +545,8 @@ echo:
 echo        ______________________________________________________________
 echo: 
 call :dk_color2 %_White% "             [1] " %_Green% "Auto"
-echo                  Builds ^>= 26100 - StaticCID (KMS4k if offline)
-echo                  Builds ^<  26100 - ZeroCID
+echo                  Builds ^>= 19041 - StaticCID (KMS4k if offline)
+echo                  Builds ^<  19041 - ZeroCID
 echo              __________________________________________________
 echo: 
 echo              [2] StaticCID
@ -555,7 +555,8 @@ echo                  Not for Windows 7 or older
 echo              __________________________________________________
 echo:
 echo              [3] ZeroCID
-echo                  Works reliably on builds below 26100
+echo                  Works reliably on builds below 19041
+echo                  May break on builds between 19041-26100
 echo                  Does not work on builds above 26100.4188
 echo              __________________________________________________
 echo:
@ -667,7 +668,7 @@ if /i %_actmethod%==ZCID set tsmethod=ZeroCID
 if /i %_actmethod%==KMS4k set tsmethod=KMS4k

 if /i %_actmethod%==Auto (
-if %winbuild% GEQ 26100 (
+if %winbuild% GEQ 19041 (
 set tsmethod=StaticCID
 ) else (
 set tsmethod=ZeroCID
@ -3609,22 +3610,19 @@ call :dk_color %Gray% "Checking SkipRearm                      [Default 0 Value

 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% "$s=New-Object -ComObject 'Schedule.Service'; $s.Connect(); $state=$s.GetFolder('\Microsoft\Windows\SoftwareProtectionPlatform').GetTask('SvcRestartTask').State; @{0='Unknown';1='Disabled';2='Queued';3='Ready';4='Running'}[$state]" %nul6%') do (set taskinfo=%%a)
+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 %Gray% "Checking SvcRestartTask Status          [!taskinfo!. System might deactivate later.]"
+call :dk_color %Red% "Checking SvcRestartTask Status          [!taskinfo!, system might deactivate later]"
 if not defined showfix (
 echo:
-echo "!taskinfo!" | findstr /i "Removed Not Found" %nul1% && (
-set fixes=%fixes% %mas%in-place_repair_upgrade
-call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade"
-) || (
 call :dk_color %Blue% "Reboot your machine using the restart option and run the script again."
-)
+set fixes=%fixes% %mas%troubleshoot
+call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot"
 echo:
 )
 )
@ -3954,7 +3952,7 @@ using System.Xml.Linq;
 }
 #endif

-// LibTSforge/Common.cs
+// Common.cs
 namespace LibTSforge
 {
    using System;
@ -4196,7 +4194,7 @@ namespace LibTSforge
 }


-// LibTSforge/SPP/PKeyConfig.cs
+// SPP/PKeyConfig.cs
 namespace LibTSforge.SPP
 {
    using System;
@ -4222,7 +4220,7 @@ namespace LibTSforge.SPP

        public bool Contains(int n)
        {
-            return Start <= n && n <= End;
+            return Start <= n && End <= n;
        }
    }

@ -4352,19 +4350,10 @@ namespace LibTSforge.SPP
                    string refActIdStr = configNode.SelectSingleNode("./p:ActConfigId", nsmgr).InnerText;
                    Guid refActId = new Guid(refActIdStr);
                    int group = int.Parse(configNode.SelectSingleNode("./p:RefGroupId", nsmgr).InnerText);
-                    List<KeyRange> keyRanges;
-                    ranges.TryGetValue(refActIdStr, out keyRanges);
-
-                    if (keyRanges == null) 
-                    {
-                        continue;
-                    }
+                    List<KeyRange> keyRanges = ranges[refActIdStr];

                    if (keyRanges.Count > 0 && !Products.ContainsKey(refActId))
                    {
-                        PKeyAlgorithm algorithm;
-                        algorithms.TryGetValue(group, out algorithm);
-
                        ProductConfig productConfig = new ProductConfig
                        {
                            GroupId = group,
@ -4372,7 +4361,7 @@ namespace LibTSforge.SPP
                            Description = configNode.SelectSingleNode("./p:ProductDescription", nsmgr).InnerText,
                            Channel = configNode.SelectSingleNode("./p:ProductKeyType", nsmgr).InnerText,
                            Randomized = configNode.SelectSingleNode("./p:ProductKeyType", nsmgr).InnerText.ToLower() == "true",
-                            Algorithm = algorithm,
+                            Algorithm = algorithms[group],
                            Ranges = keyRanges,
                            ActivationId = refActId
                        };
@ -4422,7 +4411,7 @@ namespace LibTSforge.SPP
 }


-// LibTSforge/SPP/ProductKey.cs
+// SPP/ProductKey.cs
 namespace LibTSforge.SPP
 {
    using System;
@ -4738,7 +4727,7 @@ namespace LibTSforge.SPP
 }


-// LibTSforge/SPP/SLAPI.cs
+// SPP/SLAPI.cs
 namespace LibTSforge.SPP
 {
    using System;
@ -5151,7 +5140,7 @@ namespace LibTSforge.SPP
 }


-// LibTSforge/SPP/SPPUtils.cs
+// SPP/SPPUtils.cs
 namespace LibTSforge.SPP
 {
    using Microsoft.Win32;
@ -5488,7 +5477,7 @@ namespace LibTSforge.SPP
 }


-// LibTSforge/SPP/SPSys.cs
+// SPP/SPSys.cs
 namespace LibTSforge.SPP
 {
    using Microsoft.Win32.SafeHandles;
@ -5535,7 +5524,7 @@ namespace LibTSforge.SPP
 }


-// LibTSforge/Crypto/CryptoUtils.cs
+// Crypto/CryptoUtils.cs
 namespace LibTSforge.Crypto
 {
    using System;
@ -5670,7 +5659,7 @@ namespace LibTSforge.Crypto
 }


-// LibTSforge/Crypto/Keys.cs
+// Crypto/Keys.cs
 namespace LibTSforge.Crypto
 {
    public static class Keys
@ -5760,7 +5749,7 @@ namespace LibTSforge.Crypto
 }


-// LibTSforge/Crypto/PhysStoreCrypto.cs
+// Crypto/PhysStoreCrypto.cs
 namespace LibTSforge.Crypto
 {
    using System;
@ -5845,7 +5834,7 @@ namespace LibTSforge.Crypto
 }


-// LibTSforge/Modifiers/GenPKeyInstall.cs
+// Modifiers/GenPKeyInstall.cs
 namespace LibTSforge.Modifiers
 {
    using System;
@ -6056,7 +6045,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/GracePeriodReset.cs
+// Modifiers/GracePeriodReset.cs
 namespace LibTSforge.Modifiers
 {
    using System.Collections.Generic;
@ -6089,7 +6078,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/KeyChangeLockDelete.cs
+// Modifiers/KeyChangeLockDelete.cs
 namespace LibTSforge.Modifiers
 {
    using System.Collections.Generic;
@ -6129,7 +6118,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/KMSHostCharge.cs
+// Modifiers/KMSHostCharge.cs
 namespace LibTSforge.Modifiers
 {
    using System;
@ -6290,7 +6279,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/RearmReset.cs
+// Modifiers/RearmReset.cs
 namespace LibTSforge.Modifiers
 {
    using System.Collections.Generic;
@ -6346,7 +6335,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/SetIIDParams.cs
+// Modifiers/SetIIDParams.cs
 namespace LibTSforge.Modifiers
 {
    using PhysicalStore;
@ -6415,7 +6404,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/TamperedFlagsDelete.cs
+// Modifiers/TamperedFlagsDelete.cs
 namespace LibTSforge.Modifiers
 {
    using System.Linq;
@ -6465,7 +6454,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Modifiers/UniqueIdDelete.cs
+// Modifiers/UniqueIdDelete.cs
 namespace LibTSforge.Modifiers
 {
    using System;
@ -6524,7 +6513,7 @@ namespace LibTSforge.Modifiers
 }


-// LibTSforge/Activators/KMS4K.cs
+// Activators/KMS4K.cs
 namespace LibTSforge.Activators
 {
    using System;
@ -6735,7 +6724,7 @@ namespace LibTSforge.Activators
 }


-// LibTSforge/Activators/ZeroCID.cs
+// Activators/ZeroCID.cs
 namespace LibTSforge.Activators
 {
    using System;
@ -6924,7 +6913,7 @@ namespace LibTSforge.Activators
 }


-// LibTSforge/TokenStore/Common.cs
+// TokenStore/Common.cs
 namespace LibTSforge.TokenStore
 {
    using System.Collections.Generic;
@ -6994,7 +6983,7 @@ namespace LibTSforge.TokenStore
 }


-// LibTSforge/TokenStore/ITokenStore.cs
+// TokenStore/ITokenStore.cs
 namespace LibTSforge.TokenStore
 {
    using System;
@ -7014,7 +7003,7 @@ namespace LibTSforge.TokenStore
 }


-// LibTSforge/TokenStore/TokenStoreModern.cs
+// TokenStore/TokenStoreModern.cs
 namespace LibTSforge.TokenStore
 {
    using System;
@ -7300,7 +7289,7 @@ namespace LibTSforge.TokenStore
 }


-// LibTSforge/PhysicalStore/Common.cs
+// PhysicalStore/Common.cs
 namespace LibTSforge.PhysicalStore
 {
    using System.Runtime.InteropServices;
@ -7331,7 +7320,7 @@ namespace LibTSforge.PhysicalStore
 }


-// LibTSforge/PhysicalStore/IPhysicalStore.cs
+// PhysicalStore/IPhysicalStore.cs
 namespace LibTSforge.PhysicalStore
 {
    using System;
@ -7426,7 +7415,7 @@ namespace LibTSforge.PhysicalStore
 }


-// LibTSforge/PhysicalStore/PhysicalStoreModern.cs
+// PhysicalStore/PhysicalStoreModern.cs
 namespace LibTSforge.PhysicalStore
 {
    using System;
@ -7844,7 +7833,7 @@ namespace LibTSforge.PhysicalStore
 }


-// LibTSforge/PhysicalStore/PhysicalStoreVista.cs
+// PhysicalStore/PhysicalStoreVista.cs
 namespace LibTSforge.PhysicalStore
 {
    using System;
@ -8203,7 +8192,7 @@ namespace LibTSforge.PhysicalStore
 }


-// LibTSforge/PhysicalStore/PhysicalStoreWin7.cs
+// PhysicalStore/PhysicalStoreWin7.cs
 namespace LibTSforge.PhysicalStore
 {
    using System;
@ -8580,7 +8569,7 @@ namespace LibTSforge.PhysicalStore
 }


-// LibTSforge/PhysicalStore/VariableBag.cs
+// PhysicalStore/VariableBag.cs
 namespace LibTSforge.PhysicalStore
 {
    using System;
--- a/MAS/Separate-Files-Version/Change_Office_Edition.cmd
+++ b/MAS/Separate-Files-Version/Change_Office_Edition.cmd
@ -1,4 +1,4 @@
-@set masver=3.6
+@set masver=3.5
@echo off


--- a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
+++ b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd
@ -1,4 +1,4 @@
-@set masver=3.6
+@set masver=3.5
@echo off


--- a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
+++ b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
@ -1,4 +1,4 @@
-@set masver=3.6
+@set masver=3.5
@echo off


--- a/MAS/Separate-Files-Version/Troubleshoot.cmd
+++ b/MAS/Separate-Files-Version/Troubleshoot.cmd
@ -1,4 +1,4 @@
-@set masver=3.6
+@set masver=3.5
@echo off


--- a/README.md
+++ b/README.md
@ -84,8 +84,8 @@ or
 ---

 ```
-Latest Version: 3.6
-Release date: 9-Sep-2025
+Latest Version: 3.5
+Release date: 10-Aug-2025
 ```

 ### [Troubleshooting / Help](https://massgrave.dev/troubleshoot)