diff --git a/nmap-os-db b/nmap-os-db
index e73822e28..2c928ea28 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -68423,11 +68423,89 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
+# Windows 10 build 10240
+Fingerprint Microsoft Windows 10 1507
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10:1507 auto
+SEQ(SP=104-10E%GCD=1-6%ISR=106-110%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M5BCNW8ST11%O2=M5BCNW8ST11%O3=M5BCNW8NNT11%O4=M5BCNW8ST11%O5=M5BCNW8ST11%O6=M5BCST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5BCNW8NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
+# Version 10.0 (Build 10240)
+Fingerprint Microsoft Windows 10 1507
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10:1507 auto
+SEQ(SP=FE-108%GCD=1-6%ISR=104-10E%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M594NW8ST11%O2=M594NW8ST11%O3=M594NW8NNT11%O4=M594NW8ST11%O5=M594NW8ST11%O6=M594ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M594NW8NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
+# Version 10.0 (Build 10240)
+Fingerprint Microsoft Windows 10 1507
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10:1507 auto
+SEQ(SP=F7-101%GCD=1-6%ISR=105-10F%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M56ANW8ST11%O2=M56ANW8ST11%O3=M56ANW8NNT11%O4=M56ANW8ST11%O5=M56ANW8ST11%O6=M56AST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M56ANW8NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
+# Windows 10
+# Microsoft Windows Version 10.0 (Build 10074)
+# Windows 10.0 (build 10074) on QEMU
+# Version 10.0 (build 10240)
+# Version 1511 (OS Build) 10586.36)
+# Version 10.0 (Build 10240) (CI=RD)
+# Version 1067 (OS Build 14393.222)
+Fingerprint Microsoft Windows 10 1507 - 1607
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10 auto
+SEQ(SP=F7-10D%GCD=1-6%ISR=F9-113%TI=I%CI=I|RD%II=I%SS=S%TS=A)
+OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # Localhost with Npcap
 # Version 1511 (OS Build 10586.494)
 Fingerprint Microsoft Windows 10 1511
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1511 auto
 SEQ(SP=FB-107%GCD=1-6%ISR=107-111%TI=I%CI=I%II=I%TS=A)
 OPS(O1=MFFD7NW8ST11%O2=MFFD7NW8ST11%O3=MFFD7NW8NNT11%O4=MFFD7NW8ST11%O5=MFFD7NW8ST11%O6=MFFD7ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -68442,10 +68520,83 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
+# Microsoft Windows Version 1511 (OS Build 10586.164)
+Fingerprint Microsoft Windows 10 1511
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10:1511 auto
+SEQ(SP=103-10D%GCD=1-6%ISR=105-10F%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M5B4NW2ST11%O2=M5B4NW2ST11%O3=M5B4NW2NNT11%O4=M5B4NW2ST11%O5=M5B4NW2ST11%O6=M5B4ST11)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=FFFF%O=M5B4NW2NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
+# Version 1511 (OS Build 10586.164)
+Fingerprint Microsoft Windows 10 1511
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10:1511 auto
+SEQ(SP=103-10D%GCD=1-6%ISR=107-111%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M5ACNW8ST11%O2=M5ACNW8ST11%O3=M5ACNW8NNT11%O4=M5ACNW8ST11%O5=M5ACNW8ST11%O6=M5ACST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5ACNW8NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
+# Windows 10 Enterprise, Version 1511 (OS Build 10586.916)
+Fingerprint Microsoft Windows 10 1511
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10:1511 auto
+SEQ(SP=FA-104%GCD=1-6%ISR=107-111%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M594NW8ST11%O2=M594NW8ST11%O3=M594NW8NNT11%O4=M594NW8ST11%O5=M594NW8ST11%O6=M594ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M594NW8NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
+# Version 1511 (OS Compilation 10586.318)
+# Windows 10 Pro Version 1607 (OS Build 14393.187)
+Fingerprint Microsoft Windows 10 1511 - 1607
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10 auto
+SEQ(SP=F8-10A%GCD=1-6%ISR=106-110%TI=I%II=I%SS=S%TS=A)
+OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=N)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # 1607
 Fingerprint Microsoft Windows 10 1607
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1607 auto
 SEQ(SP=FE-108%GCD=1-6%ISR=102-10C%TI=I%CI=I%II=I%TS=A)
 OPS(O1=MFFD7ST11%O2=MFFD7ST11%O3=MFFD7NNT11%O4=MFFD7ST11%O5=MFFD7ST11%O6=MFFD7ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -68463,7 +68614,7 @@ IE(DFI=N%T=7B-85%TG=80%CD=Z)
 # 1607
 Fingerprint Microsoft Windows 10 1607
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1607 auto
 SEQ(SP=FC-106%GCD=1-6%ISR=102-10C%TI=I%CI=RD%TS=A)
 OPS(O1=M5B4NW4ST11%O2=M5B4NW4ST11%O3=M5B4NW4NNT11%O4=M5B4NW4ST11%O5=M5B4NW4ST11%O6=M5B4ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -68478,161 +68629,10 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(R=N)
 
-# Windows 10
-# Microsoft Windows Version 10.0 (Build 10074)
-# Windows 10.0 (build 10074) on QEMU
-# Version 10.0 (build 10240)
-# Version 1511 (OS Build) 10586.36)
-# Version 10.0 (Build 10240) (CI=RD)
-# Version 1067 (OS Build 14393.222)
-Fingerprint Microsoft Windows 10 build 10074 - 14393
-Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
-SEQ(SP=F7-10D%GCD=1-6%ISR=F9-113%TI=I%CI=I|RD%II=I%SS=S%TS=A)
-OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
-# Windows 10 build 10240
-Fingerprint Microsoft Windows 10 build 10240
-Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
-SEQ(SP=104-10E%GCD=1-6%ISR=106-110%TI=I%CI=I%II=I%SS=S%TS=A)
-OPS(O1=M5BCNW8ST11%O2=M5BCNW8ST11%O3=M5BCNW8NNT11%O4=M5BCNW8ST11%O5=M5BCNW8ST11%O6=M5BCST11)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5BCNW8NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
-# Version 10.0 (Build 10240)
-Fingerprint Microsoft Windows 10 build 10240
-Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
-SEQ(SP=FE-108%GCD=1-6%ISR=104-10E%TI=I%CI=I%II=I%SS=S%TS=A)
-OPS(O1=M594NW8ST11%O2=M594NW8ST11%O3=M594NW8NNT11%O4=M594NW8ST11%O5=M594NW8ST11%O6=M594ST11)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M594NW8NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
-# Version 10.0 (Build 10240)
-Fingerprint Microsoft Windows 10 build 10240
-Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
-SEQ(SP=F7-101%GCD=1-6%ISR=105-10F%TI=I%CI=I%II=I%SS=S%TS=A)
-OPS(O1=M56ANW8ST11%O2=M56ANW8ST11%O3=M56ANW8NNT11%O4=M56ANW8ST11%O5=M56ANW8ST11%O6=M56AST11)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M56ANW8NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
-# Microsoft Windows Version 1511 (OS Build 10586.164)
-Fingerprint Microsoft Windows 10 build 10586
-Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
-SEQ(SP=103-10D%GCD=1-6%ISR=105-10F%TI=I%CI=I%II=I%SS=S%TS=A)
-OPS(O1=M5B4NW2ST11%O2=M5B4NW2ST11%O3=M5B4NW2NNT11%O4=M5B4NW2ST11%O5=M5B4NW2ST11%O6=M5B4ST11)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=FFFF%O=M5B4NW2NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
-# Version 1511 (OS Build 10586.164)
-Fingerprint Microsoft Windows 10 build 10586
-Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
-SEQ(SP=103-10D%GCD=1-6%ISR=107-111%TI=I%CI=I%II=I%SS=S%TS=A)
-OPS(O1=M5ACNW8ST11%O2=M5ACNW8ST11%O3=M5ACNW8NNT11%O4=M5ACNW8ST11%O5=M5ACNW8ST11%O6=M5ACST11)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5ACNW8NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
-# Windows 10 Enterprise, Version 1511 (OS Build 10586.916)
-Fingerprint Microsoft Windows 10 build 10586
-Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
-SEQ(SP=FA-104%GCD=1-6%ISR=107-111%TI=I%CI=I%II=I%SS=S%TS=A)
-OPS(O1=M594NW8ST11%O2=M594NW8ST11%O3=M594NW8NNT11%O4=M594NW8ST11%O5=M594NW8ST11%O6=M594ST11)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M594NW8NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
-# Version 1511 (OS Compilation 10586.318)
-# Windows 10 Pro Version 1607 (OS Build 14393.187)
-Fingerprint Microsoft Windows 10 build 10586 - 14393
-Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
-SEQ(SP=F8-10A%GCD=1-6%ISR=106-110%TI=I%II=I%SS=S%TS=A)
-OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=N)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=N)
-T7(R=N)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
 # Microsoft Windows Version 1607 (OS Build 14393.321)
-Fingerprint Microsoft Windows 10 build 14393
+Fingerprint Microsoft Windows 10 1607
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1607 auto
 SEQ(SP=FE-108%GCD=1-6%ISR=100-10A%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -68648,9 +68648,9 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # Microsoft Windows Version 1607 (OS Build 14393.576)
-Fingerprint Microsoft Windows 10 build 14393
+Fingerprint Microsoft Windows 10 1607
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1607 auto
 SEQ(SP=101-10B%GCD=1-6%ISR=101-10B%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4ST11%O2=M5B4ST11%O3=M5B4NNT11%O4=M5B4ST11%O5=M5B4ST11%O6=M5B4ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -68666,9 +68666,9 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # Version 1607 (OS Build 14393.693)
-Fingerprint Microsoft Windows 10 build 14393
+Fingerprint Microsoft Windows 10 1607
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1607 auto
 SEQ(SP=FE-108%GCD=1-6%ISR=106-110%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M550NW8ST11%O2=M550NW8ST11%O3=M550NW8NNT11%O4=M550NW8ST11%O5=M550NW8ST11%O6=M550ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -68684,9 +68684,9 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # Version 1607 (build 14393.693)
-Fingerprint Microsoft Windows 10 build 14393
+Fingerprint Microsoft Windows 10 1607
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1607 auto
 SEQ(SP=102-10C%GCD=1-6%ISR=106-110%TI=I%TS=A)
 OPS(O1=M5B4ST11%O2=M5B4ST11%O3=M5B4NNT11%O4=M5B4ST11%O5=M5B4ST11%O6=M5B4ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -68702,9 +68702,9 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # 1607 (OS Build 14393.447)
-Fingerprint Microsoft Windows 10 build 14393
+Fingerprint Microsoft Windows 10 1607
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1607 auto
 SEQ(SP=F8-102%GCD=1-6%ISR=109-113%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M598NW8ST11%O2=M598NW8ST11%O3=M598NW8NNT11%O4=M598NW8ST11%O5=M598NW8ST11%O6=M598ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -68720,9 +68720,9 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # Windows 10 version 1607 (OS Build 14393.1198)
-Fingerprint Microsoft Windows 10 build 14393
+Fingerprint Microsoft Windows 10 1607
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1607 auto
 SEQ(SP=FF-109%GCD=1-6%ISR=103-10D%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -68738,9 +68738,9 @@ U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=Z)
 
 # Version 1607 (OS Build 15031.0)
-Fingerprint Microsoft Windows 10 build 15031
+Fingerprint Microsoft Windows 10 1607
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1607 auto
 SEQ(SP=F8-10C%GCD=1-6%ISR=105-10F%TI=I%CI=I%II=I%TS=A)
 OPS(O1=MFFD7NW8ST11%O2=MFFD7NW8ST11%O3=MFFD7NW8NNT11%O4=MFFD7NW8ST11%O5=MFFD7NW8ST11%O6=MFFD7ST11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFDC)
@@ -68756,9 +68756,9 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # Version 1703 (OS Build 15063.296)
-Fingerprint Microsoft Windows 10 build 15063
+Fingerprint Microsoft Windows 10 1703
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1703 auto
 SEQ(SP=FE-108%GCD=1-6%ISR=108-112%TI=I%CI=I%II=I%TS=A)
 OPS(O1=MFFD7ST11%O2=MFFD7ST11%O3=MFFD7NNT11%O4=MFFD7ST11%O5=MFFD7ST11%O6=MFFD7ST11)
 WIN(W1=FE88%W2=FED4%W3=FF20%W4=FFDC%W5=FFDC%W6=FFDC)
@@ -68774,9 +68774,9 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # 1703 (build 15063.296)
-Fingerprint Microsoft Windows 10 build 15063
+Fingerprint Microsoft Windows 10 1703
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1703 auto
 SEQ(SP=F9-103%GCD=1-6%ISR=107-111%TI=I%CI=I%II=I%TS=A)
 OPS(O1=MFFD7NW8ST11%O2=MFFD7NW8ST11%O3=MFFD7NW8NNT11%O4=MFFD7NW8ST11%O5=MFFD7NW8ST11%O6=MFFD7ST11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFDC)
@@ -68792,9 +68792,9 @@ U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=Z)
 
 # Version 1703 (OS Build 15063.296)
-Fingerprint Microsoft Windows 10 build 15063
+Fingerprint Microsoft Windows 10 1703
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1703 auto
 SEQ(SP=FF-109%GCD=1-6%ISR=104-10E%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M590NW8ST11%O2=M590NW8ST11%O3=M590NW8NNT11%O4=M590NW8ST11%O5=M590NW8ST11%O6=M590ST11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFDC)
@@ -68810,9 +68810,9 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # Version 1703 (OS Build 15063.296)
-Fingerprint Microsoft Windows 10 build 15063
+Fingerprint Microsoft Windows 10 1703
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1703 auto
 SEQ(SP=102-10C%GCD=1-6%ISR=106-110%TI=I%CI=I%II=I%TS=A)
 OPS(O1=MFFD7NW1ST11%O2=MFFD7NW1ST11%O3=MFFD7NW1NNT11%O4=MFFD7NW1ST11%O5=MFFD7NW1ST11%O6=MFFD7ST11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
@@ -68828,9 +68828,9 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # Version 1703 (OS Build 15063.413)
-Fingerprint Microsoft Windows 10 build 15063
+Fingerprint Microsoft Windows 10 1703
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1703 auto
 SEQ(SP=103-10D%GCD=1-6%ISR=108-112%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5ACNW8ST11%O2=M5ACNW8ST11%O3=M5ACNW8NNT11%O4=M5ACNW8ST11%O5=M5ACNW8ST11%O6=M5ACST11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFDC)
@@ -68846,9 +68846,9 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # Windows 10 Enterprise Version 1703 (OS Build 15063.413)
-Fingerprint Microsoft Windows 10 build 15063
+Fingerprint Microsoft Windows 10 1703
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1703 auto
 SEQ(SP=103-10D%GCD=1-6%ISR=103-10D%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
 WIN(W1=43E0%W2=4110%W3=423C%W4=4180%W5=4180%W6=4180)
@@ -68864,9 +68864,9 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # Version 1703 Build 15063.483
-Fingerprint Microsoft Windows 10 build 15063
+Fingerprint Microsoft Windows 10 1703
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1703 auto
 SEQ(SP=FD-107%GCD=1-6%ISR=103-10D%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFDC)
@@ -68884,9 +68884,9 @@ IE(DFI=N%T=7B-85%TG=80%CD=Z)
 # Version 1703 (OS Build 15063.138)
 # Windows 10 Home - Version 1703 (OS Build 15063.0)
 # Version 1703 (OS Build 16251.0)
-Fingerprint Microsoft Windows 10 build 15063 - 16251
+Fingerprint Microsoft Windows 10 1703
 Class Microsoft | Windows | 10 | general purpose
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1703 auto
 SEQ(SP=FD-10B%GCD=1-6%ISR=100-110%TI=I%CI=I|RD%II=I%SS=S%TS=A)
 OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFDC)
@@ -68903,9 +68903,9 @@ IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # Windows 10 Enterprise
 # Version 1511
-Fingerprint Microsoft Windows 10 build 10586
+Fingerprint Microsoft Windows 10 1511
 Class Microsoft | Windows | 10 | specialized
-CPE cpe:/o:microsoft:windows_10 auto
+CPE cpe:/o:microsoft:windows_10:1511 auto
 SEQ(SP=FD-107%GCD=1-6%ISR=103-10D%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -75107,27 +75107,8 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
-# Microsoft Windows Server Version 1511 (OS Build 10586.0)
-# Version 1607 (Build 14393.1066)
-Fingerprint Microsoft Windows Server 2016 build 10586 - 14393
-Class Microsoft | Windows | 2016 | general purpose
-CPE cpe:/o:microsoft:windows_server_2016 auto
-SEQ(SP=FA-108%GCD=1-6%ISR=105-10F%TI=I%CI=I%II=I%SS=S%TS=A)
-OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=Y%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
 # Microsoft Windows Server Version 1607 (OS Build 1493.576)
-Fingerprint Microsoft Windows Server 2016 build 14393
+Fingerprint Microsoft Windows Server 2016
 Class Microsoft | Windows | 2016 | general purpose
 CPE cpe:/o:microsoft:windows_server_2016 auto
 SEQ(SP=FE-108%GCD=1-6%ISR=103-10D%TI=I%CI=I%TS=A)
@@ -75145,7 +75126,7 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(R=N)
 
 # Microsoft Windows Server 2016 Version 1607 (OS Build 14393.0)
-Fingerprint Microsoft Windows Server 2016 build 14393
+Fingerprint Microsoft Windows Server 2016
 Class Microsoft | Windows | 2016 | general purpose
 CPE cpe:/o:microsoft:windows_server_2016 auto
 SEQ(SP=FF-109%GCD=1-6%ISR=105-10F%TI=I%II=I%SS=S%TS=A)
@@ -75163,7 +75144,7 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # Version 1607 (Build 14393.1066)
-Fingerprint Microsoft Windows Server 2016 build 14393
+Fingerprint Microsoft Windows Server 2016
 Class Microsoft | Windows | 2016 | general purpose
 CPE cpe:/o:microsoft:windows_server_2016 auto
 SEQ(SP=EF-F9%GCD=1-6%ISR=FF-109%TI=I%CI=I%II=I%SS=S%TS=A)
@@ -75181,7 +75162,7 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # version 1607 (OS Build 14393.1358)
-Fingerprint Microsoft Windows Server 2016 build 14393
+Fingerprint Microsoft Windows Server 2016
 Class Microsoft | Windows | 2016 | general purpose
 CPE cpe:/o:microsoft:windows_server_2016 auto
 SEQ(SP=FA-104%GCD=1-6%ISR=109-113%TI=I%CI=I%II=I%SS=S%TS=A)
@@ -75198,6 +75179,25 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
+# Microsoft Windows Server Version 1511 (OS Build 10586.0)
+# Version 1607 (Build 14393.1066)
+Fingerprint Microsoft Windows Server 2016 build 10586 - 14393
+Class Microsoft | Windows | 2016 | general purpose
+CPE cpe:/o:microsoft:windows_server_2016 auto
+SEQ(SP=FA-108%GCD=1-6%ISR=105-10F%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=Y%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # Windows 3.1 with Trumpet WinSock 3.0D running in DOSBox 0.73 MB5
 Fingerprint Microsoft Windows 3.1 with Trumpet WinSock
 Class Microsoft | Windows | 3.X | general purpose