diff --git a/src/Tools/thumbs/ThumbnailProvider/ThumbnailProvider.sln b/src/Tools/thumbs/ThumbnailProvider/ThumbnailProvider.sln
index 7a743910ed..b6b85bd939 100644
--- a/src/Tools/thumbs/ThumbnailProvider/ThumbnailProvider.sln
+++ b/src/Tools/thumbs/ThumbnailProvider/ThumbnailProvider.sln
@@ -1,100 +1,97 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ThumbnailProvider", "ThumbnailProvider.vcproj", "{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", "ALL_BUILD.vcxproj", "{55E5AB2B-1257-3869-91CB-80B99160AF43}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5} = {5B09C649-4D91-4960-8FF8-978146E6F7D5}
-		{14699290-6210-4450-B397-83DFE7D8CDEC} = {14699290-6210-4450-B397-83DFE7D8CDEC}
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7} = {70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}
+		{745470E2-1A58-3E79-A6CF-94239E5C37D7} = {745470E2-1A58-3E79-A6CF-94239E5C37D7}
+		{8AFB36EB-2C63-3A31-90CB-70C6389B2F21} = {8AFB36EB-2C63-3A31-90CB-70C6389B2F21}
+		{F9CB5900-ED83-3271-A120-9443E5D49799} = {F9CB5900-ED83-3271-A120-9443E5D49799}
+		{C3B09E2C-25D6-38B5-9D5E-B024A85E0959} = {C3B09E2C-25D6-38B5-9D5E-B024A85E0959}
+		{B91B106C-DD6E-36CF-BF79-BA5B3B3152FB} = {B91B106C-DD6E-36CF-BF79-BA5B3B3152FB}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\..\..\3rdParty\CxImage\png\png.vcproj", "{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxImage", "..\..\..\3rdParty\CxImage\CxImage\cximage.vcproj", "{5B09C649-4D91-4960-8FF8-978146E6F7D5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxImage", "CxImage.vcxproj", "{745470E2-1A58-3E79-A6CF-94239E5C37D7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{14699290-6210-4450-B397-83DFE7D8CDEC} = {14699290-6210-4450-B397-83DFE7D8CDEC}
+		{F9CB5900-ED83-3271-A120-9443E5D49799} = {F9CB5900-ED83-3271-A120-9443E5D49799}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\3rdParty\CxImage\zlib\zlib.vcproj", "{14699290-6210-4450-B397-83DFE7D8CDEC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FCStdThumbnail", "FCStdThumbnail.vcxproj", "{8AFB36EB-2C63-3A31-90CB-70C6389B2F21}"
+	ProjectSection(ProjectDependencies) = postProject
+		{745470E2-1A58-3E79-A6CF-94239E5C37D7} = {745470E2-1A58-3E79-A6CF-94239E5C37D7}
+		{F9CB5900-ED83-3271-A120-9443E5D49799} = {F9CB5900-ED83-3271-A120-9443E5D49799}
+		{C3B09E2C-25D6-38B5-9D5E-B024A85E0959} = {C3B09E2C-25D6-38B5-9D5E-B024A85E0959}
+		{B91B106C-DD6E-36CF-BF79-BA5B3B3152FB} = {B91B106C-DD6E-36CF-BF79-BA5B3B3152FB}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "ZERO_CHECK.vcxproj", "{F9CB5900-ED83-3271-A120-9443E5D49799}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "png.vcxproj", "{C3B09E2C-25D6-38B5-9D5E-B024A85E0959}"
+	ProjectSection(ProjectDependencies) = postProject
+		{F9CB5900-ED83-3271-A120-9443E5D49799} = {F9CB5900-ED83-3271-A120-9443E5D49799}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{B91B106C-DD6E-36CF-BF79-BA5B3B3152FB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{F9CB5900-ED83-3271-A120-9443E5D49799} = {F9CB5900-ED83-3271-A120-9443E5D49799}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
-		Unicode Debug|Win32 = Unicode Debug|Win32
-		Unicode Debug|x64 = Unicode Debug|x64
-		Unicode Release|Win32 = Unicode Release|Win32
-		Unicode Release|x64 = Unicode Release|x64
+		MinSizeRel|x64 = MinSizeRel|x64
+		RelWithDebInfo|x64 = RelWithDebInfo|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Debug|Win32.Build.0 = Debug|Win32
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Debug|x64.ActiveCfg = Debug|x64
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Debug|x64.Build.0 = Debug|x64
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Release|Win32.ActiveCfg = Release|Win32
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Release|Win32.Build.0 = Release|Win32
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Release|x64.ActiveCfg = Release|x64
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Release|x64.Build.0 = Release|x64
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Unicode Debug|Win32.Build.0 = Debug|Win32
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Unicode Debug|x64.ActiveCfg = Debug|x64
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Unicode Debug|x64.Build.0 = Debug|x64
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Unicode Release|Win32.ActiveCfg = Release|Win32
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Unicode Release|Win32.Build.0 = Release|Win32
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Unicode Release|x64.ActiveCfg = Release|x64
-		{B4F22D8C-736E-46BF-85FB-259EF73EA0FC}.Unicode Release|x64.Build.0 = Release|x64
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Debug|Win32.Build.0 = Debug|Win32
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Debug|x64.ActiveCfg = Debug|x64
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Debug|x64.Build.0 = Debug|x64
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Release|Win32.ActiveCfg = Release|Win32
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Release|Win32.Build.0 = Release|Win32
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Release|x64.ActiveCfg = Release|x64
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Release|x64.Build.0 = Release|x64
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
-		{70C07CD0-5D25-426E-A6FA-C9CDC0847AB7}.Unicode Release|x64.Build.0 = Unicode Release|x64
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Debug|Win32.Build.0 = Debug|Win32
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Debug|x64.ActiveCfg = Debug|x64
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Debug|x64.Build.0 = Debug|x64
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Release|Win32.ActiveCfg = Release|Win32
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Release|Win32.Build.0 = Release|Win32
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Release|x64.ActiveCfg = Release|x64
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Release|x64.Build.0 = Release|x64
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
-		{5B09C649-4D91-4960-8FF8-978146E6F7D5}.Unicode Release|x64.Build.0 = Unicode Release|x64
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Debug|Win32.Build.0 = Debug|Win32
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Debug|x64.ActiveCfg = Debug|x64
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Debug|x64.Build.0 = Debug|x64
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Release|Win32.ActiveCfg = Release|Win32
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Release|Win32.Build.0 = Release|Win32
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Release|x64.ActiveCfg = Release|x64
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Release|x64.Build.0 = Release|x64
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
-		{14699290-6210-4450-B397-83DFE7D8CDEC}.Unicode Release|x64.Build.0 = Unicode Release|x64
+		{55E5AB2B-1257-3869-91CB-80B99160AF43}.Debug|x64.ActiveCfg = Debug|x64
+		{55E5AB2B-1257-3869-91CB-80B99160AF43}.Release|x64.ActiveCfg = Release|x64
+		{55E5AB2B-1257-3869-91CB-80B99160AF43}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{55E5AB2B-1257-3869-91CB-80B99160AF43}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{745470E2-1A58-3E79-A6CF-94239E5C37D7}.Debug|x64.ActiveCfg = Debug|x64
+		{745470E2-1A58-3E79-A6CF-94239E5C37D7}.Debug|x64.Build.0 = Debug|x64
+		{745470E2-1A58-3E79-A6CF-94239E5C37D7}.Release|x64.ActiveCfg = Release|x64
+		{745470E2-1A58-3E79-A6CF-94239E5C37D7}.Release|x64.Build.0 = Release|x64
+		{745470E2-1A58-3E79-A6CF-94239E5C37D7}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{745470E2-1A58-3E79-A6CF-94239E5C37D7}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{745470E2-1A58-3E79-A6CF-94239E5C37D7}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{745470E2-1A58-3E79-A6CF-94239E5C37D7}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{8AFB36EB-2C63-3A31-90CB-70C6389B2F21}.Debug|x64.ActiveCfg = Debug|x64
+		{8AFB36EB-2C63-3A31-90CB-70C6389B2F21}.Debug|x64.Build.0 = Debug|x64
+		{8AFB36EB-2C63-3A31-90CB-70C6389B2F21}.Release|x64.ActiveCfg = Release|x64
+		{8AFB36EB-2C63-3A31-90CB-70C6389B2F21}.Release|x64.Build.0 = Release|x64
+		{8AFB36EB-2C63-3A31-90CB-70C6389B2F21}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{8AFB36EB-2C63-3A31-90CB-70C6389B2F21}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{8AFB36EB-2C63-3A31-90CB-70C6389B2F21}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{8AFB36EB-2C63-3A31-90CB-70C6389B2F21}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{F9CB5900-ED83-3271-A120-9443E5D49799}.Debug|x64.ActiveCfg = Debug|x64
+		{F9CB5900-ED83-3271-A120-9443E5D49799}.Debug|x64.Build.0 = Debug|x64
+		{F9CB5900-ED83-3271-A120-9443E5D49799}.Release|x64.ActiveCfg = Release|x64
+		{F9CB5900-ED83-3271-A120-9443E5D49799}.Release|x64.Build.0 = Release|x64
+		{F9CB5900-ED83-3271-A120-9443E5D49799}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{F9CB5900-ED83-3271-A120-9443E5D49799}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{F9CB5900-ED83-3271-A120-9443E5D49799}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{F9CB5900-ED83-3271-A120-9443E5D49799}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{C3B09E2C-25D6-38B5-9D5E-B024A85E0959}.Debug|x64.ActiveCfg = Debug|x64
+		{C3B09E2C-25D6-38B5-9D5E-B024A85E0959}.Debug|x64.Build.0 = Debug|x64
+		{C3B09E2C-25D6-38B5-9D5E-B024A85E0959}.Release|x64.ActiveCfg = Release|x64
+		{C3B09E2C-25D6-38B5-9D5E-B024A85E0959}.Release|x64.Build.0 = Release|x64
+		{C3B09E2C-25D6-38B5-9D5E-B024A85E0959}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{C3B09E2C-25D6-38B5-9D5E-B024A85E0959}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{C3B09E2C-25D6-38B5-9D5E-B024A85E0959}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{C3B09E2C-25D6-38B5-9D5E-B024A85E0959}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{B91B106C-DD6E-36CF-BF79-BA5B3B3152FB}.Debug|x64.ActiveCfg = Debug|x64
+		{B91B106C-DD6E-36CF-BF79-BA5B3B3152FB}.Debug|x64.Build.0 = Debug|x64
+		{B91B106C-DD6E-36CF-BF79-BA5B3B3152FB}.Release|x64.ActiveCfg = Release|x64
+		{B91B106C-DD6E-36CF-BF79-BA5B3B3152FB}.Release|x64.Build.0 = Release|x64
+		{B91B106C-DD6E-36CF-BF79-BA5B3B3152FB}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{B91B106C-DD6E-36CF-BF79-BA5B3B3152FB}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{B91B106C-DD6E-36CF-BF79-BA5B3B3152FB}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{B91B106C-DD6E-36CF-BF79-BA5B3B3152FB}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {564F1C50-19FC-3C38-BCB2-602A91D58E37}
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
 	EndGlobalSection
 EndGlobal