32 files changed, 491 insertions, 1463 deletions
diff --git a/include/m_version.h b/include/m_version.h
index b4bfa7763b..2d10fe9de2 100644
--- a/include/m_version.h
+++ b/include/m_version.h
@@ -27,10 +27,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MIRANDA_MAKE_VERSION(a,b,c,d)   (((((DWORD)(a))&0xFF)<<24)|((((DWORD)(b))&0xFF)<<16)|((((DWORD)(c))&0xFF)<<8)|(((DWORD)(d))&0xFF))
 #endif
 
-#define MIRANDA_VERSION_FILEVERSION 0,92,1,25                                
-#define MIRANDA_VERSION_STRING      "0.92.1.25"                              
-#define MIRANDA_VERSION_DISPLAY     "0.92.1 alpha build #25"                 
-#define MIRANDA_VERSION_DWORD       MIRANDA_MAKE_VERSION(0, 92, 1, 25)       
+#define MIRANDA_VERSION_FILEVERSION 0,92,1,31                                
+#define MIRANDA_VERSION_STRING      "0.92.1.31"                              
+#define MIRANDA_VERSION_DISPLAY     "0.92.1 alpha build #31"                 
+#define MIRANDA_VERSION_DWORD       MIRANDA_MAKE_VERSION(0, 92, 1, 31)       
 #define MIRANDA_VERSION_CORE        MIRANDA_MAKE_VERSION(0, 92, 1, 0)        
 #define MIRANDA_VERSION_CORE_STRING "0.92.1.0"                               
                                                                               
diff --git a/plugins/AuthState/authstate_10.sln b/plugins/AuthState/authstate_10.sln
index f702de2db2..42ee57f1ba 100644
--- a/plugins/AuthState/authstate_10.sln
+++ b/plugins/AuthState/authstate_10.sln
@@ -5,20 +5,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AuthState", "authstate_10.v
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release Unicode|x64.Build.0 = Release Unicode|x64
+		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Debug|Win32.Build.0 = Debug|Win32
+		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Debug|x64.ActiveCfg = Debug|x64
+		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Debug|x64.Build.0 = Debug|x64
+		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release|Win32.ActiveCfg = Release|Win32
+		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release|Win32.Build.0 = Release|Win32
+		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release|x64.ActiveCfg = Release|x64
+		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/Autorun/autorun.sln b/plugins/Autorun/autorun.sln
index a661a54207..7bddde4299 100644
--- a/plugins/Autorun/autorun.sln
+++ b/plugins/Autorun/autorun.sln
@@ -1,24 +1,24 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "autorun", "autorun.vcxproj", "{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "autorun", "autorun.vcxproj", "{6E46F54C-0614-0AF1-B236-D338DAD6DC00}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Release Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Release Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Release Unicode|x64.Build.0 = Release Unicode|x64
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Debug|Win32.Build.0 = Debug|Win32
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Debug|x64.ActiveCfg = Debug|x64
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Debug|x64.Build.0 = Debug|x64
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Release|Win32.ActiveCfg = Release|Win32
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Release|Win32.Build.0 = Release|Win32
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Release|x64.ActiveCfg = Release|x64
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/Autorun/autorun.vcxproj b/plugins/Autorun/autorun.vcxproj
index c824b58342..936282170c 100644
--- a/plugins/Autorun/autorun.vcxproj
+++ b/plugins/Autorun/autorun.vcxproj
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Unicode|Win32">
-      <Configuration>Debug Unicode</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug Unicode|x64">
-      <Configuration>Debug Unicode</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Unicode|Win32">
-      <Configuration>Release Unicode</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Unicode|x64">
-      <Configuration>Release Unicode</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -23,63 +23,59 @@
     <SccLocalPath />
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)/Plugins\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
-    <OutDir>$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)/Plugins\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
+    <IntDir>$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <FunctionLevelLinking>false</FunctionLevelLinking>
@@ -111,14 +107,16 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <FunctionLevelLinking>false</FunctionLevelLinking>
       <Optimization>Disabled</Optimization>
       <WarningLevel>Level3</WarningLevel>
+      <MinimalRebuild>true</MinimalRebuild>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;autorun_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;autorun_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <Midl>
@@ -126,6 +124,7 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <TypeLibraryName>.\Debug\autorun.tlb</TypeLibraryName>
       <MkTypLibCompatible>true</MkTypLibCompatible>
+      <TargetEnvironment>Win32</TargetEnvironment>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -140,75 +139,62 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>Full</Optimization>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <Optimization>Disabled</Optimization>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;autorun_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;autorun_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <Midl>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\Release\autorun.tlb</TypeLibraryName>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TypeLibraryName>.\Debug\autorun.tlb</TypeLibraryName>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Bscmake />
     <Link>
       <LinkDLL>true</LinkDLL>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <BaseAddress>0x30040000</BaseAddress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions> /FILEALIGN:512  /SECTION:.text,ER /IGNORE:4078   /IGNORE:4078 </AdditionalOptions>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>Full</Optimization>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <Optimization>Disabled</Optimization>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;autorun_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;autorun_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <Midl>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\Release\autorun.tlb</TypeLibraryName>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TypeLibraryName>.\Debug\autorun.tlb</TypeLibraryName>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Bscmake />
     <Link>
       <LinkDLL>true</LinkDLL>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <BaseAddress>0x30040000</BaseAddress>
-      <AdditionalDependencies>kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions> /FILEALIGN:512  /SECTION:.text,ER /IGNORE:4078   /IGNORE:4078 </AdditionalOptions>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/plugins/Bass_interface/Bass_interface.sln b/plugins/Bass_interface/Bass_interface.sln
index 23eeb90a09..5be096af29 100644
--- a/plugins/Bass_interface/Bass_interface.sln
+++ b/plugins/Bass_interface/Bass_interface.sln
@@ -1,24 +1,24 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+# Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bass_interface", "Bass_interface.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3933E789-D185-41DC-8169-9FF4365B6015}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{3933E789-D185-41DC-8169-9FF4365B6015}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{3933E789-D185-41DC-8169-9FF4365B6015}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{3933E789-D185-41DC-8169-9FF4365B6015}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{3933E789-D185-41DC-8169-9FF4365B6015}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{3933E789-D185-41DC-8169-9FF4365B6015}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{3933E789-D185-41DC-8169-9FF4365B6015}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{3933E789-D185-41DC-8169-9FF4365B6015}.Release Unicode|x64.Build.0 = Release Unicode|x64
+		{3933E789-D185-41DC-8169-9FF4365B6015}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3933E789-D185-41DC-8169-9FF4365B6015}.Debug|Win32.Build.0 = Debug|Win32
+		{3933E789-D185-41DC-8169-9FF4365B6015}.Debug|x64.ActiveCfg = Debug|x64
+		{3933E789-D185-41DC-8169-9FF4365B6015}.Debug|x64.Build.0 = Debug|x64
+		{3933E789-D185-41DC-8169-9FF4365B6015}.Release|Win32.ActiveCfg = Release|Win32
+		{3933E789-D185-41DC-8169-9FF4365B6015}.Release|Win32.Build.0 = Release|Win32
+		{3933E789-D185-41DC-8169-9FF4365B6015}.Release|x64.ActiveCfg = Release|x64
+		{3933E789-D185-41DC-8169-9FF4365B6015}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/Boltun/Boltun_10.sln b/plugins/Boltun/Boltun_10.sln
index 9f1aa3541d..1bfc51a895 100644
--- a/plugins/Boltun/Boltun_10.sln
+++ b/plugins/Boltun/Boltun_10.sln
@@ -1,17 +1,18 @@
+
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Boltun_10", "Boltun_10.vcxproj", "{98DF7761-41D7-4C5C-9FFE-E5CCB3997783}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boltun", "Boltun_10.vcxproj", "{98DF7761-41D7-4C5C-9FFE-E5CCB3997783}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Release Unicode|Win32 = Release Unicode|Win32
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{98DF7761-41D7-4C5C-9FFE-E5CCB3997783}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{98DF7761-41D7-4C5C-9FFE-E5CCB3997783}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{98DF7761-41D7-4C5C-9FFE-E5CCB3997783}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{98DF7761-41D7-4C5C-9FFE-E5CCB3997783}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
+		{98DF7761-41D7-4C5C-9FFE-E5CCB3997783}.Debug|Win32.ActiveCfg = Debug|Win32
+		{98DF7761-41D7-4C5C-9FFE-E5CCB3997783}.Debug|Win32.Build.0 = Debug|Win32
+		{98DF7761-41D7-4C5C-9FFE-E5CCB3997783}.Release|Win32.ActiveCfg = Release|Win32
+		{98DF7761-41D7-4C5C-9FFE-E5CCB3997783}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/Bonsai/Bonsai.sln b/plugins/Bonsai/Bonsai.sln
index 55af8b6018..78b93e62cd 100644
--- a/plugins/Bonsai/Bonsai.sln
+++ b/plugins/Bonsai/Bonsai.sln
@@ -5,20 +5,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bonsai", "FixOptions\FixOpt
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release Unicode|x64.Build.0 = Release Unicode|x64
+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug|Win32.Build.0 = Debug|Win32
+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug|x64.ActiveCfg = Debug|x64
+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Debug|x64.Build.0 = Debug|x64
+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release|Win32.ActiveCfg = Release|Win32
+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release|Win32.Build.0 = Release|Win32
+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release|x64.ActiveCfg = Release|x64
+		{C2F9A2EE-128B-43BD-9F3A-DAD0D954CB67}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/BossKeyPlus/BossKey_10.sln b/plugins/BossKeyPlus/BossKey_10.sln
index 0e0f1175b9..d743ee5cfa 100644
--- a/plugins/BossKeyPlus/BossKey_10.sln
+++ b/plugins/BossKeyPlus/BossKey_10.sln
@@ -1,23 +1,24 @@
+
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+# Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BossKey", "BossKey_10.vcxproj", "{88E47CF7-7B40-4312-A35A-9B28885FFED9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Release Unicode|x64.Build.0 = Release Unicode|x64
+		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Debug|Win32.Build.0 = Debug|Win32
+		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Debug|x64.ActiveCfg = Debug|x64
+		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Debug|x64.Build.0 = Debug|x64
+		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Release|Win32.ActiveCfg = Release|Win32
+		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Release|Win32.Build.0 = Release|Win32
+		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Release|x64.ActiveCfg = Release|x64
+		{88E47CF7-7B40-4312-A35A-9B28885FFED9}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/BuddyExpectator/BuddyExpectator10.sln b/plugins/BuddyExpectator/BuddyExpectator10.sln
index f0f3b2c463..02623c1061 100644
--- a/plugins/BuddyExpectator/BuddyExpectator10.sln
+++ b/plugins/BuddyExpectator/BuddyExpectator10.sln
@@ -5,20 +5,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuddyExpectator", "BuddyExp
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Release Unicode|x64.Build.0 = Release Unicode|x64
+		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Debug|Win32.Build.0 = Debug|Win32
+		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Debug|x64.ActiveCfg = Debug|x64
+		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Debug|x64.Build.0 = Debug|x64
+		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Release|Win32.ActiveCfg = Release|Win32
+		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Release|Win32.Build.0 = Release|Win32
+		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Release|x64.ActiveCfg = Release|x64
+		{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/CSList/cslist_10.sln b/plugins/CSList/cslist_10.sln
index 57e919cbd0..7287d7a3d1 100644
--- a/plugins/CSList/cslist_10.sln
+++ b/plugins/CSList/cslist_10.sln
@@ -1,23 +1,24 @@
+
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+# Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cslist", "cslist_10.vcxproj", "{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Release Unicode|x64.Build.0 = Release Unicode|x64
+		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Debug|Win32.Build.0 = Debug|Win32
+		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Debug|x64.ActiveCfg = Debug|x64
+		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Debug|x64.Build.0 = Debug|x64
+		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Release|Win32.ActiveCfg = Release|Win32
+		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Release|Win32.Build.0 = Release|Win32
+		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Release|x64.ActiveCfg = Release|x64
+		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/Console/Console.sln b/plugins/Console/Console.sln
index ec08db8d23..64dc9eef81 100644
--- a/plugins/Console/Console.sln
+++ b/plugins/Console/Console.sln
@@ -1,28 +1,26 @@
+
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Console", "Console.vcxproj", "{A231E008-2D1A-4F24-95DD-59F56F85A499}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Release Unicode|x64.Build.0 = Release Unicode|x64
+		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug|Win32.Build.0 = Debug|Win32
+		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug|x64.ActiveCfg = Debug|x64
+		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Debug|x64.Build.0 = Debug|x64
+		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|Win32.ActiveCfg = Release|Win32
+		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|Win32.Build.0 = Release|Win32
+		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|x64.ActiveCfg = Release|x64
+		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
 EndGlobal
diff --git a/plugins/ContactsPlus/contacts.sln b/plugins/ContactsPlus/contacts.sln
index 573e39f319..20a679ddb3 100644
--- a/plugins/ContactsPlus/contacts.sln
+++ b/plugins/ContactsPlus/contacts.sln
@@ -1,34 +1,24 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "contacts", "contacts.vcxproj", "{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "contacts", "contacts.vcxproj", "{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Debug Unicode|x64.ActiveCfg = Debug Unicode|Win32
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Debug|Win32.Build.0 = Debug|Win32
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Debug|x64.ActiveCfg = Debug|x64
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Debug|x64.Build.0 = Debug|x64
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Release Unicode|x64.ActiveCfg = Release Unicode|Win32
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Release|Win32.ActiveCfg = Release|Win32
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Release|Win32.Build.0 = Release|Win32
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Release|x64.ActiveCfg = Release|x64
-		{3E2FEAB1-3749-A6E4-A81E-54853C5B194E}.Release|x64.Build.0 = Release|x64
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Debug|Win32.Build.0 = Debug|Win32
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Debug|x64.ActiveCfg = Debug|x64
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Debug|x64.Build.0 = Debug|x64
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Release|Win32.ActiveCfg = Release|Win32
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Release|Win32.Build.0 = Release|Win32
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Release|x64.ActiveCfg = Release|x64
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/CountryFlags/flags.sln b/plugins/CountryFlags/flags.sln
index 98c0970f3d..ff288bf534 100644
--- a/plugins/CountryFlags/flags.sln
+++ b/plugins/CountryFlags/flags.sln
@@ -1,18 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flags", "flags.vcxproj", "{B4361FA0-4073-4B60-EE72-F5C08E6EDF61}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flags", "flags.vcxproj", "{E289453C-C665-996F-3A21-566D379C2B11}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Release Unicode|Win32 = Release Unicode|Win32
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
+		{E289453C-C665-996F-3A21-566D379C2B11}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E289453C-C665-996F-3A21-566D379C2B11}.Debug|Win32.Build.0 = Debug|Win32
+		{E289453C-C665-996F-3A21-566D379C2B11}.Release|Win32.ActiveCfg = Release|Win32
+		{E289453C-C665-996F-3A21-566D379C2B11}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/CountryFlags/flags.vcxproj b/plugins/CountryFlags/flags.vcxproj
index 84b020b887..e0a3139b19 100644
--- a/plugins/CountryFlags/flags.vcxproj
+++ b/plugins/CountryFlags/flags.vcxproj
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Unicode|Win32">
-      <Configuration>Debug Unicode</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Unicode|Win32">
-      <Configuration>Release Unicode</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -15,13 +15,13 @@
     <SccLocalPath />
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
@@ -29,28 +29,28 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)/Plugins\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <IgnoreImportLibrary>true</IgnoreImportLibrary>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)/Plugins\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <IgnoreImportLibrary>true</IgnoreImportLibrary>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
@@ -93,7 +93,7 @@
       <AdditionalOptions> /mapinfo:lines  /mapinfo:lines </AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -143,25 +143,25 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="countrylistext.c">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
     </ClCompile>
     <ClCompile Include="extraimg.c">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
     </ClCompile>
     <ClCompile Include="huffman.c">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
     </ClCompile>
     <ClCompile Include="icons.c">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
     </ClCompile>
     <ClCompile Include="ip2country.c">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
     </ClCompile>
     <ClCompile Include="main.c">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
     </ClCompile>
     <ClCompile Include="utils.c">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> /opt:ref /opt:nowin98   /opt:ref /opt:nowin98 </AdditionalOptions>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
diff --git a/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj b/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj
index 67530bfe03..d6d61015c6 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj
+++ b/plugins/Dbx_mmap_SA/Dbtool/dbtool_sa_10.vcxproj
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Unicode|Win32">
-      <Configuration>Debug Unicode</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug Unicode|x64">
-      <Configuration>Debug Unicode</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Unicode|Win32">
-      <Configuration>Release Unicode</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Unicode|x64">
-      <Configuration>Release Unicode</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -24,70 +24,70 @@
     <RootNamespace>dbtool</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</IgnoreImportLibrary>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</IgnoreImportLibrary>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</IgnoreImportLibrary>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</IgnoreImportLibrary>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
@@ -125,7 +125,7 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
@@ -164,7 +164,7 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
@@ -213,7 +213,7 @@
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
@@ -267,10 +267,10 @@
     <ClCompile Include="encryption.cpp" />
     <ClCompile Include="langpack.cpp" />
     <ClCompile Include="main.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="utf.cpp" />
     <ClCompile Include="wizard.cpp" />
diff --git a/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.sln b/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.sln
index 24791a2d0b..c90e25a3a8 100644
--- a/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.sln
+++ b/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.sln
@@ -1,54 +1,54 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbx_mmap_sa", "db3x_mmap_sa_10.vcxproj", "{20D781FB-4A20-4B75-B863-304A47182966}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbx_mmap_sa", "db3x_mmap_sa_10.vcxproj", "{6D3DC604-9CA0-45A2-85D7-1EFE3309F23B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_autobackups", "db_autobackups\db_autobackups_10.vcxproj", "{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "import_sa", "import_sa\import_sa_10.vcxproj", "{4C132C24-F38A-41A4-99DB-E3CBD86E6714}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbtool_sa", "Dbtool\dbtool_sa_10.vcxproj", "{A2E9DA24-95E4-4414-94AF-488A382E276A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbtool_sa", "Dbtool\dbtool_sa_10.vcxproj", "{6E233FE8-8D90-454F-A9DC-AC2B5555D137}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{20D781FB-4A20-4B75-B863-304A47182966}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{20D781FB-4A20-4B75-B863-304A47182966}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{20D781FB-4A20-4B75-B863-304A47182966}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{20D781FB-4A20-4B75-B863-304A47182966}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{20D781FB-4A20-4B75-B863-304A47182966}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{20D781FB-4A20-4B75-B863-304A47182966}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{20D781FB-4A20-4B75-B863-304A47182966}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{20D781FB-4A20-4B75-B863-304A47182966}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Release Unicode|x64.Build.0 = Release Unicode|x64
+		{6D3DC604-9CA0-45A2-85D7-1EFE3309F23B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6D3DC604-9CA0-45A2-85D7-1EFE3309F23B}.Debug|Win32.Build.0 = Debug|Win32
+		{6D3DC604-9CA0-45A2-85D7-1EFE3309F23B}.Debug|x64.ActiveCfg = Debug|x64
+		{6D3DC604-9CA0-45A2-85D7-1EFE3309F23B}.Debug|x64.Build.0 = Debug|x64
+		{6D3DC604-9CA0-45A2-85D7-1EFE3309F23B}.Release|Win32.ActiveCfg = Release|Win32
+		{6D3DC604-9CA0-45A2-85D7-1EFE3309F23B}.Release|Win32.Build.0 = Release|Win32
+		{6D3DC604-9CA0-45A2-85D7-1EFE3309F23B}.Release|x64.ActiveCfg = Release|x64
+		{6D3DC604-9CA0-45A2-85D7-1EFE3309F23B}.Release|x64.Build.0 = Release|x64
+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Debug|Win32.ActiveCfg = Debug|Win32
+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Debug|Win32.Build.0 = Debug|Win32
+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Debug|x64.ActiveCfg = Debug|x64
+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Debug|x64.Build.0 = Debug|x64
+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Release|Win32.ActiveCfg = Release|Win32
+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Release|Win32.Build.0 = Release|Win32
+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Release|x64.ActiveCfg = Release|x64
+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Release|x64.Build.0 = Release|x64
+		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Debug|Win32.Build.0 = Debug|Win32
+		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Debug|x64.ActiveCfg = Debug|x64
+		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Debug|x64.Build.0 = Debug|x64
+		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Release|Win32.ActiveCfg = Release|Win32
+		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Release|Win32.Build.0 = Release|Win32
+		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Release|x64.ActiveCfg = Release|x64
+		{4C132C24-F38A-41A4-99DB-E3CBD86E6714}.Release|x64.Build.0 = Release|x64
+		{6E233FE8-8D90-454F-A9DC-AC2B5555D137}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6E233FE8-8D90-454F-A9DC-AC2B5555D137}.Debug|Win32.Build.0 = Debug|Win32
+		{6E233FE8-8D90-454F-A9DC-AC2B5555D137}.Debug|x64.ActiveCfg = Debug|x64
+		{6E233FE8-8D90-454F-A9DC-AC2B5555D137}.Debug|x64.Build.0 = Debug|x64
+		{6E233FE8-8D90-454F-A9DC-AC2B5555D137}.Release|Win32.ActiveCfg = Release|Win32
+		{6E233FE8-8D90-454F-A9DC-AC2B5555D137}.Release|Win32.Build.0 = Release|Win32
+		{6E233FE8-8D90-454F-A9DC-AC2B5555D137}.Release|x64.ActiveCfg = Release|x64
+		{6E233FE8-8D90-454F-A9DC-AC2B5555D137}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/Dbx_tree/dbx_tree_10.sln b/plugins/Dbx_tree/dbx_tree_10.sln
index 257764b067..575fc920d3 100644
--- a/plugins/Dbx_tree/dbx_tree_10.sln
+++ b/plugins/Dbx_tree/dbx_tree_10.sln
@@ -1,31 +1,20 @@
+
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+# Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbx_tree", "dbx_tree_10.vcxproj", "{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
 		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Debug|Win32.Build.0 = Debug|Win32
 		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Debug|x64.ActiveCfg = Debug|x64
 		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Debug|x64.Build.0 = Debug|x64
-		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Release Unicode|x64.Build.0 = Release Unicode|x64
 		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Release|Win32.ActiveCfg = Release|Win32
 		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Release|Win32.Build.0 = Release|Win32
 		{2D0BB338-FF3A-4FB5-A7A5-32B63967678C}.Release|x64.ActiveCfg = Release|x64
diff --git a/plugins/FavContacts/favcontacts.sln b/plugins/FavContacts/favcontacts.sln
index 4572aa3063..50057f23a2 100644
--- a/plugins/FavContacts/favcontacts.sln
+++ b/plugins/FavContacts/favcontacts.sln
@@ -1,17 +1,18 @@
+
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+# Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "favcontacts", "favcontacts.vcxproj", "{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Release Unicode|Win32 = Release Unicode|Win32
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
+		{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}.Debug|Win32.Build.0 = Debug|Win32
+		{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}.Release|Win32.ActiveCfg = Release|Win32
+		{2D0B4CB0-3ACA-4612-B745-FF3050E1500A}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/FingerPrintModPlus/fingerprint_vs2010.sln b/plugins/FingerPrintModPlus/fingerprint_vs2010.sln
index d71b53c959..a059e6c8fb 100644
--- a/plugins/FingerPrintModPlus/fingerprint_vs2010.sln
+++ b/plugins/FingerPrintModPlus/fingerprint_vs2010.sln
@@ -39,156 +39,156 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_Yahoo", "iconpa
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{99331043-10E4-4171-940E-D43E51B0401B}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{99331043-10E4-4171-940E-D43E51B0401B}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{99331043-10E4-4171-940E-D43E51B0401B}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{99331043-10E4-4171-940E-D43E51B0401B}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{99331043-10E4-4171-940E-D43E51B0401B}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{99331043-10E4-4171-940E-D43E51B0401B}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{99331043-10E4-4171-940E-D43E51B0401B}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{99331043-10E4-4171-940E-D43E51B0401B}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Release Unicode|x64.Build.0 = Release Unicode|x64
+		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Debug|Win32.Build.0 = Debug|Win32
+		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Debug|x64.ActiveCfg = Debug|x64
+		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Debug|x64.Build.0 = Debug|x64
+		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Release|Win32.ActiveCfg = Release|Win32
+		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Release|Win32.Build.0 = Release|Win32
+		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Release|x64.ActiveCfg = Release|x64
+		{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}.Release|x64.Build.0 = Release|x64
+		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Debug|Win32.Build.0 = Debug|Win32
+		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Debug|x64.ActiveCfg = Debug|x64
+		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Debug|x64.Build.0 = Debug|x64
+		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Release|Win32.ActiveCfg = Release|Win32
+		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Release|Win32.Build.0 = Release|Win32
+		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Release|x64.ActiveCfg = Release|x64
+		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Release|x64.Build.0 = Release|x64
+		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Debug|Win32.Build.0 = Debug|Win32
+		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Debug|x64.ActiveCfg = Debug|x64
+		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Debug|x64.Build.0 = Debug|x64
+		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Release|Win32.ActiveCfg = Release|Win32
+		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Release|Win32.Build.0 = Release|Win32
+		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Release|x64.ActiveCfg = Release|x64
+		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Release|x64.Build.0 = Release|x64
+		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Debug|Win32.Build.0 = Debug|Win32
+		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Debug|x64.ActiveCfg = Debug|x64
+		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Debug|x64.Build.0 = Debug|x64
+		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Release|Win32.ActiveCfg = Release|Win32
+		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Release|Win32.Build.0 = Release|Win32
+		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Release|x64.ActiveCfg = Release|x64
+		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Release|x64.Build.0 = Release|x64
+		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Debug|Win32.Build.0 = Debug|Win32
+		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Debug|x64.ActiveCfg = Debug|x64
+		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Debug|x64.Build.0 = Debug|x64
+		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Release|Win32.ActiveCfg = Release|Win32
+		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Release|Win32.Build.0 = Release|Win32
+		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Release|x64.ActiveCfg = Release|x64
+		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Release|x64.Build.0 = Release|x64
+		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Debug|Win32.Build.0 = Debug|Win32
+		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Debug|x64.ActiveCfg = Debug|x64
+		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Debug|x64.Build.0 = Debug|x64
+		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Release|Win32.ActiveCfg = Release|Win32
+		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Release|Win32.Build.0 = Release|Win32
+		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Release|x64.ActiveCfg = Release|x64
+		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Release|x64.Build.0 = Release|x64
+		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Debug|Win32.ActiveCfg = Debug|Win32
+		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Debug|Win32.Build.0 = Debug|Win32
+		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Debug|x64.ActiveCfg = Debug|x64
+		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Debug|x64.Build.0 = Debug|x64
+		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Release|Win32.ActiveCfg = Release|Win32
+		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Release|Win32.Build.0 = Release|Win32
+		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Release|x64.ActiveCfg = Release|x64
+		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Release|x64.Build.0 = Release|x64
+		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Debug|Win32.Build.0 = Debug|Win32
+		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Debug|x64.ActiveCfg = Debug|x64
+		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Debug|x64.Build.0 = Debug|x64
+		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Release|Win32.ActiveCfg = Release|Win32
+		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Release|Win32.Build.0 = Release|Win32
+		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Release|x64.ActiveCfg = Release|x64
+		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Release|x64.Build.0 = Release|x64
+		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Debug|Win32.Build.0 = Debug|Win32
+		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Debug|x64.ActiveCfg = Debug|x64
+		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Debug|x64.Build.0 = Debug|x64
+		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Release|Win32.ActiveCfg = Release|Win32
+		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Release|Win32.Build.0 = Release|Win32
+		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Release|x64.ActiveCfg = Release|x64
+		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Release|x64.Build.0 = Release|x64
+		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Debug|Win32.Build.0 = Debug|Win32
+		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Debug|x64.ActiveCfg = Debug|x64
+		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Debug|x64.Build.0 = Debug|x64
+		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Release|Win32.ActiveCfg = Release|Win32
+		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Release|Win32.Build.0 = Release|Win32
+		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Release|x64.ActiveCfg = Release|x64
+		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Release|x64.Build.0 = Release|x64
+		{99331043-10E4-4171-940E-D43E51B0401B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{99331043-10E4-4171-940E-D43E51B0401B}.Debug|Win32.Build.0 = Debug|Win32
+		{99331043-10E4-4171-940E-D43E51B0401B}.Debug|x64.ActiveCfg = Debug|x64
+		{99331043-10E4-4171-940E-D43E51B0401B}.Debug|x64.Build.0 = Debug|x64
+		{99331043-10E4-4171-940E-D43E51B0401B}.Release|Win32.ActiveCfg = Release|Win32
+		{99331043-10E4-4171-940E-D43E51B0401B}.Release|Win32.Build.0 = Release|Win32
+		{99331043-10E4-4171-940E-D43E51B0401B}.Release|x64.ActiveCfg = Release|x64
+		{99331043-10E4-4171-940E-D43E51B0401B}.Release|x64.Build.0 = Release|x64
+		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Debug|Win32.Build.0 = Debug|Win32
+		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Debug|x64.ActiveCfg = Debug|x64
+		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Debug|x64.Build.0 = Debug|x64
+		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Release|Win32.ActiveCfg = Release|Win32
+		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Release|Win32.Build.0 = Release|Win32
+		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Release|x64.ActiveCfg = Release|x64
+		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Release|x64.Build.0 = Release|x64
+		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Debug|Win32.Build.0 = Debug|Win32
+		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Debug|x64.ActiveCfg = Debug|x64
+		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Debug|x64.Build.0 = Debug|x64
+		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Release|Win32.ActiveCfg = Release|Win32
+		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Release|Win32.Build.0 = Release|Win32
+		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Release|x64.ActiveCfg = Release|x64
+		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Release|x64.Build.0 = Release|x64
+		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Debug|Win32.Build.0 = Debug|Win32
+		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Debug|x64.ActiveCfg = Debug|x64
+		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Debug|x64.Build.0 = Debug|x64
+		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Release|Win32.ActiveCfg = Release|Win32
+		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Release|Win32.Build.0 = Release|Win32
+		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Release|x64.ActiveCfg = Release|x64
+		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Release|x64.Build.0 = Release|x64
+		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Debug|Win32.Build.0 = Debug|Win32
+		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Debug|x64.ActiveCfg = Debug|x64
+		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Debug|x64.Build.0 = Debug|x64
+		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Release|Win32.ActiveCfg = Release|Win32
+		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Release|Win32.Build.0 = Release|Win32
+		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Release|x64.ActiveCfg = Release|x64
+		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Release|x64.Build.0 = Release|x64
+		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Debug|Win32.Build.0 = Debug|Win32
+		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Debug|x64.ActiveCfg = Debug|x64
+		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Debug|x64.Build.0 = Debug|x64
+		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Release|Win32.ActiveCfg = Release|Win32
+		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Release|Win32.Build.0 = Release|Win32
+		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Release|x64.ActiveCfg = Release|x64
+		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Release|x64.Build.0 = Release|x64
+		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Debug|Win32.Build.0 = Debug|Win32
+		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Debug|x64.ActiveCfg = Debug|x64
+		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Debug|x64.Build.0 = Debug|x64
+		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Release|Win32.ActiveCfg = Release|Win32
+		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Release|Win32.Build.0 = Release|Win32
+		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Release|x64.ActiveCfg = Release|x64
+		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Release|x64.Build.0 = Release|x64
+		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Debug|Win32.Build.0 = Debug|Win32
+		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Debug|x64.ActiveCfg = Debug|x64
+		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Debug|x64.Build.0 = Debug|x64
+		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Release|Win32.ActiveCfg = Release|Win32
+		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Release|Win32.Build.0 = Release|Win32
+		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Release|x64.ActiveCfg = Release|x64
+		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/clist_nicer/clist_nicer_10.sln b/plugins/clist_nicer/clist_nicer_10.sln
index cd7147abe8..5f2720e108 100644
--- a/plugins/clist_nicer/clist_nicer_10.sln
+++ b/plugins/clist_nicer/clist_nicer_10.sln
@@ -3,52 +3,22 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clist_nicer", "clist_nicer_10.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cln_skinedit", "skineditor\skinedit_10.vcxproj", "{987F026D-EB1F-4013-ADA8-2406ACCDA526}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.Build.0 = Debug|Win32
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.ActiveCfg = Debug|x64
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.Build.0 = Debug|x64
-		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release Unicode|x64.Build.0 = Release Unicode|x64
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|Win32.ActiveCfg = Release|Win32
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|Win32.Build.0 = Release|Win32
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|x64.ActiveCfg = Release|x64
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|x64.Build.0 = Release|x64
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug|Win32.ActiveCfg = Debug|Win32
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug|Win32.Build.0 = Debug|Win32
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug|x64.ActiveCfg = Debug|x64
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug|x64.Build.0 = Debug|x64
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Release Unicode|x64.Build.0 = Release Unicode|x64
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Release|Win32.ActiveCfg = Release|Win32
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Release|Win32.Build.0 = Release|Win32
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Release|x64.ActiveCfg = Release|x64
-		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/crshdmp/crshdmp_10.sln b/plugins/crshdmp/crshdmp_10.sln
index 4ce30692d2..f74b4a6a7e 100644
--- a/plugins/crshdmp/crshdmp_10.sln
+++ b/plugins/crshdmp/crshdmp_10.sln
@@ -5,25 +5,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crshdmp", "crshdmp_10.vcxpr
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Unicode|Win32 = Debug Unicode|Win32
-		Debug Unicode|x64 = Debug Unicode|x64
-		Release Unicode|Win32 = Release Unicode|Win32
-		Release Unicode|x64 = Release Unicode|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
-		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
-		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
-		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
-		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
-		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
-		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
-		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release Unicode|x64.Build.0 = Release Unicode|x64
+		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Debug|Win32.Build.0 = Debug|Win32
+		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Debug|x64.ActiveCfg = Debug|x64
+		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Debug|x64.Build.0 = Debug|x64
+		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|Win32.ActiveCfg = Release|Win32
+		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|Win32.Build.0 = Release|Win32
+		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|x64.ActiveCfg = Release|x64
+		{576EEEFD-E423-482B-879A-F0515D40B8E1}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		VisualSVNWorkingCopyRoot = 
-	EndGlobalSection
 EndGlobal
diff --git a/plugins/extraicons/extraicons.sln b/plugins/extraicons/extraicons.sln
new file mode 100644
index 0000000000..2a93959cce
--- /dev/null
+++ b/plugins/extraicons/extraicons.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extraicons", "extraicons.vcxproj", "{778D0DEB-C798-45D3-98E0-ABAB242573C8}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{778D0DEB-C798-45D3-98E0-ABAB242573C8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{778D0DEB-C798-45D3-98E0-ABAB242573C8}.Debug|Win32.Build.0 = Debug|Win32
+		{778D0DEB-C798-45D3-98E0-ABAB242573C8}.Debug|x64.ActiveCfg = Debug|x64
+		{778D0DEB-C798-45D3-98E0-ABAB242573C8}.Debug|x64.Build.0 = Debug|x64
+		{778D0DEB-C798-45D3-98E0-ABAB242573C8}.Release|Win32.ActiveCfg = Release|Win32
+		{778D0DEB-C798-45D3-98E0-ABAB242573C8}.Release|Win32.Build.0 = Release|Win32
+		{778D0DEB-C798-45D3-98E0-ABAB242573C8}.Release|x64.ActiveCfg = Release|x64
+		{778D0DEB-C798-45D3-98E0-ABAB242573C8}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/plugins/extraicons/extraicons.vcxproj b/plugins/extraicons/extraicons.vcxproj
index 79da658eb6..8abeaf12a2 100644
--- a/plugins/extraicons/extraicons.vcxproj
+++ b/plugins/extraicons/extraicons.vcxproj
@@ -92,7 +92,7 @@
       <Optimization>Full</Optimization>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -121,7 +121,7 @@
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Unicode_Release/extraicons.bsc</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -137,7 +137,7 @@
       <Optimization>Full</Optimization>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -165,7 +165,6 @@
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Unicode_Release/extraicons.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -180,7 +179,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -206,7 +205,7 @@
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Unicode_Debug/extraicons.bsc</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -220,7 +219,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -245,7 +244,6 @@
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Unicode_Debug/extraicons.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/plugins/extraicons/sdk/m_metacontacts.h b/plugins/extraicons/sdk/m_metacontacts.h
deleted file mode 100644
index 1da12b97fa..0000000000
--- a/plugins/extraicons/sdk/m_metacontacts.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-
-Miranda IM: the free IM client for Microsoft* Windows*
-
-Copyright � 2004 Universite Louis PASTEUR, STRASBOURG.
-Copyright � 2004 Scott Ellis (www.scottellis.com.au mail@scottellis.com.au)
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef M_METACONTACTS_H__
-#define M_METACONTACTS_H__ 1
-
-//get the handle for a contact's parent metacontact
-//wParam=(HANDLE)hSubContact
-//lParam=0
-//returns a handle to the parent metacontact, or null if this contact is not a subcontact
-#define MS_MC_GETMETACONTACT				"MetaContacts/GetMeta"
-
-//gets the handle for the default contact
-//wParam=(HANDLE)hMetaContact
-//lParam=0
-//returns a handle to the default contact, or null on failure
-#define MS_MC_GETDEFAULTCONTACT				"MetaContacts/GetDefault"
-
-//gets the contact number for the default contact
-//wParam=(HANDLE)hMetaContact
-//lParam=0
-//returns a DWORD contact number, or -1 on failure
-#define MS_MC_GETDEFAULTCONTACTNUM			"MetaContacts/GetDefaultNum"
-
-//gets the handle for the 'most online' contact
-//wParam=(HANDLE)hMetaContact
-//lParam=0
-//returns a handle to the 'most online' contact
-#define MS_MC_GETMOSTONLINECONTACT			"MetaContacts/GetMostOnline"
-
-//gets the number of subcontacts for a metacontact
-//wParam=(HANDLE)hMetaContact
-//lParam=0
-//returns a DWORD representing the number of subcontacts for the given metacontact
-#define MS_MC_GETNUMCONTACTS				"MetaContacts/GetNumContacts"
-
-//gets the handle of a subcontact, using the subcontact's number
-//wParam=(HANDLE)hMetaContact
-//lParam=(DWORD)contact number
-//returns a handle to the specified subcontact
-#define MS_MC_GETSUBCONTACT					"MetaContacts/GetSubContact"
-
-//sets the default contact, using the subcontact's contact number
-//wParam=(HANDLE)hMetaContact
-//lParam=(DWORD)contact number
-//returns 0 on success
-#define MS_MC_SETDEFAULTCONTACTNUM			"MetaContacts/SetDefault"
-
-//sets the default contact, using the subcontact's handle
-//wParam=(HANDLE)hMetaContact
-//lParam=(HANDLE)hSubcontact
-//returns 0 on success
-#define MS_MC_SETDEFAULTCONTACT				"MetaContacts/SetDefaultByHandle"
-
-//forces the metacontact to send using a specific subcontact, using the subcontact's contact number
-//wParam=(HANDLE)hMetaContact
-//lParam=(DWORD)contact number
-//returns 0 on success
-#define MS_MC_FORCESENDCONTACTNUM			"MetaContacts/ForceSendContact"
-
-//forces the metacontact to send using a specific subcontact, using the subcontact's handle
-//wParam=(HANDLE)hMetaContact
-//lParam=(HANDLE)hSubcontact
-//returns 0 on success (will fail if 'force default' is in effect)
-#define MS_MC_FORCESENDCONTACT				"MetaContacts/ForceSendContactByHandle"
-
-//'unforces' the metacontact to send using a specific subcontact
-//wParam=(HANDLE)hMetaContact
-//lParam=0
-//returns 0 on success (will fail if 'force default' is in effect)
-#define MS_MC_UNFORCESENDCONTACT			"MetaContacts/UnforceSendContact"
-
-//'forces' or 'unforces' (i.e. toggles) the metacontact to send using it's default contact
-// overrides (and clears) 'force send' above, and will even force use of offline contacts
-// will send ME_MC_FORCESEND or ME_MC_UNFORCESEND event
-//wParam=(HANDLE)hMetaContact
-//lParam=0
-//returns 1(true) or 0(false) representing new state of 'force default'
-#define MS_MC_FORCEDEFAULT					"MetaContacts/ForceSendDefault"
-
-// method to get state of 'force' for a metacontact
-// wParam=(HANDLE)hMetaContact
-// lParam= (DWORD)&contact_number or NULL
-// 
-// if lparam supplied, the contact_number of the contatct 'in force' will be copied to the address it points to,
-// or if none is in force, the value (DWORD)-1 will be copied
-// (v0.8.0.8+ returns 1 if 'force default' is true with *lParam == default contact number, else returns 0 with *lParam as above)
-#define MS_MC_GETFORCESTATE					"MetaContacts/GetForceState"
-
-// fired when a metacontact's default contact changes (fired upon creation of metacontact also, when default is initially set)
-// wParam=(HANDLE)hMetaContact
-// lParam=(HANDLE)hDefaultContact
-#define ME_MC_DEFAULTTCHANGED				"MetaContacts/DefaultChanged"
-
-// fired when a metacontact's subcontacts change (fired upon creation of metacontact, when contacts are added or removed, and when 
-//	contacts are reordered) - a signal to re-read metacontact data
-// wParam=(HANDLE)hMetaContact
-// lParam=0
-#define ME_MC_SUBCONTACTSCHANGED			"MetaContacts/SubcontactsChanged"
-
-// fired when a metacontact is forced to send using a specific subcontact
-// wParam=(HANDLE)hMetaContact
-// lParam=(HANDLE)hForceContact 
-#define ME_MC_FORCESEND						"MetaContacts/ForceSend"
-
-// fired when a metacontact is 'unforced' to send using a specific subcontact
-// wParam=(HANDLE)hMetaContact
-// lParam=0 
-#define ME_MC_UNFORCESEND					"MetaContacts/UnforceSend"
-
-// method to get protocol name - used to be sure you're dealing with a "real" metacontacts plugin :)
-// wParam=lParam=0
-#define MS_MC_GETPROTOCOLNAME				"MetaContacts/GetProtoName"
-
-
-// added 0.9.5.0 (22/3/05)
-// wParam=(HANDLE)hContact
-// lParam=0
-// convert a given contact into a metacontact
-#define MS_MC_CONVERTTOMETA					"MetaContacts/ConvertToMetacontact"
-
-// added 0.9.5.0 (22/3/05)
-// wParam=(HANDLE)hContact
-// lParam=(HANDLE)hMeta
-// add an existing contact to a metacontact
-#define MS_MC_ADDTOMETA						"MetaContacts/AddToMetacontact"
-
-// added 0.9.5.0 (22/3/05)
-// wParam=0
-// lParam=(HANDLE)hContact
-// remove a contact from a metacontact
-#define MS_MC_REMOVEFROMMETA				"MetaContacts/RemoveFromMetacontact"
-
-
-// added 0.9.13.2 (6/10/05)
-// wParam=(BOOL)disable
-// lParam=0
-// enable/disable the 'hidden group hack' - for clists that support subcontact hiding using 'IsSubcontact' setting
-// should be called once in the clist 'onmodulesloaded' event handler (which, since it's loaded after the db, will be called
-// before the metacontact onmodulesloaded handler where the subcontact hiding is usually done)
-#define MS_MC_DISABLEHIDDENGROUP			"MetaContacts/DisableHiddenGroup"
-
-#endif
diff --git a/plugins/extraicons/sdk/m_updater.h b/plugins/extraicons/sdk/m_updater.h
deleted file mode 100644
index 371b7437a0..0000000000
--- a/plugins/extraicons/sdk/m_updater.h
+++ /dev/null
@@ -1,146 +0,0 @@
-#ifndef _M_UPDATER_H
-#define _M_UPDATER_H
-
-// NOTES:
-// - For langpack updates, include a string of the following format in the langpack text file:
-//    ";FLID: <file listing name> <version>"
-//    version must be four numbers seperated by '.', in the range 0-255 inclusive
-// - Updater will disable plugins that are downloaded but were not active prior to the update (this is so that, if an archive contains e.g. ansi and 
-//    unicode versions, the correct plugin will be the only one active after the new version is installed)...so if you add a support plugin, you may need 
-//    to install an ini file to make the plugin activate when miranda restarts after the update
-// - Updater will replace all dlls that have the same internal shortName as a downloaded update dll (this is so that msn1.dll and msn2.dll, for example,
-//    will both be updated) - so if you have a unicode and a non-unicode version of a plugin in your archive, you should make the internal names different (which will break automatic 
-//    updates from the file listing if there is only one file listing entry for both versions, unless you use the 'MS_UPDATE_REGISTER' service below)
-// - Updater will install all files in the root of the archive into the plugins folder, except for langpack files that contain the FLID string which go into the root folder (same
-//    folder as miranda32.exe)...all folders in the archive will also be copied to miranda's root folder, and their contents transferred into the new folders. The only exception is a 
-//    special folder called 'root_files' - if there is a folder by that name in the archive, it's contents will also be copied into miranda's root folder - this is intended to be used 
-//    to install additional dlls etc that a plugin may require)
-
-// if you set Update.szUpdateURL to the following value when registering, as well as setting your beta site and version data,
-// Updater will ignore szVersionURL and pbVersionPrefix, and attempt to find the file listing URL's from the backend XML data.
-// for this to work, the plugin name in pluginInfo.shortName must match the file listing exactly (except for case)
-#define UPDATER_AUTOREGISTER		"UpdaterAUTOREGISTER"
-// Updater will also use the backend xml data if you provide URL's that reference the miranda file listing for updates (so you can use that method 
-// if e.g. your plugin shortName does not match the file listing) - it will grab the file listing id from the end of these URLs
-
-typedef struct Update_tag {
-  int cbSize;     
-  char *szComponentName;		// component name as it will appear in the UI (will be translated before displaying)
-
-  char *szVersionURL;			// URL where the current version can be found (NULL to disable)
-  BYTE *pbVersionPrefix;		// bytes occuring in VersionURL before the version, used to locate the version information within the URL data
-								// (note that this URL could point at a binary file - dunno why, but it could :)
-  int cpbVersionPrefix;			// number of bytes pointed to by pbVersionPrefix
-  char *szUpdateURL;			// URL where dll/zip is located
-								// set to UPDATER_AUTOREGISTER if you want Updater to find the file listing URLs (ensure plugin shortName matches file listing!)
-
-  char *szBetaVersionURL;		// URL where the beta version can be found (NULL to disable betas)
-  BYTE *pbBetaVersionPrefix;	// bytes occuring in VersionURL before the version, used to locate the version information within the URL data
-  int cpbBetaVersionPrefix;		// number of bytes pointed to by pbVersionPrefix
-  char *szBetaUpdateURL;		// URL where dll/zip is located
-
-  BYTE *pbVersion;				// bytes of current version, used for comparison with those in VersionURL
-  int cpbVersion;				// number of bytes pointed to by pbVersion
-
-  char *szBetaChangelogURL;		// url for displaying changelog for beta versions
-} Update;
-
-// register a comonent with Updater
-//
-// wparam = 0
-// lparam = (LPARAM)&Update
-#define MS_UPDATE_REGISTER      "Update/Register"
-
-// utility functions to create a version string from a DWORD or from pluginInfo
-// point buf at a buffer at least 16 chars wide - but note the version string returned may be shorter
-//
-__inline static char *CreateVersionString(DWORD version, char *buf) {
-	mir_snprintf(buf, 16, "%d.%d.%d.%d", (version >> 24) & 0xFF, (version >> 16) & 0xFF, (version >> 8) & 0xFF, version & 0xFF);
-	return buf;
-}
-
-__inline static char *CreateVersionStringPlugin(PLUGININFO *pluginInfo, char *buf) {
-	return CreateVersionString(pluginInfo->version, buf);
-}
-
-
-// register the 'easy' way - use this method if you have no beta URL and the plugin is on the miranda file listing
-// NOTE: the plugin version string on the file listing must be the string version of the version in pluginInfo (i.e. 0.0.0.1,
-// four numbers between 0 and 255 inclusivem, so no letters, brackets, etc.)
-//
-// wParam = (int)fileID				- this is the file ID from the file listing (i.e. the number at the end of the download link)
-// lParam = (PLUGININFO*)&pluginInfo
-#define MS_UPDATE_REGISTERFL	"Update/RegisterFL"
-
-// this function can be used to 'unregister' components - useful for plugins that register non-plugin/langpack components and
-// may need to change those components on the fly
-// lParam = (char *)szComponentName
-#define MS_UPDATE_UNREGISTER	"Update/Unregister"
-
-// this event is fired when the startup process is complete, but NOT if a restart is imminent
-// it is designed for status managment plugins to use as a trigger for beggining their own startup process
-// wParam = lParam = 0 (unused)
-// (added in version 0.1.6.0)
-#define ME_UPDATE_STARTUPDONE	"Update/StartupDone"
-
-// this service can be used to enable/disable Updater's global status control
-// it can be called from the StartupDone event handler
-// wParam = (BOOL)enable
-// lParam = 0
-// (added in version 0.1.6.0)
-#define MS_UPDATE_ENABLESTATUSCONTROL	"Update/EnableStatusControl"
-
-// An description of usage of the above service and event:
-// Say you are a status control plugin that normally sets protocol or global statuses in your ModulesLoaded event handler.
-// In order to make yourself 'Updater compatible', you would move the status control code from ModulesLoaded to another function, 
-// say DoStartup. Then, in ModulesLoaded you would check for the existence of the MS_UPDATE_ENABLESTATUSCONTROL service.
-// If it does not exist, call DoStartup. If it does exist, hook the ME_UPDATE_STARTUPDONE event and call DoStartup from there. You may
-// also wish to call MS_UPDATE_ENABLESTATUSCONTROL with wParam == FALSE at this time, to disable Updater's own status control feature.
-
-// this service can be used to determine whether updates are possible for a component with the given name
-// wParam = 0
-// lParam = (char *)szComponentName
-// returns TRUE if updates are supported, FALSE otherwise
-#define MS_UPDATE_ISUPDATESUPPORTED		"Update/IsUpdateSupported"
-
-#endif
-
-
-/////////////// Usage Example ///////////////
-
-#ifdef EXAMPLE_CODE
-
-// you need to #include "m_updater.h" and HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded) in your Load function...
-
-int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {
-
-	Update update = {0}; // for c you'd use memset or ZeroMemory...
-	char szVersion[16];
-
-	update.cbSize = sizeof(Update);
-
-	update.szComponentName = pluginInfo.shortName;
-	update.pbVersion = (BYTE *)CreateVersionString(&pluginInfo, szVersion);
-	update.cpbVersion = strlen((char *)update.pbVersion);
-
-	// these are the three lines that matter - the archive, the page containing the version string, and the text (or data) 
-	// before the version that we use to locate it on the page
-	// (note that if the update URL and the version URL point to standard file listing entries, the backend xml
-	// data will be used to check for updates rather than the actual web page - this is not true for beta urls)
-	update.szUpdateURL = "http://scottellis.com.au:81/test/updater.zip";
-	update.szVersionURL = "http://scottellis.com.au:81/test/updater_test.html";
-	update.pbVersionPrefix = (BYTE *)"Updater version ";
-	
-	update.cpbVersionPrefix = strlen((char *)update.pbVersionPrefix);
-
-	// do the same for the beta versions of the above struct members if you wish to allow beta updates from another URL
-
-	CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
-
-	// Alternatively, to register a plugin with e.g. file ID 2254 on the file listing...
-	// CallService(MS_UPDATE_REGISTERFL, (WPARAM)2254, (LPARAM)&pluginInfo);
-
-	return 0;
-}
-
-#endif
diff --git a/plugins/xml/commonheaders.h b/plugins/xml/commonheaders.h
deleted file mode 100644
index d6e5ecb1b5..0000000000
--- a/plugins/xml/commonheaders.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#if !defined( _UNICODE ) && defined( UNICODE )
-	#define _UNICODE
-#endif
-
-#include <tchar.h>
-
-#include <windows.h>
-
-#include <stdio.h>
-
-#include <newpluginapi.h>
-#include <m_langpack.h>
-#include <m_utils.h>
-#include <m_xml.h>
-
-
diff --git a/plugins/xml/pack.cmd b/plugins/xml/pack.cmd
deleted file mode 100644
index c2eef97cc6..0000000000
--- a/plugins/xml/pack.cmd
+++ /dev/null
@@ -1,24 +0,0 @@
-rem @echo off
-nmake -f xml.mak CFG="xml - Win32 Release"
-if errorlevel 1 (
-   echo "Make failed"
-   goto :eof )
-nmake -f xml.mak CFG="xml - Win32 Release Unicode"
-if errorlevel 1 (
-   echo "Make failed"
-   goto :eof )
-
-del "%temp%\xml.zip" > nul
-del "%temp%\xmlW.zip" > nul
-del "%temp%\xmlSrc.zip" > nul
-del *.user > nul
-
-7z.exe a -tzip -r- -mx=9 "%temp%\xml.zip" ./Release/xml.dll
-7z.exe a -tzip -r- -mx=9 "%temp%\xmlW.zip" ./Release_Unicode/xml.dll
-
-rd /S /Q Release
-rd /S /Q Release_Unicode
-
-cd ..
-7z.exe a -tzip -r0 -mx=9 "%temp%\xmlSrc.zip" -ir!xml/*.* -xr!.svn -x!*.cmd
-goto :eof
-\ No newline at end of file
diff --git a/plugins/xml/resource.h b/plugins/xml/resource.h
deleted file mode 100644
index 8a1bd3c6fb..0000000000
--- a/plugins/xml/resource.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
-//
-#define IDI_XML                         102
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1041
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/plugins/xml/resource.rc b/plugins/xml/resource.rc
deleted file mode 100644
index 419e5db6f5..0000000000
--- a/plugins/xml/resource.rc
+++ /dev/null
@@ -1,124 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral (Default) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Neutral (Default) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (Belgium) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRB)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,0,0
- PRODUCTVERSION 0,1,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000004b0"
-        BEGIN
-            VALUE "Comments", "Standard engine for xml parsing & creation"
-            VALUE "CompanyName", "Miranda community"
-            VALUE "FileDescription", "xml plugin for Miranda-IM"
-            VALUE "FileVersion", "0, 1, 0, 0"
-            VALUE "InternalName", "xml"
-            VALUE "LegalCopyright", "Copyright � 2008 George Hazan"
-            VALUE "OriginalFilename", "xml.dll"
-            VALUE "ProductName", "xml"
-            VALUE "ProductVersion", "0, 1, 0, 0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_XML              ICON                    "xml.ico"
-#endif    // French (Belgium) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/plugins/xml/xml.cpp b/plugins/xml/xml.cpp
deleted file mode 100644
index ed4e49bf19..0000000000
--- a/plugins/xml/xml.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-
-#include "commonheaders.h"
-#include "resource.h"
-
-#if defined( _UNICODE )
-	// {4AECBC63-49B9-40da-9212-FF5EBC85360E}
-	#define MIID_XML { 0x4aecbc63, 0x49b9, 0x40da, { 0x92, 0x12, 0xff, 0x5e, 0xbc, 0x85, 0x36, 0xe }}
-#else
-	// {6E2C9F7C-5F3F-4dd3-A999-ED64B70BFC79}
-	#define MIID_XML { 0x6e2c9f7c, 0x5f3f, 0x4dd3, { 0xa9, 0x99, 0xed, 0x64, 0xb7, 0xb, 0xfc, 0x79 }}
-#endif
-
-PLUGINLINK *pluginLink;
-HINSTANCE hInst;
-
-void InitXmlApi( void );
-
-PLUGININFO pluginInfo = {
-	sizeof(PLUGININFO),
-	"Core XML driver for Miranda version earlier than 0.8",
-	PLUGIN_MAKE_VERSION(0,1,0,0),
-	"Provides XML parsing & creation services",
-	"George Hazan",
-	"ghazan@miranda.im",
-	"� 2008 George Hazan",
-	"http://www.miranda-im.org",
-	UNICODE_AWARE,
-	0
-};
-
-PLUGININFOEX pluginInfoEx = {
-	sizeof(PLUGININFOEX),
-	"Core XML driver for Miranda version earlier than 0.8",
-	PLUGIN_MAKE_VERSION(0,1,0,0),
-	"Provides XML parsing & creation services",
-	"George Hazan",
-	"ghazan@miranda.im",
-	"� 2008 George Hazan",
-	"http://www.miranda-im.org",
-	UNICODE_AWARE,
-	0,
-	MIID_XML
-};
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
-{
-	hInst = hinstDLL;
-	return TRUE;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// MirandaPluginInfoEx - returns an information about a plugin
-
-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
-{
-	if (mirandaVersion >= PLUGIN_MAKE_VERSION(0, 8, 0, 0))
-		return NULL;
-
-	return &pluginInfoEx;
-}
-
-extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)
-{
-	if (mirandaVersion >= PLUGIN_MAKE_VERSION(0, 8, 0, 0))
-		return NULL;
-
-	return &pluginInfo;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// MirandaPluginInterfaces - returns the protocol interface to the core
-
-static const MUUID interfaces[] = { MIID_XML, MIID_LAST };
-
-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
-{
-	return interfaces;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// Performs a primary set of actions upon plugin loading
-
-extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
-{
-	pluginLink = link;
-
-	InitXmlApi();
-	return 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// Unload a plugin
-
-extern "C" int __declspec(dllexport) Unload(void)
-{
-	return 0;
-}
diff --git a/plugins/xml/xml.ico b/plugins/xml/xml.ico
deleted file mode 100644
index 08c8a234fe..0000000000
--- a/plugins/xml/xml.ico
+++ /dev/null
diff --git a/plugins/xml/xml.vcproj b/plugins/xml/xml.vcproj
deleted file mode 100644
index 09642b2fc9..0000000000
--- a/plugins/xml/xml.vcproj
+++ /dev/null
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="xml"
-	ProjectGUID="{8190CFAA-3B73-43D8-9101-8368E21F1864}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;xml_EXPORTS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="commonheaders.h"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib gdiplus.lib version.lib Rpcrt4.lib"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/xml.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2060"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="FALSE"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;xml_EXPORTS"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="commonheaders.h"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="vc7to6.lib comctl32.lib gdiplus.lib version.lib Rpcrt4.lib"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../lib"
-				IgnoreAllDefaultLibraries="TRUE"
-				DelayLoadDLLs=""
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/xml.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2060"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug Unicode|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;xml_EXPORTS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="commonheaders.h"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="TRUE"
-				AdditionalDependencies="comctl32.lib gdiplus.lib version.lib Rpcrt4.lib"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/xml.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2060"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release Unicode|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="1"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				GlobalOptimizations="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="FALSE"
-				OptimizeForProcessor="0"
-				AdditionalIncludeDirectories="../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;xml_EXPORTS"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="commonheaders.h"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="TRUE"
-				AdditionalDependencies="vc7to6.lib comctl32.lib gdiplus.lib version.lib Rpcrt4.lib"
-				AdditionalLibraryDirectories="../../lib"
-				IgnoreAllDefaultLibraries="TRUE"
-				DelayLoadDLLs=""
-				GenerateDebugInformation="TRUE"
-				GenerateMapFile="TRUE"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/xml.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2060"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath=".\xml.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\modules\xml\xmlApi.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\modules\xml\xmlParser.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath=".\commonheaders.h">
-			</File>
-			<File
-				RelativePath="..\..\src\modules\xml\xmlParser.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-			<File
-				RelativePath="resource.rc">
-			</File>
-			<File
-				RelativePath=".\xml.ico">
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ChangeLog.txt">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>