From 628fbc448bd2ee9a965fd2bf923e4d098dc549fe Mon Sep 17 00:00:00 2001
From: "Mr. Rubber Ducky" <79613254+MrRubberDucky@users.noreply.github.com>
Date: Wed, 12 Feb 2025 18:28:27 +0100
Subject: [PATCH] Fix small screw ups

---
 py-kms/KmsDataBase.xml | 183 ++++++++++++++++++++++++++++-------------
 1 file changed, 126 insertions(+), 57 deletions(-)

diff --git a/py-kms/KmsDataBase.xml b/py-kms/KmsDataBase.xml
index 3a751b3..d0c9d8a 100644
--- a/py-kms/KmsDataBase.xml
+++ b/py-kms/KmsDataBase.xml
@@ -6,7 +6,7 @@ https://forums.mydigitallife.net/threads/miscellaneous-kms-related-developments.
 https://github.com/Py-KMS-Organization/py-kms/pulls?q=is%3Apr+is%3Aclosed
 https://github.com/Py-KMS-Organization/py-kms/issues
 
-Slightly modified for py-kms
+Rewrite for later use, needs to be done fully.
 
 Documentation about options:
 <KmsData
@@ -120,9 +120,6 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
     </WinBuilds>
 
     <CsvlkItems>
-        <!-- 
-            # Windows Server block
-        -->
 
         <!-- Windows Server 2025 -->
         <CsvlkItem DisplayName="Windows Server 2025" ReleaseDate="2024-04-26T00:00:00Z" VlmcsdIndex="0" GroupId="4918" MinKeyId="30000" MaxKeyId="20029999" IniFileName="Windows" Id="84e331f6-4279-48c4-ab10-b75139181351" InvalidWinBuild="[0,1,2,3]">
@@ -151,7 +148,7 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
         </CsvlkItem>
 
         <!-- Need different entry due to different CSVLK. It lists both editions as possible for this CSVLK? -->
-        <CsvlkItem DisplayName="Windows Server 2025 (Azure-only)" ReleaseDate="2024-11-01T00:00:00Z" VlmcsdIndex="0" GroupId="4919" MinKeyId="0" MaxKeyId="49999" IniFileName="Windows" Id="82fcf64d-f9dd-4411-9c79-f2eed16d4eb8" InvalidWinBuild="[0,1,2,3]" />
+        <CsvlkItem DisplayName="Windows Server 2025 (Azure-only)" ReleaseDate="2024-11-01T00:00:00Z" VlmcsdIndex="0" GroupId="4919" MinKeyId="0" MaxKeyId="49999" IniFileName="Windows" Id="82fcf64d-f9dd-4411-9c79-f2eed16d4eb8" InvalidWinBuild="[0,1,2,3]" >
             <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
             <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
             <Activate KmsItem="8fe53387-3087-4447-8985-f75132215ac9" />
@@ -177,7 +174,7 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
             <Activate KmsItem="cbdcb1ba-e093-4c81-a463-10775291fdf9" />
         </CsvlkItem>
 
-        <CsvlkItem DisplayName="Windows Server 2025 Standard / Datacenter (Microsoft Internal Lab)" ReleaseDate="2024-04-26T00:00:00Z" IsLab="true" VlmcsdIndex="0" GroupId="4920" MinKeyId="0" MaxKeyId="49999" IniFileName="Windows" Id="6bad0243-1c35-46b2-b8e6-7a853e37413f"/>
+        <CsvlkItem DisplayName="Windows Server 2025 Standard / Datacenter (Microsoft Internal Lab)" ReleaseDate="2024-04-26T00:00:00Z" IsLab="true" VlmcsdIndex="0" GroupId="4920" MinKeyId="0" MaxKeyId="49999" IniFileName="Windows" Id="6bad0243-1c35-46b2-b8e6-7a853e37413f">
             <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
             <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
             <Activate KmsItem="8fe53387-3087-4447-8985-f75132215ac9" />
@@ -206,7 +203,6 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
             <Activate KmsItem="e1c51358-fe3e-4203-a4a2-3b6b20c9734e" />
         </CsvlkItem>
 
-
         <!-- Windows Server 2022 -->
         <CsvlkItem DisplayName="Windows Server 2022 Standard / Datacenter" ReleaseDate="2021-06-08T00:00:00Z" VlmcsdIndex="0" GroupId="4573" MinKeyId="0" MaxKeyId="49999" IniFileName="Windows" Id="6bad0243-1c35-46b2-b8e6-7a853e37413f" InvalidWinBuild="[0,1,2]">
             <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
@@ -253,7 +249,7 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
             <Activate KmsItem="cbdcb1ba-e093-4c81-a463-10775291fdf9" />
         </CsvlkItem>
 
-        <CsvlkItem DisplayName="Windows Server 2022 (Microsoft Internal Lab)" ReleaseDate="2021-06-08T00:00:00Z" VlmcsdIndex="0" GroupId="4575" MinKeyId="0" MaxKeyId="49999" IniFileName="Windows" IniFileName="Windows" Id="22105925-48c3-4ff4-a294-f654bb27e390" IsLab="true">
+        <CsvlkItem DisplayName="Windows Server 2022 (Microsoft Internal Lab)" ReleaseDate="2021-06-08T00:00:00Z" VlmcsdIndex="0" GroupId="4575" MinKeyId="0" MaxKeyId="49999" IniFileName="Windows" Id="22105925-48c3-4ff4-a294-f654bb27e390" IsLab="true">
             <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
             <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
             <Activate KmsItem="8fe53387-3087-4447-8985-f75132215ac9" />
@@ -389,50 +385,143 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
         </CsvlkItem>
 
         <CsvlkItem DisplayName="Windows Server 2012 R2 With Win 10" ReleaseDate="2015-07-29T00:00:00Z" GroupId="206" MinKeyId="405000000" MaxKeyId="424999999" IniFileName="Windows" Id="20e938bb-df44-45ee-bde1-4e4fe7477f37" InvalidWinBuild="[0]">
+            <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
+            <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
+            <Activate KmsItem="8fe53387-3087-4447-8985-f75132215ac9" />
+            <Activate KmsItem="8a21fdf3-cbc5-44eb-83f3-fe284e6680a7" />
+            <Activate KmsItem="7fde5219-fbfa-484a-82c9-34d1ad53e856" />
+            <Activate KmsItem="0fc6ccaf-ff0e-4fae-9d08-4370785bf7ed" />
+            <Activate KmsItem="ca87f5b6-cd46-40c0-b06d-8ecd57a4373f" />
+            <Activate KmsItem="b2ca2689-a9a8-42d7-938d-cf8e9f201958" />
+            <Activate KmsItem="3c40b358-5948-45af-923b-53d21fcc7e79" />
+            <Activate KmsItem="8665cb71-468c-4aa3-a337-cb9bc9d5eaac" />
+            <Activate KmsItem="cb8fc780-2c05-495a-9710-85afffc904d7" />
             <Activate KmsItem="8456efd3-0c04-4089-8740-5b7238535a65" />
+            <Activate KmsItem="58e2134f-8e11-4d17-9cb2-91069c151148" />
+            <Activate KmsItem="d27cd636-1962-44e9-8b4f-27b6c23efb85" />
         </CsvlkItem>
 
         <CsvlkItem DisplayName="Windows Server 2012 R2 With Win 10 (Microsoft Internal Lab)" ReleaseDate="2015-07-29T00:00:00Z" IsLab="true" GroupId="206" MinKeyId="17650000" MaxKeyId="17849999" IniFileName="Windows" Id="9e3fde40-d4b3-4c1d-9bde-32735aa19b39" InvalidWinBuild="[0]">
+            <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
+            <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
+            <Activate KmsItem="8fe53387-3087-4447-8985-f75132215ac9" />
+            <Activate KmsItem="8a21fdf3-cbc5-44eb-83f3-fe284e6680a7" />
+            <Activate KmsItem="7fde5219-fbfa-484a-82c9-34d1ad53e856" />
+            <Activate KmsItem="0fc6ccaf-ff0e-4fae-9d08-4370785bf7ed" />
+            <Activate KmsItem="ca87f5b6-cd46-40c0-b06d-8ecd57a4373f" />
+            <Activate KmsItem="b2ca2689-a9a8-42d7-938d-cf8e9f201958" />
+            <Activate KmsItem="3c40b358-5948-45af-923b-53d21fcc7e79" />
+            <Activate KmsItem="8665cb71-468c-4aa3-a337-cb9bc9d5eaac" />
+            <Activate KmsItem="cb8fc780-2c05-495a-9710-85afffc904d7" />
             <Activate KmsItem="8456efd3-0c04-4089-8740-5b7238535a65" />
+            <Activate KmsItem="58e2134f-8e11-4d17-9cb2-91069c151148" />
+            <Activate KmsItem="d27cd636-1962-44e9-8b4f-27b6c23efb85" />
+            <Activate KmsItem="bbb97b3b-8ca4-4a28-9717-89fabd42c4ac" />
+            <Activate KmsItem="6d646890-3606-461a-86ab-598bb84ace82" />
+            <Activate KmsItem="e1c51358-fe3e-4203-a4a2-3b6b20c9734e" />
         </CsvlkItem>
 
         <CsvlkItem DisplayName="Windows Server 2012 R2" ReleaseDate="2013-10-17T00:00:00Z" GroupId="206" MinKeyId="271000000" MaxKeyId="310999999" IniFileName="Windows" Id="dcb88f6f-b090-405b-850e-dabcccf3693f" InvalidWinBuild="[0]">
+            <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
+            <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
+            <Activate KmsItem="8fe53387-3087-4447-8985-f75132215ac9" />
+            <Activate KmsItem="8a21fdf3-cbc5-44eb-83f3-fe284e6680a7" />
+            <Activate KmsItem="7fde5219-fbfa-484a-82c9-34d1ad53e856" />
+            <Activate KmsItem="0fc6ccaf-ff0e-4fae-9d08-4370785bf7ed" />
+            <Activate KmsItem="ca87f5b6-cd46-40c0-b06d-8ecd57a4373f" />
+            <Activate KmsItem="b2ca2689-a9a8-42d7-938d-cf8e9f201958" />
+            <Activate KmsItem="3c40b358-5948-45af-923b-53d21fcc7e79" />
+            <Activate KmsItem="8665cb71-468c-4aa3-a337-cb9bc9d5eaac" />
+            <Activate KmsItem="cb8fc780-2c05-495a-9710-85afffc904d7" />
             <Activate KmsItem="8456efd3-0c04-4089-8740-5b7238535a65" />
         </CsvlkItem>
 
         <CsvlkItem DisplayName="Windows Server 2012 R2 (Microsoft Internal Lab)" ReleaseDate="2012-10-26T00:00:00Z" IsLab="true" GroupId="206" MinKeyId="98500000" MaxKeyId="98999999" IniFileName="Windows" Id="fe27276b-a5a9-4b4d-88e3-14271beb79be" InvalidWinBuild="[0]">
+            <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
+            <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
+            <Activate KmsItem="8fe53387-3087-4447-8985-f75132215ac9" />
+            <Activate KmsItem="8a21fdf3-cbc5-44eb-83f3-fe284e6680a7" />
+            <Activate KmsItem="7fde5219-fbfa-484a-82c9-34d1ad53e856" />
+            <Activate KmsItem="0fc6ccaf-ff0e-4fae-9d08-4370785bf7ed" />
+            <Activate KmsItem="ca87f5b6-cd46-40c0-b06d-8ecd57a4373f" />
+            <Activate KmsItem="b2ca2689-a9a8-42d7-938d-cf8e9f201958" />
+            <Activate KmsItem="3c40b358-5948-45af-923b-53d21fcc7e79" />
             <Activate KmsItem="8665cb71-468c-4aa3-a337-cb9bc9d5eaac" />
+            <Activate KmsItem="cb8fc780-2c05-495a-9710-85afffc904d7" />
+            <Activate KmsItem="8456efd3-0c04-4089-8740-5b7238535a65" />
+            <Activate KmsItem="bbb97b3b-8ca4-4a28-9717-89fabd42c4ac" />
+            <Activate KmsItem="6d646890-3606-461a-86ab-598bb84ace82" />
         </CsvlkItem>
 
         <CsvlkItem DisplayName="Windows Server 2012" GroupId="206" MinKeyId="152000000" MaxKeyId="191999999" IniFileName="Windows" Id="7b37c913-252b-46be-ad80-b2b5ceade8af" InvalidWinBuild="[0]">
+            <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
+            <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
+            <Activate KmsItem="8fe53387-3087-4447-8985-f75132215ac9" />
+            <Activate KmsItem="8a21fdf3-cbc5-44eb-83f3-fe284e6680a7" />
+            <Activate KmsItem="7fde5219-fbfa-484a-82c9-34d1ad53e856" />
+            <Activate KmsItem="0fc6ccaf-ff0e-4fae-9d08-4370785bf7ed" />
+            <Activate KmsItem="ca87f5b6-cd46-40c0-b06d-8ecd57a4373f" />
+            <Activate KmsItem="b2ca2689-a9a8-42d7-938d-cf8e9f201958" />
+            <Activate KmsItem="3c40b358-5948-45af-923b-53d21fcc7e79" />
             <Activate KmsItem="8665cb71-468c-4aa3-a337-cb9bc9d5eaac" />
         </CsvlkItem>
 
         <CsvlkItem DisplayName="Windows Server 2012 (Microsoft internal Lab)" IsLab="true" GroupId="206" MinKeyId="98500000" MaxKeyId="98999999" IniFileName="Windows" Id="fe27276b-a5a9-4b4d-88e3-14271beb79be" InvalidWinBuild="[0]">
+            <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
+            <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
+            <Activate KmsItem="8fe53387-3087-4447-8985-f75132215ac9" />
+            <Activate KmsItem="8a21fdf3-cbc5-44eb-83f3-fe284e6680a7" />
+            <Activate KmsItem="7fde5219-fbfa-484a-82c9-34d1ad53e856" />
+            <Activate KmsItem="0fc6ccaf-ff0e-4fae-9d08-4370785bf7ed" />
+            <Activate KmsItem="ca87f5b6-cd46-40c0-b06d-8ecd57a4373f" />
+            <Activate KmsItem="b2ca2689-a9a8-42d7-938d-cf8e9f201958" />
+            <Activate KmsItem="3c40b358-5948-45af-923b-53d21fcc7e79" />
             <Activate KmsItem="8665cb71-468c-4aa3-a337-cb9bc9d5eaac" />
+            <Activate KmsItem="bbb97b3b-8ca4-4a28-9717-89fabd42c4ac" />
         </CsvlkItem>
 
-        <CsvlkItem DisplayName="Windows Server 2008 R2 C (Datacenter and Itanikum)" ReleaseDate="2009-10-22T00:00:00Z" GroupId="168" MinKeyId="305000000" MaxKeyId="312119999" IniFileName="Windows" Id="8fe15d04-fc66-40e6-bf34-942481e06fd8" InvalidWinBuild="[0]">
+        <CsvlkItem DisplayName="Windows Server 2008 R2 C (Datacenter)" ReleaseDate="2009-10-22T00:00:00Z" GroupId="168" MinKeyId="305000000" MaxKeyId="312119999" IniFileName="Windows" Id="8fe15d04-fc66-40e6-bf34-942481e06fd8" InvalidWinBuild="[0]">
+            <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
+            <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
+            <Activate KmsItem="8fe53387-3087-4447-8985-f75132215ac9" />
+            <Activate KmsItem="8a21fdf3-cbc5-44eb-83f3-fe284e6680a7" />
+            <Activate KmsItem="7fde5219-fbfa-484a-82c9-34d1ad53e856" />
+            <Activate KmsItem="0fc6ccaf-ff0e-4fae-9d08-4370785bf7ed" />
+            <Activate KmsItem="ca87f5b6-cd46-40c0-b06d-8ecd57a4373f" />
             <Activate KmsItem="b2ca2689-a9a8-42d7-938d-cf8e9f201958" />
         </CsvlkItem>
 
         <CsvlkItem DisplayName="Windows Server 2008 R2 B (Standard and Enterprise)" ReleaseDate="2009-10-22T00:00:00Z" GroupId="168" MinKeyId="312880000" MaxKeyId="332999999" IniFileName="Windows" Id="c99b641f-c4ea-4e63-bec3-5ed2ccd0f357" InvalidWinBuild="[0]">
+            <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
+            <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
+            <Activate KmsItem="8fe53387-3087-4447-8985-f75132215ac9" />
+            <Activate KmsItem="7fde5219-fbfa-484a-82c9-34d1ad53e856" />
+            <Activate KmsItem="0fc6ccaf-ff0e-4fae-9d08-4370785bf7ed" />
             <Activate KmsItem="ca87f5b6-cd46-40c0-b06d-8ecd57a4373f" />
         </CsvlkItem>
 
         <CsvlkItem DisplayName="Windows Server 2008 R2 A (Web and HPC)" ReleaseDate="2009-10-22T00:00:00Z"  GroupId="168" MinKeyId="249000000" MaxKeyId="259119999" IniFileName="Windows" Id="f73d1bcd-0802-47dd-b2d9-81bf2f8c0744" InvalidWinBuild="[0]">
+            <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
+            <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
+            <Activate KmsItem="7fde5219-fbfa-484a-82c9-34d1ad53e856" />
             <Activate KmsItem="0fc6ccaf-ff0e-4fae-9d08-4370785bf7ed" />
         </CsvlkItem>
 
         <CsvlkItem DisplayName="Windows Server 2008 C (Datacenter and Itanium)" ReleaseDate="2006-11-30T00:00:00Z" GroupId="152" MinKeyId="381000000" MaxKeyId="392999999" IniFileName="Windows" Id="c90d1b4e-8aa8-439e-8b9e-b6d6b6a6d975" InvalidWinBuild="[]">
+            <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
+            <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
+            <Activate KmsItem="8fe53387-3087-4447-8985-f75132215ac9" />
             <Activate KmsItem="8a21fdf3-cbc5-44eb-83f3-fe284e6680a7" />
         </CsvlkItem>
 
         <CsvlkItem DisplayName="Windows Server 2008 B (Standard and Enterprise)" ReleaseDate="2006-11-30T00:00:00Z" GroupId="152" MinKeyId="339000000" MaxKeyId="358999999" IniFileName="Windows" Id="56df4151-1f9f-41bf-acaa-2941c071872b" InvalidWinBuild="[]">
+            <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
+            <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
             <Activate KmsItem="8fe53387-3087-4447-8985-f75132215ac9" />
         </CsvlkItem>
 
         <CsvlkItem DisplayName="Windows Server 2008 A (Web and HPC)" ReleaseDate="2006-11-30T00:00:00Z" GroupId="152" MinKeyId="368000000" MaxKeyId="380999999" IniFileName="Windows" Id="c448fa06-49d1-44ec-82bb-0085545c3b51" InvalidWinBuild="[]">
+            <Activate KmsItem="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" />
             <Activate KmsItem="33e156e4-b76f-4a52-9f91-f641dd95ac48" />
         </CsvlkItem>
 
@@ -518,6 +607,7 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
             <Activate KmsItem="58e2134f-8e11-4d17-9cb2-91069c151148" />
             <Activate KmsItem="d27cd636-1962-44e9-8b4f-27b6c23efb85" />
             <Activate KmsItem="5f94a0bb-d5a0-4081-a685-5819418b2fe0" />
+            <Activate KmsItem="c530a073-8514-56a0-9dbe-0558431e8d9f" />
         </CsvlkItem>
 
         <CsvlkItem DisplayName="Windows 8.1" ReleaseDate="2013-10-17T00:00:00Z" GroupId="206" MinKeyId="339000000" MaxKeyId="353999999" IniFileName="Windows" Id="29d0b60f-66da-4858-bcaf-9eb513cd310d" InvalidWinBuild="[0]">
@@ -582,15 +672,11 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
             <Activate KmsItem="85b5f61b-320b-4be3-814a-b76b2bfafc82" />
         </CsvlkItem>
 
-        <CsvlkItem DisplayName="Office 2016 VL [Pre-Release]" ReleaseDate="2015-09-15T00:00:00Z" IsPreview="true" GroupId="" MinKeyId="" MaxKeyId="" Id="1114b902-9bfe-4a7c-ba7c-1a7db3669d67" InvalidWinBuild="">
-            <Activate KmsItem="00000000-0000-0000-0000-000000000000" />
-        </CsvlkItem>
-
         <CsvlkItem DisplayName="Office 2013 VL" ReleaseDate="2013-01-29T00:00:00Z" VlmcsdIndex="2" GroupId="206" MinKeyId="234000000" MaxKeyId="255999999" IniFileName="Office2013" EPid="06401-00206-243-662026-03-1033-9600.0000-2802018" Id="2e28138a-847f-42bc-9752-61b03fff33cd" InvalidWinBuild="[]">
             <Activate KmsItem="e6a6f1bf-9d40-40c3-aa9f-c77ba21578c0" />
         </CsvlkItem>
 
-        <CsvlkItem DisplayName="Office 2013 VL [Pre-Release]" ReleaseDate="2013-01-20T00:00:00Z" IsPreview="true" GroupId="" MinKeyId="" MaxKeyId="" EPid="" Id="" InvalidWinBuild="">
+        <CsvlkItem DisplayName="Office 2013 VL [Pre-Release]" ReleaseDate="2013-01-20T00:00:00Z" IsPreview="true">
             <Activate KmsItem="aa4c7968-b9da-4680-92b6-acb25e2f866c" />
         </CsvlkItem>
 
@@ -603,11 +689,7 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
     <AppItems>
         <AppItem DisplayName="Windows" VlmcsdIndex="0" Id="55c92734-d682-4d71-983e-d6ec3f16059f" MinActiveClients="50">
 
-
-            <!--
-            # Windows Preview / Pre-Release / Insider block
-            -->
-            <KmsItem DisplayName="Windows 10 (Insider Preview)" Id="" DefaultKmsProtocol="6.0" IsRetail="true">
+            <KmsItem DisplayName="Windows 10 (Insider Preview)" Id="c530a073-8514-56a0-9dbe-0558431e8d9f" DefaultKmsProtocol="6.0" IsRetail="true">
                 <SkuItem DisplayName="Windows 10/11 Insider Preview Core" Id="903663f7-d2ab-49c9-8942-14aa9e0a9c72" Gvlk="3KNVR-PXJFJ-MXRQY-KKQH7-YY6QH" />
                 <SkuItem DisplayName="Windows 10/11 Insider Preview CoreN" Id="4dfd543d-caa6-4f69-a95f-5ddfe2b89567" Gvlk="K8ND4-KBPFY-3QCDH-2MQQB-2PQX7" />
                 <SkuItem DisplayName="Windows 10/11 Insider Preview CoreCountrySpecific" Id="5fe40dd6-cf1f-4cf2-8729-92121ac2e997" Gvlk="TFKN7-3BRDR-9H7CY-XXQQ4-YTDX2" />
@@ -627,7 +709,6 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
                 <SkuItem DisplayName="Windows 8/10 Preview Professional" Id="a4383e6b-dada-423d-a43d-f25678429676" Gvlk="MTWNQ-CKDHJ-3HXW9-Q2PFX-WB2HQ" />
                 <SkuItem DisplayName="Windows 8/10 Preview ProfessionalWMC" Id="cf59a07b-1a2a-4be0-bfe0-423b5823e663" Gvlk="MY4N9-TGH34-4X4VY-8FG2T-RRDPV" />
                 <SkuItem DisplayName="Windows 8/10 Preview Core" Id="2b9c337f-7a1d-4271-90a3-c6855a2b8a1c" Gvlk="MPWP3-DXNP9-BRD79-W8WFP-3YFJ6" />
-                <SkuItem DisplayName="Windows 8/10 Preview CoreARM" Id="631ead72-a8ab-4df8-bbdf-372029989bdd" />
                 <SkuItem DisplayName="Windows 10 Pre-Release CoreARM" Id="b554b49f-4d57-4f08-955e-87886f514d49" Gvlk="7NX88-X6YM3-9Q3YT-CCGBF-KBVQF" />
                 <SkuItem DisplayName="Windows 10 Pre-Release CoreConnected" Id="827a0032-dced-4609-ab6e-16b9d8a40280" Gvlk="DJMYQ-WN6HG-YJ2YX-82JDB-CWFCW" />
                 <SkuItem DisplayName="Windows 10 Pre-Release CoreConnectedN" Id="f18bbe32-16dc-48d4-a27b-5f3966f82513" Gvlk="JQNT7-W63G4-WX4QX-RD9M9-6CPKM" />
@@ -642,9 +723,7 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
                 <SkuItem DisplayName="Windows 10 Pre-Release Embedded Industry Enterprise" Id="4daf1e3e-6be9-4848-8f5a-a18a0d2895e1" Gvlk="XCNC9-BPK3C-KCCMD-FTDTC-KWY4G" />
                 <SkuItem DisplayName="Windows 10 Pre-Release Embedded Industry Professional" Id="c35a9336-fb02-48db-8f4d-245c17f03667" Gvlk="XY4TQ-CXNVJ-YCT73-HH6R7-R897X" />
             </KmsItem>
-            <!-- 
-            # Special Windows Server editions block
-            -->
+
             <KmsItem DisplayName="Windows 10 ServerRdsh (Volume)" Id="cbdcb1ba-e093-4c81-a463-10775291fdf9" DefaultKmsProtocol="6.0">
                 <SkuItem DisplayName="Windows 10/11 Enterprise multi-session" Id="ec868e65-fadf-4759-b23e-93fe37f2cc29" Gvlk="CPWHC-NT2C7-VYW78-DHDB2-PG3GK" />
             </KmsItem>
@@ -656,9 +735,6 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
                 <SkuItem DisplayName="Windows Server Preview ServerHI" Id="b995b62c-eae2-40aa-afb9-111889a84ef4" Gvlk="7VX4N-3VDHQ-VYGHB-JXJVP-9QB26" />
             </KmsItem>
 
-            <!-- 
-            # Windows Server block
-            -->
             <KmsItem DisplayName="Windows Server 2025" Id="907f1f65-adcd-4a2e-95bc-4bf500bc6e58" DefaultKmsProtocol="6.0" NCountPolicy="5">
                 <SkuItem DisplayName="Windows Server 2025 Azure Core" Id="45b5aff2-60a0-42f2-bc4b-ec6e5f7b527e" Gvlk="QN7G3-4RM92-MT6QR-PR966-FVYV7" />
                 <SkuItem DisplayName="Windows Server 2025 Datacenter Azure Edition" Id="c2e946d1-cfa2-4523-8c87-30bc696ee584" Gvlk="NQ8HH-FTDTM-6VGY7-TQ3DV-XFBV2" />
@@ -744,11 +820,7 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
                 <SkuItem DisplayName="Windows Server 2008 Datacenter without Hyper-V" Id="fd09ef77-5647-4eff-809c-af2b64659a45" Gvlk="22XQ2-VRXRG-P8D42-K34TD-G3QQC" />
                 <SkuItem DisplayName="Windows Server 2008 Enterprise for Itanium" Id="01ef176b-3e0d-422a-b4f8-4ea880035e8f" Gvlk="4DWFP-JF3DJ-B7DTH-78FJB-PDRHK" />
             </KmsItem>
-        
-        <!-- 
-        # Windows block
-        -->
-            <!-- Windows 10 -->
+
             <KmsItem DisplayName="Windows 10 2024 (Volume)" Id="e85ee727-69c4-4528-99d2-216b0f065e38" DefaultKmsProtocol="6.0">
             </KmsItem>
 
@@ -826,7 +898,6 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
                 <SkuItem DisplayName="Windows 8.1 Professional Student N" Id="cab491c7-a918-4f60-b502-dab75e334f40" Gvlk="TNFGH-2R6PB-8XM3K-QYHX2-J4296" IsGeneratedGvlk="true" />
             </KmsItem>
 
-            <!-- Windows 8 -->
             <KmsItem DisplayName="Windows 8 (Volume)" Id="3c40b358-5948-45af-923b-53d21fcc7e79" DefaultKmsProtocol="5.0">
                 <SkuItem DisplayName="Windows 8 Enterprise" Id="458e1bec-837a-45f6-b9d5-925ed5d299de" Gvlk="32JNW-9KQ84-P47T8-D8GGY-CWCK7" />
                 <SkuItem DisplayName="Windows 8 Enterprise N" Id="e14997e7-800a-4cf7-ad10-de4b45b578db" Gvlk="JMNMF-RHW7P-DMY6X-RF3DR-X2BQT" />
@@ -846,7 +917,6 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
                 <SkuItem DisplayName="Windows 8 Professional WMC" Id="a00018a3-f20f-4632-bf7c-8daa5351c914" Gvlk="GNBB8-YVD74-QJHX6-27H4K-8QHDG" />
             </KmsItem>
 
-            <!-- Windows 7 -->
             <KmsItem DisplayName="Windows 7" Id="7fde5219-fbfa-484a-82c9-34d1ad53e856" DefaultKmsProtocol="4.0">
                 <SkuItem DisplayName="Windows 7 Enterprise" Id="ae2ee509-1b34-41c0-acb7-6d4650168915" Gvlk="33PXH-7Y6KF-2VJC9-XBBR8-HVTHH" />
                 <SkuItem DisplayName="Windows 7 Enterprise E" Id="46bbed08-9c7b-48fc-a614-95250573f4ea" Gvlk="C29WB-22CC8-VJ326-GHFJW-H9DH4" />
@@ -859,7 +929,6 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
                 <SkuItem DisplayName="Windows 7 Embedded Standard" Id="e1a8296a-db37-44d1-8cce-7bc961d59c54" Gvlk="XGY72-BRBBT-FF8MH-2GG8H-W7KCW"/>
             </KmsItem>
 
-            <!-- Windows Vista -->
             <KmsItem DisplayName="Windows Vista" Id="212a64dc-43b1-4d3d-a30c-2fc69d2095c6" DefaultKmsProtocol="4.0">
                 <SkuItem DisplayName="Windows Vista Business" Id="4f3d1606-3fea-4c01-be3c-8d671c401e3b" Gvlk="YFKBB-PQJJV-G996G-VWGXY-2V3X8" />
                 <SkuItem DisplayName="Windows Vista Business N" Id="2c682dc2-8b68-4f63-a165-ae291d4cf138" Gvlk="HMBQG-8H2RH-C77VX-27R82-VMQBT" />
@@ -869,31 +938,31 @@ https://forums.mydigitallife.net/threads/pkeyconfig-info-reader-gui-v8-0-0.88595
 
         </AppItem>
 
-    <AppItem DisplayName="Office2010" Id="59a52881-a989-479d-af46-f275c6370663" VlmcsdIndex="1" MinActiveClients="10">
+        <AppItem DisplayName="Office2010" Id="59a52881-a989-479d-af46-f275c6370663" VlmcsdIndex="1" MinActiveClients="10">
 
-        <KmsItem DisplayName="Office 2010" Id="e85af946-2e25-47b7-83e1-bebcebeac611" DefaultKmsProtocol="4.0" NCountPolicy="5" CanMapToDefaultCsvlk="false">
-            <SkuItem DisplayName="Office Access 2010" Id="8ce7e872-188c-4b98-9d90-f8f90b7aad02" Gvlk="V7Y44-9T38C-R2VJK-666HK-T7DDX" />
-            <SkuItem DisplayName="Office Excel 2010" Id="cee5d470-6e3b-4fcc-8c2b-d17428568a9f" Gvlk="H62QG-HXVKF-PP4HP-66KMR-CW9BM" />
-            <SkuItem DisplayName="Office Groove 2010" Id="8947d0b8-c33b-43e1-8c56-9b674c052832" Gvlk="QYYW6-QP4CB-MBV6G-HYMCJ-4T3J4" />
-            <SkuItem DisplayName="Office InfoPath 2010" Id="ca6b6639-4ad6-40ae-a575-14dee07f6430" Gvlk="K96W8-67RPQ-62T9Y-J8FQJ-BT37T" />
-            <SkuItem DisplayName="Office Mondo 1 2010" Id="09ed9640-f020-400a-acd8-d7d867dfd9c2" Gvlk="YBJTT-JG6MD-V9Q7P-DBKXJ-38W9R" />
-            <SkuItem DisplayName="Office Mondo 2 2010" Id="ef3d4e49-a53d-4d81-a2b1-2ca6c2556b2c" Gvlk="7TC2V-WXF6P-TD7RT-BQRXR-B8K32" />
-            <SkuItem DisplayName="Office OneNote 2010" Id="ab586f5c-5256-4632-962f-fefd8b49e6f4" Gvlk="Q4Y4M-RHWJM-PY37F-MTKWH-D3XHX" />
-            <SkuItem DisplayName="Office OutLook 2010" Id="ecb7c192-73ab-4ded-acf4-2399b095d0cc" Gvlk="7YDC2-CWM8M-RRTJC-8MDVC-X3DWQ" />
-            <SkuItem DisplayName="Office PowerPoint 2010" Id="45593b1d-dfb1-4e91-bbfb-2d5d0ce2227a" Gvlk="RC8FX-88JRY-3PF7C-X8P67-P4VTT" />
-            <SkuItem DisplayName="Office Professional Plus 2010" Id="6f327760-8c5c-417c-9b61-836a98287e0c" Gvlk="VYBBJ-TRJPB-QFQRF-QFT4D-H3GVB" />
-            <SkuItem DisplayName="Office Project Pro 2010" Id="df133ff7-bf14-4f95-afe3-7b48e7e331ef" Gvlk="YGX6F-PGV49-PGW3J-9BTGG-VHKC6" />
-            <SkuItem DisplayName="Office Project Standard 2010" Id="5dc7bf61-5ec9-4996-9ccb-df806a2d0efe" Gvlk="4HP3K-88W3F-W2K3D-6677X-F9PGB" />
-            <SkuItem DisplayName="Office Publisher 2010" Id="b50c4f75-599b-43e8-8dcd-1081a7967241" Gvlk="BFK7F-9MYHM-V68C7-DRQ66-83YTP" />
-            <SkuItem DisplayName="Office Small Business Basics 2010" Id="ea509e87-07a1-4a45-9edc-eba5a39f36af" Gvlk="D6QFG-VBYP2-XQHM7-J97RH-VVRCK" />
-            <SkuItem DisplayName="Office Standard 2010" Id="9da2a678-fb6b-4e67-ab84-60dd6a9c819a" Gvlk="V7QKV-4XVVR-XYV4D-F7DFM-8R6BM" />
-            <SkuItem DisplayName="Office Visio Premium 2010" Id="92236105-bb67-494f-94c7-7f7a607929bd" Gvlk="D9DWC-HPYVV-JGF4P-BTWQB-WX8BJ" />
-            <SkuItem DisplayName="Office Visio Pro 2010" Id="e558389c-83c3-4b29-adfe-5e4d7f46c358" Gvlk="7MCW8-VRQVK-G677T-PDJCM-Q8TCP" />
-            <SkuItem DisplayName="Office Visio Standard 2010" Id="9ed833ff-4f92-4f36-b370-8683a4f13275" Gvlk="767HD-QGMWX-8QTDB-9G3R2-KHFGJ" />
-            <SkuItem DisplayName="Office Word 2010" Id="2d0882e7-a4e7-423b-8ccc-70d91e0158b1" Gvlk="HVHB3-C6FV7-KQX9W-YQG79-CRY7T" />
-        </KmsItem>
+            <KmsItem DisplayName="Office 2010" Id="e85af946-2e25-47b7-83e1-bebcebeac611" DefaultKmsProtocol="4.0" NCountPolicy="5" CanMapToDefaultCsvlk="false">
+                <SkuItem DisplayName="Office Access 2010" Id="8ce7e872-188c-4b98-9d90-f8f90b7aad02" Gvlk="V7Y44-9T38C-R2VJK-666HK-T7DDX" />
+                <SkuItem DisplayName="Office Excel 2010" Id="cee5d470-6e3b-4fcc-8c2b-d17428568a9f" Gvlk="H62QG-HXVKF-PP4HP-66KMR-CW9BM" />
+                <SkuItem DisplayName="Office Groove 2010" Id="8947d0b8-c33b-43e1-8c56-9b674c052832" Gvlk="QYYW6-QP4CB-MBV6G-HYMCJ-4T3J4" />
+                <SkuItem DisplayName="Office InfoPath 2010" Id="ca6b6639-4ad6-40ae-a575-14dee07f6430" Gvlk="K96W8-67RPQ-62T9Y-J8FQJ-BT37T" />
+                <SkuItem DisplayName="Office Mondo 1 2010" Id="09ed9640-f020-400a-acd8-d7d867dfd9c2" Gvlk="YBJTT-JG6MD-V9Q7P-DBKXJ-38W9R" />
+                <SkuItem DisplayName="Office Mondo 2 2010" Id="ef3d4e49-a53d-4d81-a2b1-2ca6c2556b2c" Gvlk="7TC2V-WXF6P-TD7RT-BQRXR-B8K32" />
+                <SkuItem DisplayName="Office OneNote 2010" Id="ab586f5c-5256-4632-962f-fefd8b49e6f4" Gvlk="Q4Y4M-RHWJM-PY37F-MTKWH-D3XHX" />
+                <SkuItem DisplayName="Office OutLook 2010" Id="ecb7c192-73ab-4ded-acf4-2399b095d0cc" Gvlk="7YDC2-CWM8M-RRTJC-8MDVC-X3DWQ" />
+                <SkuItem DisplayName="Office PowerPoint 2010" Id="45593b1d-dfb1-4e91-bbfb-2d5d0ce2227a" Gvlk="RC8FX-88JRY-3PF7C-X8P67-P4VTT" />
+                <SkuItem DisplayName="Office Professional Plus 2010" Id="6f327760-8c5c-417c-9b61-836a98287e0c" Gvlk="VYBBJ-TRJPB-QFQRF-QFT4D-H3GVB" />
+                <SkuItem DisplayName="Office Project Pro 2010" Id="df133ff7-bf14-4f95-afe3-7b48e7e331ef" Gvlk="YGX6F-PGV49-PGW3J-9BTGG-VHKC6" />
+                <SkuItem DisplayName="Office Project Standard 2010" Id="5dc7bf61-5ec9-4996-9ccb-df806a2d0efe" Gvlk="4HP3K-88W3F-W2K3D-6677X-F9PGB" />
+                <SkuItem DisplayName="Office Publisher 2010" Id="b50c4f75-599b-43e8-8dcd-1081a7967241" Gvlk="BFK7F-9MYHM-V68C7-DRQ66-83YTP" />
+                <SkuItem DisplayName="Office Small Business Basics 2010" Id="ea509e87-07a1-4a45-9edc-eba5a39f36af" Gvlk="D6QFG-VBYP2-XQHM7-J97RH-VVRCK" />
+                <SkuItem DisplayName="Office Standard 2010" Id="9da2a678-fb6b-4e67-ab84-60dd6a9c819a" Gvlk="V7QKV-4XVVR-XYV4D-F7DFM-8R6BM" />
+                <SkuItem DisplayName="Office Visio Premium 2010" Id="92236105-bb67-494f-94c7-7f7a607929bd" Gvlk="D9DWC-HPYVV-JGF4P-BTWQB-WX8BJ" />
+                <SkuItem DisplayName="Office Visio Pro 2010" Id="e558389c-83c3-4b29-adfe-5e4d7f46c358" Gvlk="7MCW8-VRQVK-G677T-PDJCM-Q8TCP" />
+                <SkuItem DisplayName="Office Visio Standard 2010" Id="9ed833ff-4f92-4f36-b370-8683a4f13275" Gvlk="767HD-QGMWX-8QTDB-9G3R2-KHFGJ" />
+                <SkuItem DisplayName="Office Word 2010" Id="2d0882e7-a4e7-423b-8ccc-70d91e0158b1" Gvlk="HVHB3-C6FV7-KQX9W-YQG79-CRY7T" />
+            </KmsItem>
 
-    </AppItem>
+        </AppItem>
 
         <AppItem DisplayName="Office 2013+" VlmcsdIndex="5" MinActiveClients="10" Id="0ff1ce15-a989-479d-af46-f275c6370663">