diff --git a/.gitignore b/.gitignore
index 36e4844..2ab760f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
*.exe
*.rar
*.zip
-patch_scripts/aio/COPYING.txt
\ No newline at end of file
+patch_scripts/*/COPYING.txt
diff --git a/README.md b/README.md
index d169464..69013c4 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-### [Click here if you are looking for the latest patch files!](https://github.com/zeffy/kb4012218-19/releases) [
](https://github.com/zeffy/kb4012218-19/releases)
+### [Click here if you are looking for the latest patch files!](https://github.com/zeffy/kb4012218-19/releases/latest) [
](https://github.com/zeffy/kb4012218-19/releases/latest)
---
-### [Click here for a list of Windows updates supported by this patch](docs/Supported_Updates.md)
+### [Click here for a list of Windows updates supported by this patch](docs/Patch_Offsets.md)
---
diff --git a/docs/Patch_Offsets.md b/docs/Patch_Offsets.md
index be0becc..689ef35 100644
--- a/docs/Patch_Offsets.md
+++ b/docs/Patch_Offsets.md
@@ -1,10 +1,34 @@
+## Windows 7
+
Hotfix ID | Architecture | wuaueng.dll version | File offset | Original value | Patched value
--------- | ------------ | ------------------- | ----------- | -------------- | -------------
-KB4012218 | x64 | 7.6.7601.23714 | `0x26C948` | `0x01` | `0x00`
-KB4012218 | x86 | 7.6.7601.23714 | `0x1E4638` | `0x01` | `0x00`
-KB4015546, KB4015549, KB4015552, KB4019264 | x64 | 7.6.7601.23735 | `0x26C948` | `0x01` | `0x00`
-KB4015546, KB4015549, KB4015552, KB4019264 | x86 | 7.6.7601.23735 | `0x1E4838` | `0x01` | `0x00`
-KB4012219 | x64 | 7.9.9600.18621 | `0x34D3BC` | `0x01` | `0x00`
-KB4012219 | x86 | 7.9.9600.18621 | `0x2BFA50` | `0x01` | `0x00`
-KB4015547, KB4015550, KB4015553, KB4019215 | x64 | 7.9.9600.18628 | `0x34D5BC` | `0x01` | `0x00`
-KB4015547, KB4015550, KB4015553, KB4019215 | x86 | 7.9.9600.18628 | `0x2BFA50` | `0x01` | `0x00`
+[KB4012218] | x64 | 7.6.7601.23714 | `0x26C948` | `0x01` | `0x00`
+[KB4012218] | x86 | 7.6.7601.23714 | `0x1E4638` | `0x01` | `0x00`
+[KB4015546], [KB4015549], [KB4015552], [KB4019264] | x64 | 7.6.7601.23735 | `0x26C948` | `0x01` | `0x00`
+[KB4015546], [KB4015549], [KB4015552], [KB4019264] | x86 | 7.6.7601.23735 | `0x1E4838` | `0x01` | `0x00`
+[KB4019265] | x64 | 7.6.7601.23775 | `0x26C948` | `0x01` | `0x00`
+[KB4019265] | x86 | 7.6.7601.23775 | `0x1E4838` | `0x01` | `0x00`
+
+## Windows 8.1
+
+Hotfix ID | Architecture | wuaueng.dll version | File offset | Original value | Patched value
+--------- | ------------ | ------------------- | ----------- | -------------- | -------------
+[KB4012219] | x64 | 7.9.9600.18621 | `0x34D3BC` | `0x01` | `0x00`
+[KB4012219] | x86 | 7.9.9600.18621 | `0x2BFA50` | `0x01` | `0x00`
+[KB4015547], [KB4015550], [KB4015553], [KB4019215], [KB4019217] | x64 | 7.9.9600.18628 | `0x34D5BC` | `0x01` | `0x00`
+[KB4015547], [KB4015550], [KB4015553], [KB4019215], [KB4019217] | x86 | 7.9.9600.18628 | `0x2BFA50` | `0x01` | `0x00`
+
+
+[KB4012218]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4012218
+[KB4015546]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015546
+[KB4015549]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015549
+[KB4015552]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015552
+[KB4019264]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4019264
+[KB4019265]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4019265
+
+[KB4012219]: https://www.catalog.update.microsoft.com/search.aspx?q=kb4012219
+[KB4015547]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015547
+[KB4015550]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015550
+[KB4015553]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015553
+[KB4019215]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4019215
+[KB4019217]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4019217
diff --git a/docs/Supported_Updates.md b/docs/Supported_Updates.md
deleted file mode 100644
index f42bb0a..0000000
--- a/docs/Supported_Updates.md
+++ /dev/null
@@ -1,43 +0,0 @@
-Title | Products | Classification | Last Updated | Version | Size
------ | -------- | -------------- | ------------ | ------- | ----
-March, 2017 Preview of Monthly Quality Rollup for Windows 7 ([KB4012218]) | Windows 7 | Updates | 3/16/2017 | n/a | 93.4 MB
-March, 2017 Preview of Monthly Quality Rollup for Windows 7 for x64-based Systems ([KB4012218]) | Windows 7 | Updates | 3/16/2017 | n/a | 153.9 MB
-March, 2017 Preview of Monthly Quality Rollup for Windows Server 2008 R2 x64 Edition ([KB4012218]) | Windows Server 2008 R2 | Updates | 3/16/2017 | n/a | 153.9 MB
-March, 2017 Preview of Monthly Quality Rollup for Windows 8.1 ([KB4012219]) | Windows 8.1 | Updates | 3/16/2017 | n/a | 121.2 MB
-March, 2017 Preview of Monthly Quality Rollup for Windows 8.1 for x64-based Systems ([KB4012219]) | Windows 8.1 | Updates | 3/16/2017 | n/a | 218.0 MB
-March, 2017 Preview of Monthly Quality Rollup for Windows Server 2012 R2 ([KB4012219]) | Windows Server 2012 R2 | Updates | 3/16/2017 | n/a | 218.0 MB
-April, 2017 Security Only Quality Update for Windows 7 ([KB4015546]) | Windows 7 | Security Updates | 4/8/2017 | n/a | 23.2 MB
-April, 2017 Security Only Quality Update for Windows 7 for x64-based Systems ([KB4015546]) | Windows 7 | Security Updates | 4/8/2017 | n/a | 37.5 MB
-April, 2017 Security Only Quality Update for Windows Server 2008 R2 for x64-based Systems ([KB4015546]) | Windows Server 2008 R2 | Security Updates | 4/8/2017 | n/a | 37.5 MB
-April, 2017 Security Only Quality Update for Windows 8.1 for x64-based Systems ([KB4015547]) | Windows 8.1 | Security Updates | 4/8/2017 | n/a | 15.6 MB
-April, 2017 Security Only Quality Update for Windows 8.1 ([KB4015547]) | Windows 8.1 | Security Updates | 4/8/2017 | n/a | 10.1 MB
-April, 2017 Security Only Quality Update for Windows Server 2012 R2 ([KB4015547]) | Windows Server 2012 R2 | Security Updates | 4/8/2017 | n/a | 15.6 MB
-April, 2017 Security Monthly Quality Rollup for Windows 7 for x64-based Systems ([KB4015549]) | Windows 7 | Security Updates | 4/8/2017 | n/a | 159.9 MB
-April, 2017 Security Monthly Quality Rollup for Windows Server 2008 R2 for x64-based Systems ([KB4015549]) | Windows Server 2008 R2 | Security Updates | 4/8/2017 | n/a | 159.9 MB
-April, 2017 Security Monthly Quality Rollup for Windows 7 ([KB4015549]) | Windows 7 | Security Updates | 4/8/2017 | n/a | 97.6 MB
-April, 2017 Security Monthly Quality Rollup for Windows 8.1 for x64-based Systems ([KB4015550]) | Windows 8.1 | Security Updates | 4/10/2017 | n/a | 220.9 MB
-April, 2017 Security Monthly Quality Rollup for Windows Server 2012 R2 ([KB4015550]) | Windows Server 2012 R2 | Security Updates | 4/10/2017 | n/a | 220.9 MB
-April, 2017 Security Monthly Quality Rollup for Windows 8.1 ([KB4015550]) | Windows 8.1 | Security Updates | 4/10/2017 | n/a | 122.4 MB
-April, 2017 Preview of Monthly Quality Rollup for Windows Server 2008 R2 x64 Edition ([KB4015552]) | Windows Server 2008 R2 | Updates | 4/13/2017 | n/a | 160.9 MB
-April, 2017 Preview of Monthly Quality Rollup for Windows 7 for x64-based Systems ([KB4015552]) | Windows 7 | Updates | 4/13/2017 | n/a | 160.9 MB
-April, 2017 Preview of Monthly Quality Rollup for Windows 7 ([KB4015552]) | Windows 7 | Updates | 4/13/2017 | n/a | 98.1 MB
-April, 2017 Preview of Monthly Quality Rollup for Windows Server 2012 R2 ([KB4015553]) | Windows Server 2012 R2 | Updates | 4/13/2017 | n/a | 224.0 MB
-April, 2017 Preview of Monthly Quality Rollup for Windows 8.1 ([KB4015553]) | Windows 8.1 | Updates | 4/13/2017 | n/a | 124.6 MB
-April, 2017 Preview of Monthly Quality Rollup for Windows 8.1 for x64-based Systems ([KB4015553]) | Windows 8.1 | Updates | 4/13/2017 | n/a | 224.0 MB
-2017-05 Security Monthly Quality Rollup for Windows 8.1 for x86-based Systems ([KB4019215]) | Windows 8.1 | Security Updates | 5/5/2017 | n/a | 126.4 MB
-2017-05 Security Monthly Quality Rollup for Windows Server 2012 R2 for x64-based Systems ([KB4019215]) | Windows Server 2012 R2 | Security Updates | 5/5/2017 | n/a | 227.8 MB
-2017-05 Security Monthly Quality Rollup for Windows 8.1 for x64-based Systems ([KB4019215]) | Windows 8.1 | Security Updates | 5/5/2017 | n/a | 227.8 MB
-2017-05 Security Monthly Quality Rollup for Windows 7 for x86-based Systems ([KB4019264]) | Windows 7 | Security Updates | 5/5/2017 | n/a | 99.3 MB
-2017-05 Security Monthly Quality Rollup for Windows Server 2008 R2 for x64-based Systems ([KB4019264]) | Windows Server 2008 R2 | Security Updates | 5/5/2017 | n/a | 162.9 MB
-2017-05 Security Monthly Quality Rollup for Windows 7 for x64-based Systems ([KB4019264]) | Windows 7 | Security Updates | 5/5/2017 | n/a | 162.9 MB
-
-[KB4012218]: https://www.catalog.update.microsoft.com/search.aspx?q=kb4012218
-[KB4012219]: https://www.catalog.update.microsoft.com/search.aspx?q=kb4012219
-[KB4015546]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015546
-[KB4015547]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015547
-[KB4015549]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015549
-[KB4015550]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015550
-[KB4015552]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015552
-[KB4015553]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015553
-[KB4019215]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4019215
-[KB4019264]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4019264
diff --git a/patch_scripts/aio/aio-wuaueng.dll-patch.bat b/patch_scripts/aio/aio-wuaueng.dll-patch.bat
index 6a7cd72..893a08f 100644
--- a/patch_scripts/aio/aio-wuaueng.dll-patch.bat
+++ b/patch_scripts/aio/aio-wuaueng.dll-patch.bat
@@ -59,13 +59,13 @@ if not exist "%XDELTA3_EXE%" (
wmic /output:stdout os get version | findstr "^6\.1\." >nul && (
set "WINDOWS_VER=6.1"
- set "SUPPORTED_HOTFIXES=KB4019264 KB4015552 KB4015549 KB4015546 KB4012218"
+ set "SUPPORTED_HOTFIXES=KB4019265 KB4019264 KB4015552 KB4015549 KB4015546 KB4012218"
echo Detected supported operating system: Windows 7 %WINDOWS_ARCHITECTURE%
goto :check_hotfix
)
wmic /output:stdout os get version | findstr "^6\.3\." >nul && (
set "WINDOWS_VER=8.1"
- set "SUPPORTED_HOTFIXES=KB4019215 KB4015553 KB4015550 KB4015547 KB4012219"
+ set "SUPPORTED_HOTFIXES=KB4019217 KB4019215 KB4015553 KB4015550 KB4015547 KB4012219"
echo Detected supported operating system: Windows 8.1 %WINDOWS_ARCHITECTURE%
goto :check_hotfix
)
diff --git a/patch_scripts/aio/patches/Windows6.1-KB4019265-x64-patch.xdelta b/patch_scripts/aio/patches/Windows6.1-KB4019265-x64-patch.xdelta
new file mode 100644
index 0000000..2f8fbfb
Binary files /dev/null and b/patch_scripts/aio/patches/Windows6.1-KB4019265-x64-patch.xdelta differ
diff --git a/patch_scripts/aio/patches/Windows6.1-KB4019265-x64-unpatch.xdelta b/patch_scripts/aio/patches/Windows6.1-KB4019265-x64-unpatch.xdelta
new file mode 100644
index 0000000..4f7438e
Binary files /dev/null and b/patch_scripts/aio/patches/Windows6.1-KB4019265-x64-unpatch.xdelta differ
diff --git a/patch_scripts/aio/patches/Windows6.1-KB4019265-x86-patch.xdelta b/patch_scripts/aio/patches/Windows6.1-KB4019265-x86-patch.xdelta
new file mode 100644
index 0000000..c6ae166
Binary files /dev/null and b/patch_scripts/aio/patches/Windows6.1-KB4019265-x86-patch.xdelta differ
diff --git a/patch_scripts/aio/patches/Windows6.1-KB4019265-x86-unpatch.xdelta b/patch_scripts/aio/patches/Windows6.1-KB4019265-x86-unpatch.xdelta
new file mode 100644
index 0000000..d857f4a
Binary files /dev/null and b/patch_scripts/aio/patches/Windows6.1-KB4019265-x86-unpatch.xdelta differ
diff --git a/patch_scripts/aio/patches/Windows8.1-KB4019217-x64-patch.xdelta b/patch_scripts/aio/patches/Windows8.1-KB4019217-x64-patch.xdelta
new file mode 100644
index 0000000..9bb0b06
Binary files /dev/null and b/patch_scripts/aio/patches/Windows8.1-KB4019217-x64-patch.xdelta differ
diff --git a/patch_scripts/aio/patches/Windows8.1-KB4019217-x64-unpatch.xdelta b/patch_scripts/aio/patches/Windows8.1-KB4019217-x64-unpatch.xdelta
new file mode 100644
index 0000000..edb4f49
Binary files /dev/null and b/patch_scripts/aio/patches/Windows8.1-KB4019217-x64-unpatch.xdelta differ
diff --git a/patch_scripts/aio/patches/Windows8.1-KB4019217-x86-patch.xdelta b/patch_scripts/aio/patches/Windows8.1-KB4019217-x86-patch.xdelta
new file mode 100644
index 0000000..ab53a4f
Binary files /dev/null and b/patch_scripts/aio/patches/Windows8.1-KB4019217-x86-patch.xdelta differ
diff --git a/patch_scripts/aio/patches/Windows8.1-KB4019217-x86-unpatch.xdelta b/patch_scripts/aio/patches/Windows8.1-KB4019217-x86-unpatch.xdelta
new file mode 100644
index 0000000..72ebd8f
Binary files /dev/null and b/patch_scripts/aio/patches/Windows8.1-KB4019217-x86-unpatch.xdelta differ