diff --git a/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch b/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch
index 278fb453..15bcb50f 100644
--- a/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch
+++ b/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch
@@ -1,4 +1,4 @@
-From 78679414663a0d7d5e90227ab58bc6b9f4db9634 Mon Sep 17 00:00:00 2001
+From 378861963d448ac60e08435e64293e3fa3eef13e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 17:07:35 +0100
 Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
@@ -15,13 +15,13 @@ Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
  create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 7215237..4d7111a 100644
+index 30e2fae..baf7378 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3252,6 +3252,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
+@@ -3289,6 +3289,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
  WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0)
  WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0)
+ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0)
 +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-xaml-pal-l1-1-0)
  WINE_CONFIG_MAKEFILE(dlls/faultrep)
  WINE_CONFIG_MAKEFILE(dlls/faultrep/tests)
diff --git a/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch
deleted file mode 100644
index 7681b4a8..00000000
--- a/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 3ac2d7e513ec9872239ff0113a047f9b0dae5b79 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 23 Jan 2016 21:02:52 +0100
-Subject: [PATCH] ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
-
----
- configure.ac                                       |  1 +
- dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in  |  1 +
- .../ext-ms-win-uxtheme-themes-l1-1-0.spec          | 24 ++++++++++++++++++++++
- tools/make_specfiles                               |  4 ++++
- 4 files changed, 30 insertions(+)
- create mode 100644 dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in
- create mode 100644 dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec
-
-diff --git a/configure.ac b/configure.ac
-index 17b6070..10a1804 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3256,6 +3256,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0)
-+WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-xaml-pal-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/faultrep)
- WINE_CONFIG_MAKEFILE(dlls/faultrep/tests)
-diff --git a/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in
-new file mode 100644
-index 0000000..576b6f6
---- /dev/null
-+++ b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in
-@@ -0,0 +1 @@
-+MODULE    = ext-ms-win-uxtheme-themes-l1-1-0.dll
-diff --git a/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec
-new file mode 100644
-index 0000000..0a96983
---- /dev/null
-+++ b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec
-@@ -0,0 +1,24 @@
-+@ stdcall CloseThemeData(ptr) uxtheme.CloseThemeData
-+@ stdcall DrawThemeBackground(ptr ptr long long ptr ptr) uxtheme.DrawThemeBackground
-+@ stub GetColorFromPreference
-+@ stub GetImmersiveColorFromColorSetEx
-+@ stub GetImmersiveUserColorSetPreference
-+@ stub GetThemeAnimationProperty
-+@ stub GetThemeAnimationTransform
-+@ stdcall GetThemeBackgroundExtent(ptr ptr long long ptr ptr) uxtheme.GetThemeBackgroundExtent
-+@ stub GetThemeBitmap
-+@ stdcall GetThemeColor(ptr long long long ptr) uxtheme.GetThemeColor
-+@ stdcall GetThemeEnumValue(ptr long long long ptr) uxtheme.GetThemeEnumValue
-+@ stdcall GetThemeFont(ptr ptr long long long ptr) uxtheme.GetThemeFont
-+@ stdcall GetThemeInt(ptr long long long ptr) uxtheme.GetThemeInt
-+@ stdcall GetThemeMargins(ptr ptr long long long ptr ptr) uxtheme.GetThemeMargins
-+@ stdcall GetThemePartSize(ptr ptr long long ptr long ptr) uxtheme.GetThemePartSize
-+@ stdcall GetThemePosition(ptr long long long ptr) uxtheme.GetThemePosition
-+@ stub GetThemeTimingFunction
-+@ stub GetUserColorPreference
-+@ stdcall IsAppThemed() uxtheme.IsAppThemed
-+@ stdcall IsThemeActive() uxtheme.IsThemeActive
-+@ stdcall IsThemePartDefined(ptr long long) uxtheme.IsThemePartDefined
-+@ stdcall OpenThemeData(ptr wstr) uxtheme.OpenThemeData
-+@ stdcall OpenThemeDataEx(ptr wstr long) uxtheme.OpenThemeDataEx
-+@ stdcall SetWindowTheme(ptr wstr wstr) uxtheme.SetWindowTheme
-diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 680ade4..2e092f2 100755
---- a/tools/make_specfiles
-+++ b/tools/make_specfiles
-@@ -408,6 +408,10 @@ my @dll_groups =
-   "api-ms-win-core-winrt-string-l1-1-0",
-  ],
-  [
-+  "uxtheme",
-+  "ext-ms-win-uxtheme-themes-l1-1-0",
-+ ],
-+ [
-   "bthprops.cpl",
-   "irprops.cpl",
-  ],
--- 
-1.9.1
-
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 01efa0d5..7270f85d 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "8f46ac233ed96f7286f6aacd1f8fb2626d3ed1c2"
+	echo "6d6b4bffb3f619ae298669b888775350223e281f"
 }
 
 # Show version information
@@ -2723,20 +2723,17 @@ fi
 # |
 # | Modified files:
 # |   *	configure.ac, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-
-# | 	ms-win-appmodel-usercontext-l1-1-0.spec, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c, dlls/ext-ms-win-uxtheme-
-# | 	themes-l1-1-0/Makefile.in, dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec, dlls/ext-ms-win-
-# | 	xaml-pal-l1-1-0/Makefile.in, dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml-
+# | 	ms-win-appmodel-usercontext-l1-1-0.spec, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c, dlls/ext-ms-win-xaml-
+# | 	pal-l1-1-0/Makefile.in, dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml-
 # | 	pal-l1-1-0/main.c, dlls/feclient/Makefile.in, dlls/feclient/feclient.spec, dlls/feclient/main.c,
 # | 	dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, dlls/iertutil/main.c, dlls/uiautomationcore/Makefile.in,
-# | 	dlls/uiautomationcore/uia_main.c, dlls/uiautomationcore/uiautomationcore.spec, include/uiautomationcoreapi.h,
-# | 	tools/make_specfiles
+# | 	dlls/uiautomationcore/uia_main.c, dlls/uiautomationcore/uiautomationcore.spec, include/uiautomationcoreapi.h
 # |
 if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
 	patch_apply api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch
 	patch_apply api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch
 	patch_apply api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch
 	patch_apply api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch
-	patch_apply api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch
 	patch_apply api-ms-win-Stub_DLLs/0026-feclient-Add-stub-dll.patch
 	patch_apply api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch
 	(
@@ -2744,7 +2741,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
 		printf '%s\n' '+    { "Michael Müller", "ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for XamlBehaviorEnabled.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for UserContextExtInitialize.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "ext-ms-win-xaml-pal-l1-1-0: Add stub for GetThemeServices.", 1 },';
-		printf '%s\n' '+    { "Michael Müller", "ext-ms-win-uxtheme-themes-l1-1-0: Add dll.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "feclient: Add stub dll.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "uiautomationcore: Add dll and stub some functions.", 1 },';
 	) >> "$patchlist"