diff --git a/UWP/PPSSPP_UWP.sln b/UWP/PPSSPP_UWP.sln
index bd9937d4f8..8f1c7d1ae8 100644
--- a/UWP/PPSSPP_UWP.sln
+++ b/UWP/PPSSPP_UWP.sln
@@ -43,15 +43,12 @@ Global
 		Debug|ARM = Debug|ARM
 		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|ARM = Release|ARM
 		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 		UWP Gold|ARM = UWP Gold|ARM
 		UWP Gold|ARM64 = UWP Gold|ARM64
 		UWP Gold|x64 = UWP Gold|x64
-		UWP Gold|x86 = UWP Gold|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|ARM.ActiveCfg = Debug|ARM
@@ -63,9 +60,6 @@ Global
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|x64.ActiveCfg = Debug|x64
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|x64.Build.0 = Debug|x64
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|x64.Deploy.0 = Debug|x64
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|x86.ActiveCfg = Debug|x64
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|x86.Build.0 = Debug|x64
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|x86.Deploy.0 = Debug|x64
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|ARM.ActiveCfg = Release|ARM
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|ARM.Build.0 = Release|ARM
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|ARM.Deploy.0 = Release|ARM
@@ -75,9 +69,6 @@ Global
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|x64.ActiveCfg = Release|x64
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|x64.Build.0 = Release|x64
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|x64.Deploy.0 = Release|x64
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|x86.ActiveCfg = Release|x64
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|x86.Build.0 = Release|x64
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|x86.Deploy.0 = Release|x64
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|ARM.Deploy.0 = UWP Gold|ARM
@@ -87,345 +78,258 @@ Global
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|x64.ActiveCfg = UWP Gold|x64
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|x64.Build.0 = UWP Gold|x64
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|x64.Deploy.0 = UWP Gold|x64
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|x86.ActiveCfg = UWP Gold|x64
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|x86.Build.0 = UWP Gold|x64
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|x86.Deploy.0 = UWP Gold|x64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|ARM.ActiveCfg = Debug|ARM
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|ARM.Build.0 = Debug|ARM
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|ARM64.Build.0 = Debug|ARM64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|x64.ActiveCfg = Debug|x64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|x64.Build.0 = Debug|x64
-		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|x86.ActiveCfg = Debug|x64
-		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|x86.Build.0 = Debug|x64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|ARM.ActiveCfg = Release|ARM
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|ARM.Build.0 = Release|ARM
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|ARM64.ActiveCfg = Release|ARM64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|ARM64.Build.0 = Release|ARM64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|x64.ActiveCfg = Release|x64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|x64.Build.0 = Release|x64
-		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|x86.ActiveCfg = Release|x64
-		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|x86.Build.0 = Release|x64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|ARM.ActiveCfg = Release|ARM
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|ARM.Build.0 = Release|ARM
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|ARM64.Build.0 = Release|ARM64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|x64.ActiveCfg = Release|x64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|x64.Build.0 = Release|x64
-		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|x86.ActiveCfg = Release|x64
-		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|x86.Build.0 = Release|x64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|ARM.ActiveCfg = Debug|ARM
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|ARM.Build.0 = Debug|ARM
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|ARM64.Build.0 = Debug|ARM64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|x64.ActiveCfg = Debug|x64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|x64.Build.0 = Debug|x64
-		{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|x86.ActiveCfg = Debug|x64
-		{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|x86.Build.0 = Debug|x64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|ARM.ActiveCfg = Release|ARM
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|ARM.Build.0 = Release|ARM
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|ARM64.ActiveCfg = Release|ARM64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|ARM64.Build.0 = Release|ARM64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|x64.ActiveCfg = Release|x64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|x64.Build.0 = Release|x64
-		{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|x86.ActiveCfg = Release|x64
-		{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|x86.Build.0 = Release|x64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|ARM.ActiveCfg = Release|ARM
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|ARM.Build.0 = Release|ARM
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|ARM64.Build.0 = Release|ARM64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|x64.ActiveCfg = Release|x64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|x64.Build.0 = Release|x64
-		{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|x86.ActiveCfg = Release|x64
-		{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|x86.Build.0 = Release|x64
 		{5D271429-C288-4534-98AF-94475D940058}.Debug|ARM.ActiveCfg = Debug|ARM
 		{5D271429-C288-4534-98AF-94475D940058}.Debug|ARM.Build.0 = Debug|ARM
 		{5D271429-C288-4534-98AF-94475D940058}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5D271429-C288-4534-98AF-94475D940058}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5D271429-C288-4534-98AF-94475D940058}.Debug|x64.ActiveCfg = Debug|x64
 		{5D271429-C288-4534-98AF-94475D940058}.Debug|x64.Build.0 = Debug|x64
-		{5D271429-C288-4534-98AF-94475D940058}.Debug|x86.ActiveCfg = Debug|x64
-		{5D271429-C288-4534-98AF-94475D940058}.Debug|x86.Build.0 = Debug|x64
 		{5D271429-C288-4534-98AF-94475D940058}.Release|ARM.ActiveCfg = Release|ARM
 		{5D271429-C288-4534-98AF-94475D940058}.Release|ARM.Build.0 = Release|ARM
 		{5D271429-C288-4534-98AF-94475D940058}.Release|ARM64.ActiveCfg = Release|ARM64
 		{5D271429-C288-4534-98AF-94475D940058}.Release|ARM64.Build.0 = Release|ARM64
 		{5D271429-C288-4534-98AF-94475D940058}.Release|x64.ActiveCfg = Release|x64
 		{5D271429-C288-4534-98AF-94475D940058}.Release|x64.Build.0 = Release|x64
-		{5D271429-C288-4534-98AF-94475D940058}.Release|x86.ActiveCfg = Release|x64
-		{5D271429-C288-4534-98AF-94475D940058}.Release|x86.Build.0 = Release|x64
 		{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|ARM.ActiveCfg = Release|ARM
 		{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|ARM.Build.0 = Release|ARM
 		{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
 		{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|ARM64.Build.0 = Release|ARM64
 		{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|x64.ActiveCfg = Release|x64
 		{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|x64.Build.0 = Release|x64
-		{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|x86.ActiveCfg = Release|x64
-		{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|x86.Build.0 = Release|x64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|ARM.ActiveCfg = Debug|ARM
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|ARM.Build.0 = Debug|ARM
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|x64.ActiveCfg = Debug|x64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|x64.Build.0 = Debug|x64
-		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|x86.ActiveCfg = Debug|x64
-		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|x86.Build.0 = Debug|x64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|ARM.ActiveCfg = Release|ARM
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|ARM.Build.0 = Release|ARM
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|ARM64.ActiveCfg = Release|ARM64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|ARM64.Build.0 = Release|ARM64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|x64.ActiveCfg = Release|x64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|x64.Build.0 = Release|x64
-		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|x86.ActiveCfg = Release|x64
-		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|x86.Build.0 = Release|x64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|ARM.ActiveCfg = Release|ARM
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|ARM.Build.0 = Release|ARM
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|ARM64.Build.0 = Release|ARM64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|x64.ActiveCfg = Release|x64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|x64.Build.0 = Release|x64
-		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|x86.ActiveCfg = Release|x64
-		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|x86.Build.0 = Release|x64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|ARM.ActiveCfg = Debug|ARM
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|ARM.Build.0 = Debug|ARM
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|x64.ActiveCfg = Debug|x64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|x64.Build.0 = Debug|x64
-		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|x86.ActiveCfg = Debug|x64
-		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|x86.Build.0 = Debug|x64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|ARM.ActiveCfg = Release|ARM
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|ARM.Build.0 = Release|ARM
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|ARM64.ActiveCfg = Release|ARM64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|ARM64.Build.0 = Release|ARM64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|x64.ActiveCfg = Release|x64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|x64.Build.0 = Release|x64
-		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|x86.ActiveCfg = Release|x64
-		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|x86.Build.0 = Release|x64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|ARM.ActiveCfg = Release|ARM
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|ARM.Build.0 = Release|ARM
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|ARM64.Build.0 = Release|ARM64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|x64.ActiveCfg = Release|x64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|x64.Build.0 = Release|x64
-		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|x86.ActiveCfg = Release|x64
-		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|x86.Build.0 = Release|x64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|ARM.ActiveCfg = Debug|ARM
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|ARM.Build.0 = Debug|ARM
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|ARM64.Build.0 = Debug|ARM64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|x64.ActiveCfg = Debug|x64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|x64.Build.0 = Debug|x64
-		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|x86.ActiveCfg = Debug|x64
-		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|x86.Build.0 = Debug|x64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|ARM.ActiveCfg = Release|ARM
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|ARM.Build.0 = Release|ARM
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|ARM64.ActiveCfg = Release|ARM64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|ARM64.Build.0 = Release|ARM64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|x64.ActiveCfg = Release|x64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|x64.Build.0 = Release|x64
-		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|x86.ActiveCfg = Release|x64
-		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|x86.Build.0 = Release|x64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|ARM.ActiveCfg = Release|ARM
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|ARM.Build.0 = Release|ARM
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|ARM64.Build.0 = Release|ARM64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|x64.ActiveCfg = Release|x64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|x64.Build.0 = Release|x64
-		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|x86.ActiveCfg = Release|x64
-		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|x86.Build.0 = Release|x64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|ARM.ActiveCfg = Debug|ARM
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|ARM.Build.0 = Debug|ARM
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|ARM64.Build.0 = Debug|ARM64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|x64.ActiveCfg = Debug|x64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|x64.Build.0 = Debug|x64
-		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|x86.ActiveCfg = Debug|x64
-		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|x86.Build.0 = Debug|x64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|ARM.ActiveCfg = Release|ARM
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|ARM.Build.0 = Release|ARM
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|ARM64.ActiveCfg = Release|ARM64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|ARM64.Build.0 = Release|ARM64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|x64.ActiveCfg = Release|x64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|x64.Build.0 = Release|x64
-		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|x86.ActiveCfg = Release|x64
-		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|x86.Build.0 = Release|x64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|ARM.ActiveCfg = Release|ARM
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|ARM.Build.0 = Release|ARM
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|ARM64.Build.0 = Release|ARM64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|x64.ActiveCfg = Release|x64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|x64.Build.0 = Release|x64
-		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|x86.ActiveCfg = Release|x64
-		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|x86.Build.0 = Release|x64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|ARM.ActiveCfg = Debug|ARM
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|ARM.Build.0 = Debug|ARM
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|x64.ActiveCfg = Debug|x64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|x64.Build.0 = Debug|x64
-		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|x86.ActiveCfg = Debug|x64
-		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|x86.Build.0 = Debug|x64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|ARM.ActiveCfg = Release|ARM
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|ARM.Build.0 = Release|ARM
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|ARM64.ActiveCfg = Release|ARM64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|ARM64.Build.0 = Release|ARM64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|x64.ActiveCfg = Release|x64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|x64.Build.0 = Release|x64
-		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|x86.ActiveCfg = Release|x64
-		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|x86.Build.0 = Release|x64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|ARM.ActiveCfg = Release|ARM
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|ARM.Build.0 = Release|ARM
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|ARM64.Build.0 = Release|ARM64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|x64.ActiveCfg = Release|x64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|x64.Build.0 = Release|x64
-		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|x86.ActiveCfg = Release|x64
-		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|x86.Build.0 = Release|x64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|ARM.ActiveCfg = Debug|ARM
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|ARM.Build.0 = Debug|ARM
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|ARM64.Build.0 = Debug|ARM64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|x64.ActiveCfg = Debug|x64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|x64.Build.0 = Debug|x64
-		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|x86.ActiveCfg = Debug|x64
-		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|x86.Build.0 = Debug|x64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|ARM.ActiveCfg = Release|ARM
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|ARM.Build.0 = Release|ARM
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|ARM64.ActiveCfg = Release|ARM64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|ARM64.Build.0 = Release|ARM64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|x64.ActiveCfg = Release|x64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|x64.Build.0 = Release|x64
-		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|x86.ActiveCfg = Release|x64
-		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|x86.Build.0 = Release|x64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|ARM.ActiveCfg = Release|ARM
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|ARM.Build.0 = Release|ARM
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|ARM64.Build.0 = Release|ARM64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|x64.ActiveCfg = Release|x64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|x64.Build.0 = Release|x64
-		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|x86.ActiveCfg = Release|x64
-		{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|x86.Build.0 = Release|x64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Debug|ARM.ActiveCfg = Debug|ARM
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Debug|ARM.Build.0 = Debug|ARM
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Debug|ARM64.Build.0 = Debug|ARM64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Debug|x64.ActiveCfg = Debug|x64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Debug|x64.Build.0 = Debug|x64
-		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Debug|x86.ActiveCfg = Debug|x64
-		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Debug|x86.Build.0 = Debug|x64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Release|ARM.ActiveCfg = Release|ARM
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Release|ARM.Build.0 = Release|ARM
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Release|ARM64.ActiveCfg = Release|ARM64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Release|ARM64.Build.0 = Release|ARM64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Release|x64.ActiveCfg = Release|x64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Release|x64.Build.0 = Release|x64
-		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Release|x86.ActiveCfg = Release|x64
-		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.Release|x86.Build.0 = Release|x64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.UWP Gold|ARM.ActiveCfg = Release|ARM
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.UWP Gold|ARM.Build.0 = Release|ARM
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.UWP Gold|ARM64.Build.0 = Release|ARM64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.UWP Gold|x64.ActiveCfg = Release|x64
 		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.UWP Gold|x64.Build.0 = Release|x64
-		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.UWP Gold|x86.ActiveCfg = Release|x64
-		{75286959-E7A2-4CBE-8B95-BF05C9C540FE}.UWP Gold|x86.Build.0 = Release|x64
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Debug|ARM.ActiveCfg = Debug|ARM
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Debug|ARM.Build.0 = Debug|ARM
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Debug|ARM64.Build.0 = Debug|ARM64
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Debug|x64.ActiveCfg = Debug|x64
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Debug|x64.Build.0 = Debug|x64
-		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Debug|x86.ActiveCfg = Debug|x64
-		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Debug|x86.Build.0 = Debug|x64
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Release|ARM.ActiveCfg = Release|ARM
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Release|ARM.Build.0 = Release|ARM
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Release|ARM64.ActiveCfg = Release|ARM64
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Release|ARM64.Build.0 = Release|ARM64
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Release|x64.ActiveCfg = Release|x64
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Release|x64.Build.0 = Release|x64
-		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Release|x86.ActiveCfg = Release|x64
-		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.Release|x86.Build.0 = Release|x64
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.UWP Gold|ARM.ActiveCfg = Release|ARM
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.UWP Gold|ARM.Build.0 = Release|ARM
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.UWP Gold|ARM64.Build.0 = Release|ARM64
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.UWP Gold|x64.ActiveCfg = Release|x64
 		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.UWP Gold|x64.Build.0 = Release|x64
-		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.UWP Gold|x86.ActiveCfg = Release|x64
-		{D31FD4F0-53EB-477C-9DC7-149796F628E2}.UWP Gold|x86.Build.0 = Release|x64
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Debug|ARM.ActiveCfg = Debug|ARM
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Debug|ARM.Build.0 = Debug|ARM
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Debug|ARM64.Build.0 = Debug|ARM64
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Debug|x64.ActiveCfg = Debug|x64
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Debug|x64.Build.0 = Debug|x64
-		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Debug|x86.ActiveCfg = Debug|x64
-		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Debug|x86.Build.0 = Debug|x64
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Release|ARM.ActiveCfg = Release|ARM
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Release|ARM.Build.0 = Release|ARM
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Release|ARM64.ActiveCfg = Release|ARM64
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Release|ARM64.Build.0 = Release|ARM64
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Release|x64.ActiveCfg = Release|x64
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Release|x64.Build.0 = Release|x64
-		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Release|x86.ActiveCfg = Release|x64
-		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.Release|x86.Build.0 = Release|x64
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.UWP Gold|ARM.ActiveCfg = Release|ARM
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.UWP Gold|ARM.Build.0 = Release|ARM
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.UWP Gold|ARM64.Build.0 = Release|ARM64
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.UWP Gold|x64.ActiveCfg = Release|x64
 		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.UWP Gold|x64.Build.0 = Release|x64
-		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.UWP Gold|x86.ActiveCfg = Release|x64
-		{C249F016-7F82-45CF-BB6E-0642A988C4D3}.UWP Gold|x86.Build.0 = Release|x64
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.Debug|ARM.ActiveCfg = Debug|ARM
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.Debug|ARM.Build.0 = Debug|ARM
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.Debug|ARM64.Build.0 = Debug|ARM64
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.Debug|x64.ActiveCfg = Debug|x64
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.Debug|x64.Build.0 = Debug|x64
-		{4C9D52D0-310A-4347-8991-E3788CB22169}.Debug|x86.ActiveCfg = Debug|x64
-		{4C9D52D0-310A-4347-8991-E3788CB22169}.Debug|x86.Build.0 = Debug|x64
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.Release|ARM.ActiveCfg = Release|ARM
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.Release|ARM.Build.0 = Release|ARM
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.Release|ARM64.ActiveCfg = Release|ARM64
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.Release|ARM64.Build.0 = Release|ARM64
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.Release|x64.ActiveCfg = Release|x64
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.Release|x64.Build.0 = Release|x64
-		{4C9D52D0-310A-4347-8991-E3788CB22169}.Release|x86.ActiveCfg = Release|x64
-		{4C9D52D0-310A-4347-8991-E3788CB22169}.Release|x86.Build.0 = Release|x64
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.UWP Gold|ARM.ActiveCfg = Release|ARM
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.UWP Gold|ARM.Build.0 = Release|ARM
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.UWP Gold|ARM64.Build.0 = Release|ARM64
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.UWP Gold|x64.ActiveCfg = Release|x64
 		{4C9D52D0-310A-4347-8991-E3788CB22169}.UWP Gold|x64.Build.0 = Release|x64
-		{4C9D52D0-310A-4347-8991-E3788CB22169}.UWP Gold|x86.ActiveCfg = Release|x64
-		{4C9D52D0-310A-4347-8991-E3788CB22169}.UWP Gold|x86.Build.0 = Release|x64
 		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Debug|ARM.ActiveCfg = Debug|ARM
 		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Debug|ARM.Build.0 = Debug|ARM
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Debug|ARM64.ActiveCfg = Debug|x64
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Debug|ARM64.Build.0 = Debug|x64
+		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Debug|ARM64.Build.0 = Debug|ARM64
 		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Debug|x64.ActiveCfg = Debug|x64
 		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Debug|x64.Build.0 = Debug|x64
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Debug|x86.ActiveCfg = Debug|Win32
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Debug|x86.Build.0 = Debug|Win32
 		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Release|ARM.ActiveCfg = Release|ARM
 		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Release|ARM.Build.0 = Release|ARM
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Release|ARM64.ActiveCfg = Release|x64
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Release|ARM64.Build.0 = Release|x64
+		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Release|ARM64.Build.0 = Release|ARM64
 		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Release|x64.ActiveCfg = Release|x64
 		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Release|x64.Build.0 = Release|x64
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Release|x86.ActiveCfg = Release|Win32
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.Release|x86.Build.0 = Release|Win32
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|ARM.ActiveCfg = Debug|ARM
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|ARM.Build.0 = Debug|ARM
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|ARM64.ActiveCfg = Debug|x64
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|ARM64.Build.0 = Debug|x64
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|x64.ActiveCfg = Debug|x64
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|x64.Build.0 = Debug|x64
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|x86.ActiveCfg = Debug|Win32
-		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|x86.Build.0 = Debug|Win32
+		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|ARM.ActiveCfg = Release|ARM
+		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|ARM.Build.0 = Release|ARM
+		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|ARM64.ActiveCfg = Release|ARM64
+		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|ARM64.Build.0 = Release|ARM64
+		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|x64.ActiveCfg = Release|x64
+		{191B6F52-AD66-4172-BD20-733EEECEEF8C}.UWP Gold|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/UWP/libchdr_UWP/libchdr_UWP.vcxproj b/UWP/libchdr_UWP/libchdr_UWP.vcxproj
index 69ac0ab77e..afd6fb6a31 100644
--- a/UWP/libchdr_UWP/libchdr_UWP.vcxproj
+++ b/UWP/libchdr_UWP/libchdr_UWP.vcxproj
@@ -5,9 +5,9 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>ARM64</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -17,9 +17,9 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
+    <ProjectConfiguration Include="Release|ARM64">
       <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>ARM64</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
@@ -63,150 +63,31 @@
     <ProjectName>libchdr_UWP</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <PropertyGroup Label="UserMacros" /><PropertyGroup />
+  <PropertyGroup>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup>
     <ClCompile>
       <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\ext\zlib;..\..\ext\libchdr\include;..\..\ext\libchdr\deps\lzma-22.01\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_7ZIP_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\ext\zlib;..\..\ext\libchdr\include;..\..\ext\libchdr\deps\lzma-22.01\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_7ZIP_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\ext\zlib;..\..\ext\libchdr\include;..\..\ext\libchdr\deps\lzma-22.01\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_7ZIP_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\ext\zlib;..\..\ext\libchdr\include;..\..\ext\libchdr\deps\lzma-22.01\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_7ZIP_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\ext\zlib;..\..\ext\libchdr\include;..\..\ext\libchdr\deps\lzma-22.01\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_7ZIP_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
+      <SDLCheck>false</SDLCheck>
       <AdditionalIncludeDirectories>..\..\ext\zlib;..\..\ext\libchdr\include;..\..\ext\libchdr\deps\lzma-22.01\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PreprocessorDefinitions>_7ZIP_ST;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>