diff --git a/Application/Application.vcproj b/Application/Application.vcproj
index d11e0873..192d556d 100644
--- a/Application/Application.vcproj
+++ b/Application/Application.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="Application"
 	ProjectGUID="{D2A0903C-E760-4134-AE61-3D55BF8F760C}"
 	TargetFrameworkVersion="0"
@@ -321,7 +321,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/Application.tlb"
+				TypeLibraryName=".\x64/Debug/Application.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -331,10 +331,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/Application.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/Application.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -352,7 +352,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../TestBench/x32/Debug/Rainmeter.exe"
+				OutputFile="../TestBench/x64/Debug/Rainmeter.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
@@ -381,7 +381,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\testbench\x32\debug\skins (mkdir ..\testbench\x32\debug\skins)&#x0D;&#x0A;xcopy /S /Y ..\Install\Skins ..\testbench\x32\debug\skins&#x0D;&#x0A;"
+				CommandLine="if not exist ..\testbench\x64\debug\skins (mkdir ..\testbench\x64\debug\skins)&#x0D;&#x0A;if not exist ..\testbench\x64\debug\themes (mkdir ..\testbench\x64\debug\themes)&#x0D;&#x0A;echo &quot;Copying the skins...&quot;&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Skins ..\testbench\x64\debug\skins&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Themes ..\testbench\x64\debug\themes&#x0D;&#x0A;xcopy /Q /S /Y ..\Install\Default.ini ..\testbench\x64\debug\"
 			/>
 		</Configuration>
 		<Configuration
diff --git a/Library/Library.vcproj b/Library/Library.vcproj
index 1a58d784..1185be86 100644
--- a/Library/Library.vcproj
+++ b/Library/Library.vcproj
@@ -136,7 +136,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/Library.tlb"
+				TypeLibraryName=".\x64/Debug/Library.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -147,10 +147,10 @@
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/Library.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/Library.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -169,12 +169,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib Wininet.lib Winmm.lib gdiplus.lib Iphlpapi.lib shlwapi.lib odbc32.lib odbccp32.lib"
-				OutputFile="../TestBench/x32/Debug/Rainmeter.dll"
+				OutputFile="../TestBench/x64/Debug/Rainmeter.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/Rainmeter.pdb"
-				ImportLibrary=".\x32/Debug/Rainmeter.lib"
+				ProgramDatabaseFile=".\x64/Debug/Rainmeter.pdb"
+				ImportLibrary=".\x64/Debug/Rainmeter.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp
index c95a1dbc..4bd64cb3 100644
--- a/Library/Rainmeter.cpp
+++ b/Library/Rainmeter.cpp
@@ -1688,8 +1688,8 @@ void CRainmeter::CheckSkinVersions()
 								// Upgrade the skin
 								CSystem::CopyFiles(strMainSkinsPath + menu[i].name, m_SkinPath);
 
-								// TODO: Temporary 'fix': If this was Enigma upgrade the themes too
-								if (menu[i].name == L"Enigma" || menu[i].name == L"Gnometer")
+								// TODO: Temporary 'fix': If skin was Illustro upgrade the themes too
+								if (menu[i].name == L"Illustro")
 								{
 									std::wstring strMainThemes = m_Path + L"Themes";
 									std::wstring strCurrentThemes = GetSettingsPath();
@@ -1769,8 +1769,8 @@ int CRainmeter::CompareVersions(std::wstring strA, std::wstring strB)
 /* 
 ** CreateDefaultConfigFile
 **
-** Creates the default Rainmeter.ini file. Gnometer\Bars and Gnometer\Clock configs
-** are enabled.
+** Creates the default Rainmeter.ini file.
+** Illustro\System is enabled.
 **
 */
 void CRainmeter::CreateDefaultConfigFile(std::wstring strFile)
@@ -1789,7 +1789,7 @@ void CRainmeter::CreateDefaultConfigFile(std::wstring strFile)
 		std::ofstream out(strFile.c_str(), std::ios::out);
 		if (out) 
 		{
-			out << std::string("[Rainmeter]\n\n[Gnometer\\Bars]\nActive=1\n\n[Gnometer\\Clock]\nActive=1\n");
+			out << std::string("[Rainmeter]\n\n[Illustro\\System]\nActive=1\n");
 			out.close();
 		}
 	}
diff --git a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcproj b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcproj
index c5d07135..d4d730a6 100644
--- a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcproj
+++ b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcproj
@@ -500,7 +500,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginAdvancedCPU.tlb"
+				TypeLibraryName=".\x64/Debug/PluginAdvancedCPU.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -510,10 +510,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginAdvancedCPU.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginAdvancedCPU.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -531,12 +531,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../TestBench/x32/Debug/Plugins/AdvancedCPU.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/AdvancedCPU.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/AdvancedCPU.pdb"
-				ImportLibrary=".\x32/Debug/AdvancedCPU.lib"
+				ProgramDatabaseFile=".\x64/Debug/AdvancedCPU.pdb"
+				ImportLibrary=".\x64/Debug/AdvancedCPU.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginExample/PluginExample.vcproj b/Plugins/PluginExample/PluginExample.vcproj
index 4ea9c367..081ccf70 100644
--- a/Plugins/PluginExample/PluginExample.vcproj
+++ b/Plugins/PluginExample/PluginExample.vcproj
@@ -316,7 +316,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginExample.tlb"
+				TypeLibraryName=".\x64/Debug/PluginExample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -326,10 +326,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginExample.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginExample.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -347,12 +347,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../TestBench/x32/Debug/Plugins/ExamplePlugin.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/ExamplePlugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/ExamplePlugin.pdb"
-				ImportLibrary=".\x32/Debug/ExamplePlugin.lib"
+				ProgramDatabaseFile=".\x64/Debug/ExamplePlugin.pdb"
+				ImportLibrary=".\x64/Debug/ExamplePlugin.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginMediaKey/PluginMediaKey.vcproj b/Plugins/PluginMediaKey/PluginMediaKey.vcproj
index 327120ca..909698b3 100644
--- a/Plugins/PluginMediaKey/PluginMediaKey.vcproj
+++ b/Plugins/PluginMediaKey/PluginMediaKey.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="PluginMediaKey"
 	ProjectGUID="{EB48A04A-657E-41B8-B2F5-D47F8C30B2B4}"
 	RootNamespace="PluginMediaKey"
@@ -46,7 +46,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\x32/Debug/PluginWindowMessage.tlb"
+				TypeLibraryName=".\x32/Debug/MediaKey.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -77,11 +77,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Rainmeter.lib"
 				OutputFile="../../TestBench/x32/Debug/Plugins/MediaKey.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../Library/x32/Debug"
+				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\x32/Debug/MediaKey.pdb"
 				ImportLibrary=".\x32/Debug/MediaKey.lib"
@@ -137,20 +136,20 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginWindowMessage.tlb"
+				TypeLibraryName=".\x64/Debug/MediaKey.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;UNICODE;_USRDLL;PluginWindowMessage_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;UNICODE;_USRDLL;MediaKey_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginWindowMessage.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/MediaKey.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -168,12 +167,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../TestBench/x32/Debug/Plugins/WindowMessagePlugin.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/WindowMessagePlugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/WindowMessagePlugin.pdb"
-				ImportLibrary=".\x32/Debug/WindowMessagePlugin.lib"
+				ProgramDatabaseFile=".\x64/Debug/WindowMessagePlugin.pdb"
+				ImportLibrary=".\x64/Debug/WindowMessagePlugin.lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -226,7 +225,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\x64/Release/PluginWindowMessage.tlb"
+				TypeLibraryName=".\x64/Release/MediaKey.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -234,11 +233,11 @@
 				AdditionalOptions="/GL /EHsc /GA "
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;UNICODE;_USRDLL;PluginWindowMessage_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;UNICODE;_USRDLL;MediaKey_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\x64/Release/PluginWindowMessage.pch"
+				PrecompiledHeaderFile=".\x64/Release/MediaKey.pch"
 				AssemblerListingLocation=".\x64/Release/"
 				ObjectFile=".\x64/Release/"
 				ProgramDataBaseFileName=".\x64/Release/"
@@ -316,7 +315,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x64/Release/PluginWindowMessage.tlb"
+				TypeLibraryName=".\x64/Release/MediaKey.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -328,7 +327,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\x64/Release/PluginWindowMessage.pch"
+				PrecompiledHeaderFile=".\x64/Release/MediaKey.pch"
 				AssemblerListingLocation=".\x64/Release/"
 				ObjectFile=".\x64/Release/"
 				ProgramDataBaseFileName=".\x64/Release/"
@@ -410,7 +409,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\x32/Release/PluginWindowMessage.tlb"
+				TypeLibraryName=".\x32/Release/MediaKey.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -503,19 +502,19 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Release/PluginWindowMessage.tlb"
+				TypeLibraryName=".\x32/Release/MediaKey.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;UNICODE;_USRDLL;PluginWindowMessage_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;UNICODE;_USRDLL;MediaKey_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Release/PluginWindowMessage.pch"
+				PrecompiledHeaderFile=".\x32/Release/MediaKey.pch"
 				AssemblerListingLocation=".\x32/Release/"
 				ObjectFile=".\x32/Release/"
 				ProgramDataBaseFileName=".\x32/Release/"
@@ -577,7 +576,7 @@
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="0"
-					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWindowMessage_EXPORTS;$(NoInherit)"
+					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;MediaKey_EXPORTS;$(NoInherit)"
 					BasicRuntimeChecks="3"
 				/>
 			</FileConfiguration>
@@ -587,7 +586,7 @@
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="0"
-					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWindowMessage_EXPORTS;$(NoInherit)"
+					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;MediaKey_EXPORTS;$(NoInherit)"
 					BasicRuntimeChecks="3"
 				/>
 			</FileConfiguration>
@@ -597,7 +596,7 @@
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="2"
-					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWindowMessage_EXPORTS;$(NoInherit)"
+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;MediaKey_EXPORTS;$(NoInherit)"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -606,7 +605,7 @@
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="2"
-					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWindowMessage_EXPORTS;$(NoInherit)"
+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;MediaKey_EXPORTS;$(NoInherit)"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -615,7 +614,7 @@
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="2"
-					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWindowMessage_EXPORTS;$(NoInherit)"
+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;MediaKey_EXPORTS;$(NoInherit)"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -624,7 +623,7 @@
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="2"
-					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;PluginWindowMessage_EXPORTS;$(NoInherit)"
+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;MediaKey_EXPORTS;$(NoInherit)"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/Plugins/PluginPerfMon/PluginPerfMon.vcproj b/Plugins/PluginPerfMon/PluginPerfMon.vcproj
index db5cc33f..95ecfa32 100644
--- a/Plugins/PluginPerfMon/PluginPerfMon.vcproj
+++ b/Plugins/PluginPerfMon/PluginPerfMon.vcproj
@@ -317,7 +317,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginPerfMon.tlb"
+				TypeLibraryName=".\x64/Debug/PluginPerfMon.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -327,10 +327,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginPerfMon.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginPerfMon.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -348,12 +348,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../TestBench/x32/Debug/Plugins/PerfMon.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/PerfMon.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/PerfMon.pdb"
-				ImportLibrary=".\x32/Debug/PerfMon.lib"
+				ProgramDatabaseFile=".\x64/Debug/PerfMon.pdb"
+				ImportLibrary=".\x64/Debug/PerfMon.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginPing/PluginPing.vcproj b/Plugins/PluginPing/PluginPing.vcproj
index 5e77c9f2..40b2edc2 100644
--- a/Plugins/PluginPing/PluginPing.vcproj
+++ b/Plugins/PluginPing/PluginPing.vcproj
@@ -318,7 +318,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginPing.tlb"
+				TypeLibraryName=".\x64/Debug/PluginPing.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -328,10 +328,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginPing.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginPing.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -350,12 +350,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Ws2_32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../../TestBench/x32/Debug/Plugins/PingPlugin.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/PingPlugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/PingPlugin.pdb"
-				ImportLibrary=".\x32/Debug/PingPlugin.lib"
+				ProgramDatabaseFile=".\x64/Debug/PingPlugin.pdb"
+				ImportLibrary=".\x64/Debug/PingPlugin.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginPower/PluginPower.vcproj b/Plugins/PluginPower/PluginPower.vcproj
index 70d7d1b4..a3f123d2 100644
--- a/Plugins/PluginPower/PluginPower.vcproj
+++ b/Plugins/PluginPower/PluginPower.vcproj
@@ -134,7 +134,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginPower.tlb"
+				TypeLibraryName=".\x64/Debug/PluginPower.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -144,10 +144,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginPower.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginPower.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -165,12 +165,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../TestBench/x32/Debug/Plugins/PowerPlugin.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/PowerPlugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/PowerPlugin.pdb"
-				ImportLibrary=".\x32/Debug/PowerPlugin.lib"
+				ProgramDatabaseFile=".\x64/Debug/PowerPlugin.pdb"
+				ImportLibrary=".\x64/Debug/PowerPlugin.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginQuote/PluginQuote.vcproj b/Plugins/PluginQuote/PluginQuote.vcproj
index d1298da5..363401be 100644
--- a/Plugins/PluginQuote/PluginQuote.vcproj
+++ b/Plugins/PluginQuote/PluginQuote.vcproj
@@ -501,7 +501,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginQuote.tlb"
+				TypeLibraryName=".\x64/Debug/PluginQuote.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -511,10 +511,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginQuote.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginQuote.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -533,12 +533,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
-				OutputFile="../../TestBench/x32/Debug/Plugins/QuotePlugin.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/QuotePlugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/QuotePlugin.pdb"
-				ImportLibrary=".\x32/Debug/QuotePlugin.lib"
+				ProgramDatabaseFile=".\x64/Debug/QuotePlugin.pdb"
+				ImportLibrary=".\x64/Debug/QuotePlugin.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginRecycleManager/PluginRecycleManager.vcproj b/Plugins/PluginRecycleManager/PluginRecycleManager.vcproj
index afb1c444..1f4f1642 100644
--- a/Plugins/PluginRecycleManager/PluginRecycleManager.vcproj
+++ b/Plugins/PluginRecycleManager/PluginRecycleManager.vcproj
@@ -511,7 +511,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginRecycleManager.tlb"
+				TypeLibraryName=".\x64/Debug/PluginRecycleManager.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -521,10 +521,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginRecycleManager.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginRecycleManager.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -543,14 +543,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../TestBench/x32/Debug/Plugins/RecycleManager.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/RecycleManager.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/RecycleManager.pdb"
+				ProgramDatabaseFile=".\x64/Debug/RecycleManager.pdb"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary=".\x32/Debug/RecycleManager.lib"
+				ImportLibrary=".\x64/Debug/RecycleManager.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginResMon/PluginResMon.vcproj b/Plugins/PluginResMon/PluginResMon.vcproj
index 6f6486df..708c4c84 100644
--- a/Plugins/PluginResMon/PluginResMon.vcproj
+++ b/Plugins/PluginResMon/PluginResMon.vcproj
@@ -501,7 +501,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginResMon.tlb"
+				TypeLibraryName=".\x64/Debug/PluginResMon.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -511,10 +511,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginResMon.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginResMon.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -533,12 +533,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Psapi.lib odbc32.lib odbccp32.lib"
-				OutputFile="../../TestBench/x32/Debug/Plugins/ResMon.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/ResMon.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/ResMon.pdb"
-				ImportLibrary=".\x32/Debug/ResMon.lib"
+				ProgramDatabaseFile=".\x64/Debug/ResMon.pdb"
+				ImportLibrary=".\x64/Debug/ResMon.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginSpeedFan/PluginSpeedFan.vcproj b/Plugins/PluginSpeedFan/PluginSpeedFan.vcproj
index 52ddf18c..51e9ed35 100644
--- a/Plugins/PluginSpeedFan/PluginSpeedFan.vcproj
+++ b/Plugins/PluginSpeedFan/PluginSpeedFan.vcproj
@@ -316,7 +316,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginSpeedFan.tlb"
+				TypeLibraryName=".\x64/Debug/PluginSpeedFan.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -326,10 +326,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginSpeedFan.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginSpeedFan.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -347,12 +347,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../TestBench/x32/Debug/Plugins/SpeedFanPlugin.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/SpeedFanPlugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/SpeedFanPlugin.pdb"
-				ImportLibrary=".\x32/Debug/SpeedFanPlugin.lib"
+				ProgramDatabaseFile=".\x64/Debug/SpeedFanPlugin.pdb"
+				ImportLibrary=".\x64/Debug/SpeedFanPlugin.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginSysInfo/PluginSysInfo.vcproj b/Plugins/PluginSysInfo/PluginSysInfo.vcproj
index 332a30bf..cce1d673 100644
--- a/Plugins/PluginSysInfo/PluginSysInfo.vcproj
+++ b/Plugins/PluginSysInfo/PluginSysInfo.vcproj
@@ -318,7 +318,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginSysInfo.tlb"
+				TypeLibraryName=".\x64/Debug/PluginSysInfo.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -328,10 +328,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginSysInfo.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginSysInfo.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -350,12 +350,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Rasapi32.lib Iphlpapi.lib odbc32.lib odbccp32.lib"
-				OutputFile="../../TestBench/x32/Debug/Plugins/SysInfo.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/SysInfo.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/SysInfo.pdb"
-				ImportLibrary=".\x32/Debug/SysInfo.lib"
+				ProgramDatabaseFile=".\x64/Debug/SysInfo.pdb"
+				ImportLibrary=".\x64/Debug/SysInfo.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcproj b/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcproj
index 7b3fade2..8ede96d6 100644
--- a/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcproj
+++ b/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcproj
@@ -316,7 +316,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginVirtualDesktops.tlb"
+				TypeLibraryName=".\x64/Debug/PluginVirtualDesktops.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -326,10 +326,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginVirtualDesktops.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginVirtualDesktops.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -347,12 +347,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../TestBench/x32/Debug/Plugins/VirtualDesktops.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/VirtualDesktops.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/VirtualDesktops.pdb"
-				ImportLibrary=".\x32/Debug/VirtualDesktops.lib"
+				ProgramDatabaseFile=".\x64/Debug/VirtualDesktops.pdb"
+				ImportLibrary=".\x64/Debug/VirtualDesktops.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginWebParser/PluginWebParser.vcproj b/Plugins/PluginWebParser/PluginWebParser.vcproj
index 61389b3b..60abcb68 100644
--- a/Plugins/PluginWebParser/PluginWebParser.vcproj
+++ b/Plugins/PluginWebParser/PluginWebParser.vcproj
@@ -135,7 +135,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginWebParser.tlb"
+				TypeLibraryName=".\x64/Debug/PluginWebParser.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -145,10 +145,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginWebParser.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginWebParser.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -167,12 +167,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Urlmon.lib Wininet.lib Shlwapi.lib odbc32.lib odbccp32.lib"
-				OutputFile="../../TestBench/x32/Debug/Plugins/WebParser.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/WebParser.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/WebParser.pdb"
-				ImportLibrary=".\x32/Debug/WebParser.lib"
+				ProgramDatabaseFile=".\x64/Debug/WebParser.pdb"
+				ImportLibrary=".\x64/Debug/WebParser.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginWifiStatus/PluginWifiStatus.vcproj b/Plugins/PluginWifiStatus/PluginWifiStatus.vcproj
index 1adfca55..03224286 100644
--- a/Plugins/PluginWifiStatus/PluginWifiStatus.vcproj
+++ b/Plugins/PluginWifiStatus/PluginWifiStatus.vcproj
@@ -228,10 +228,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginWifiStatus.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginWifiStatus.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -247,14 +247,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../../TestBench/x32/Debug/Plugins/WifiStatus.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/WifiStatus.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/WifiStatus.pdb"
+				ProgramDatabaseFile=".\x64/Debug/WifiStatus.pdb"
 				SubSystem="0"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary=".\x32/Debug/WifiStatus.lib"
+				ImportLibrary=".\x64/Debug/WifiStatus.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginWin7Audio/PluginWin7Audio.vcproj b/Plugins/PluginWin7Audio/PluginWin7Audio.vcproj
index 5034189d..193e847b 100644
--- a/Plugins/PluginWin7Audio/PluginWin7Audio.vcproj
+++ b/Plugins/PluginWin7Audio/PluginWin7Audio.vcproj
@@ -137,7 +137,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginWindowMessage.tlb"
+				TypeLibraryName=".\x64/Debug/PluginWindowMessage.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -147,10 +147,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginWindowMessage.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginWindowMessage.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -168,12 +168,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../TestBench/x32/Debug/Plugins/WindowMessagePlugin.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/Win7AudioPlugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/WindowMessagePlugin.pdb"
-				ImportLibrary=".\x32/Debug/WindowMessagePlugin.lib"
+				ProgramDatabaseFile=".\x64/Debug/Win7AudioPlugin.pdb"
+				ImportLibrary=".\x64/Debug/Win7AudioPlugin.lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -260,11 +260,11 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/machine:AMD64 /LTCG "
 				AdditionalDependencies="bufferoverflowU.lib odbc32.lib odbccp32.lib"
-				OutputFile="../../TestBench/x64/Release/Plugins/WindowMessagePlugin.dll"
+				OutputFile="../../TestBench/x64/Release/Plugins/Win7AudioPlugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\x64/Release/WindowMessagePlugin.pdb"
-				ImportLibrary=".\x64/Release/WindowMessagePlugin.lib"
+				ProgramDatabaseFile=".\x64/Release/Win7AudioPlugin.pdb"
+				ImportLibrary=".\x64/Release/Win7AudioPlugin.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -535,11 +535,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../TestBench/x32/Release/Plugins/WindowMessagePlugin.dll"
+				OutputFile="../../TestBench/x32/Release/Plugins/Win7AudioPlugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\x32/Release/WindowMessagePlugin.pdb"
-				ImportLibrary=".\x32/Release/WindowMessagePlugin.lib"
+				ProgramDatabaseFile=".\x32/Release/Win7AudioPlugin.pdb"
+				ImportLibrary=".\x32/Release/Win7AudioPlugin.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginWindowMessage/PluginWindowMessage.vcproj b/Plugins/PluginWindowMessage/PluginWindowMessage.vcproj
index 33e26a29..f0b4a880 100644
--- a/Plugins/PluginWindowMessage/PluginWindowMessage.vcproj
+++ b/Plugins/PluginWindowMessage/PluginWindowMessage.vcproj
@@ -134,7 +134,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginWindowMessage.tlb"
+				TypeLibraryName=".\x64/Debug/PluginWindowMessage.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -144,10 +144,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginWindowMessage.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginWindowMessage.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -165,12 +165,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../TestBench/x32/Debug/Plugins/WindowMessagePlugin.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/WindowMessagePlugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/WindowMessagePlugin.pdb"
-				ImportLibrary=".\x32/Debug/WindowMessagePlugin.lib"
+				ProgramDatabaseFile=".\x64/Debug/WindowMessagePlugin.pdb"
+				ImportLibrary=".\x64/Debug/WindowMessagePlugin.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Plugins/PluginiTunes/PluginiTunes.vcproj b/Plugins/PluginiTunes/PluginiTunes.vcproj
index b4c2141e..59fdec0f 100644
--- a/Plugins/PluginiTunes/PluginiTunes.vcproj
+++ b/Plugins/PluginiTunes/PluginiTunes.vcproj
@@ -320,7 +320,7 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\x32/Debug/PluginiTunes.tlb"
+				TypeLibraryName=".\x64/Debug/PluginiTunes.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -331,10 +331,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\x32/Debug/PluginiTunes.pch"
-				AssemblerListingLocation=".\x32/Debug/"
-				ObjectFile=".\x32/Debug/"
-				ProgramDataBaseFileName=".\x32/Debug/"
+				PrecompiledHeaderFile=".\x64/Debug/PluginiTunes.pch"
+				AssemblerListingLocation=".\x64/Debug/"
+				ObjectFile=".\x64/Debug/"
+				ProgramDataBaseFileName=".\x64/Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -352,12 +352,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../../TestBench/x32/Debug/Plugins/iTunesPlugin.dll"
+				OutputFile="../../TestBench/x64/Debug/Plugins/iTunesPlugin.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\x32/Debug/iTunesPlugin.pdb"
-				ImportLibrary=".\x32/Debug/iTunesPlugin.lib"
+				ProgramDatabaseFile=".\x64/Debug/iTunesPlugin.pdb"
+				ImportLibrary=".\x64/Debug/iTunesPlugin.lib"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/Rainmeter.sln b/Rainmeter.sln
index d4db5dca..bd572381 100644
--- a/Rainmeter.sln
+++ b/Rainmeter.sln
@@ -114,7 +114,8 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D2A0903C-E760-4134-AE61-3D55BF8F760C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D2A0903C-E760-4134-AE61-3D55BF8F760C}.Debug|Win32.Build.0 = Debug|Win32
-		{D2A0903C-E760-4134-AE61-3D55BF8F760C}.Debug|x64.ActiveCfg = Debug|Win32
+		{D2A0903C-E760-4134-AE61-3D55BF8F760C}.Debug|x64.ActiveCfg = Debug|x64
+		{D2A0903C-E760-4134-AE61-3D55BF8F760C}.Debug|x64.Build.0 = Debug|x64
 		{D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release|Win32.ActiveCfg = Release|Win32
 		{D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release|Win32.Build.0 = Release|Win32
 		{D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release|x64.ActiveCfg = Release|x64
@@ -136,7 +137,8 @@ Global
 		{BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release64|x64.Build.0 = Release64|x64
 		{EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Debug|Win32.Build.0 = Debug|Win32
-		{EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Debug|x64.ActiveCfg = Debug|Win32
+		{EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Debug|x64.ActiveCfg = Debug|x64
+		{EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Debug|x64.Build.0 = Debug|x64
 		{EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Release|Win32.ActiveCfg = Release|Win32
 		{EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Release|Win32.Build.0 = Release|Win32
 		{EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Release|x64.ActiveCfg = Release|x64
@@ -146,7 +148,8 @@ Global
 		{EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Release64|x64.Build.0 = Release64|x64
 		{761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|Win32.ActiveCfg = Debug|Win32
 		{761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|Win32.Build.0 = Debug|Win32
-		{761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|x64.ActiveCfg = Debug|Win32
+		{761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|x64.ActiveCfg = Debug|x64
+		{761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|x64.Build.0 = Debug|x64
 		{761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|Win32.ActiveCfg = Release|Win32
 		{761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|Win32.Build.0 = Release|Win32
 		{761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|x64.ActiveCfg = Release|x64
@@ -156,7 +159,8 @@ Global
 		{761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release64|x64.Build.0 = Release64|x64
 		{BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Debug|Win32.Build.0 = Debug|Win32
-		{BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Debug|x64.ActiveCfg = Debug|Win32
+		{BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Debug|x64.ActiveCfg = Debug|x64
+		{BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Debug|x64.Build.0 = Debug|x64
 		{BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Release|Win32.ActiveCfg = Release|Win32
 		{BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Release|Win32.Build.0 = Release|Win32
 		{BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Release|x64.ActiveCfg = Release|x64
@@ -166,7 +170,8 @@ Global
 		{BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Release64|x64.Build.0 = Release64|x64
 		{5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Debug|Win32.Build.0 = Debug|Win32
-		{5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Debug|x64.ActiveCfg = Debug|Win32
+		{5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Debug|x64.ActiveCfg = Debug|x64
+		{5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Debug|x64.Build.0 = Debug|x64
 		{5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Release|Win32.ActiveCfg = Release|Win32
 		{5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Release|Win32.Build.0 = Release|Win32
 		{5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Release|x64.ActiveCfg = Release|x64
@@ -176,7 +181,8 @@ Global
 		{5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Release64|x64.Build.0 = Release64|x64
 		{C862B662-5CC6-4E79-B1B3-905E0B98D627}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C862B662-5CC6-4E79-B1B3-905E0B98D627}.Debug|Win32.Build.0 = Debug|Win32
-		{C862B662-5CC6-4E79-B1B3-905E0B98D627}.Debug|x64.ActiveCfg = Debug|Win32
+		{C862B662-5CC6-4E79-B1B3-905E0B98D627}.Debug|x64.ActiveCfg = Debug|x64
+		{C862B662-5CC6-4E79-B1B3-905E0B98D627}.Debug|x64.Build.0 = Debug|x64
 		{C862B662-5CC6-4E79-B1B3-905E0B98D627}.Release|Win32.ActiveCfg = Release|Win32
 		{C862B662-5CC6-4E79-B1B3-905E0B98D627}.Release|Win32.Build.0 = Release|Win32
 		{C862B662-5CC6-4E79-B1B3-905E0B98D627}.Release|x64.ActiveCfg = Release|x64
@@ -186,7 +192,8 @@ Global
 		{C862B662-5CC6-4E79-B1B3-905E0B98D627}.Release64|x64.Build.0 = Release64|x64
 		{C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Debug|Win32.Build.0 = Debug|Win32
-		{C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Debug|x64.ActiveCfg = Debug|Win32
+		{C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Debug|x64.ActiveCfg = Debug|x64
+		{C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Debug|x64.Build.0 = Debug|x64
 		{C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Release|Win32.ActiveCfg = Release|Win32
 		{C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Release|Win32.Build.0 = Release|Win32
 		{C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Release|x64.ActiveCfg = Release|x64
@@ -196,7 +203,8 @@ Global
 		{C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Release64|x64.Build.0 = Release64|x64
 		{C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Debug|Win32.Build.0 = Debug|Win32
-		{C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Debug|x64.ActiveCfg = Debug|Win32
+		{C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Debug|x64.ActiveCfg = Debug|x64
+		{C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Debug|x64.Build.0 = Debug|x64
 		{C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Release|Win32.ActiveCfg = Release|Win32
 		{C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Release|Win32.Build.0 = Release|Win32
 		{C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Release|x64.ActiveCfg = Release|x64
@@ -206,7 +214,8 @@ Global
 		{C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Release64|x64.Build.0 = Release64|x64
 		{17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Debug|Win32.ActiveCfg = Debug|Win32
 		{17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Debug|Win32.Build.0 = Debug|Win32
-		{17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Debug|x64.ActiveCfg = Debug|Win32
+		{17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Debug|x64.ActiveCfg = Debug|x64
+		{17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Debug|x64.Build.0 = Debug|x64
 		{17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Release|Win32.ActiveCfg = Release|Win32
 		{17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Release|Win32.Build.0 = Release|Win32
 		{17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Release|x64.ActiveCfg = Release|x64
@@ -216,7 +225,8 @@ Global
 		{17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Release64|x64.Build.0 = Release64|x64
 		{D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Debug|Win32.Build.0 = Debug|Win32
-		{D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Debug|x64.ActiveCfg = Debug|Win32
+		{D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Debug|x64.ActiveCfg = Debug|x64
+		{D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Debug|x64.Build.0 = Debug|x64
 		{D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Release|Win32.ActiveCfg = Release|Win32
 		{D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Release|Win32.Build.0 = Release|Win32
 		{D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Release|x64.ActiveCfg = Release|x64
@@ -226,7 +236,8 @@ Global
 		{D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Release64|x64.Build.0 = Release64|x64
 		{6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Debug|Win32.Build.0 = Debug|Win32
-		{6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Debug|x64.ActiveCfg = Debug|Win32
+		{6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Debug|x64.ActiveCfg = Debug|x64
+		{6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Debug|x64.Build.0 = Debug|x64
 		{6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Release|Win32.ActiveCfg = Release|Win32
 		{6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Release|Win32.Build.0 = Release|Win32
 		{6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Release|x64.ActiveCfg = Release|x64
@@ -236,7 +247,8 @@ Global
 		{6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Release64|x64.Build.0 = Release64|x64
 		{8B820B9F-C154-417C-A090-42198F2AF496}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8B820B9F-C154-417C-A090-42198F2AF496}.Debug|Win32.Build.0 = Debug|Win32
-		{8B820B9F-C154-417C-A090-42198F2AF496}.Debug|x64.ActiveCfg = Debug|Win32
+		{8B820B9F-C154-417C-A090-42198F2AF496}.Debug|x64.ActiveCfg = Debug|x64
+		{8B820B9F-C154-417C-A090-42198F2AF496}.Debug|x64.Build.0 = Debug|x64
 		{8B820B9F-C154-417C-A090-42198F2AF496}.Release|Win32.ActiveCfg = Release|Win32
 		{8B820B9F-C154-417C-A090-42198F2AF496}.Release|Win32.Build.0 = Release|Win32
 		{8B820B9F-C154-417C-A090-42198F2AF496}.Release|x64.ActiveCfg = Release|x64
@@ -246,7 +258,8 @@ Global
 		{8B820B9F-C154-417C-A090-42198F2AF496}.Release64|x64.Build.0 = Release64|x64
 		{B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Debug|Win32.Build.0 = Debug|Win32
-		{B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Debug|x64.ActiveCfg = Debug|Win32
+		{B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Debug|x64.ActiveCfg = Debug|x64
+		{B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Debug|x64.Build.0 = Debug|x64
 		{B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Release|Win32.ActiveCfg = Release|Win32
 		{B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Release|Win32.Build.0 = Release|Win32
 		{B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Release|x64.ActiveCfg = Release|x64
@@ -256,7 +269,8 @@ Global
 		{B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Release64|x64.Build.0 = Release64|x64
 		{BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Debug|Win32.Build.0 = Debug|Win32
-		{BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Debug|x64.ActiveCfg = Debug|Win32
+		{BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Debug|x64.ActiveCfg = Debug|x64
+		{BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Debug|x64.Build.0 = Debug|x64
 		{BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Release|Win32.ActiveCfg = Release|Win32
 		{BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Release|Win32.Build.0 = Release|Win32
 		{BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Release|x64.ActiveCfg = Release|x64
@@ -266,7 +280,8 @@ Global
 		{BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Release64|x64.Build.0 = Release64|x64
 		{4F8C4C09-431C-45C4-830B-32006E783C3A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4F8C4C09-431C-45C4-830B-32006E783C3A}.Debug|Win32.Build.0 = Debug|Win32
-		{4F8C4C09-431C-45C4-830B-32006E783C3A}.Debug|x64.ActiveCfg = Debug|Win32
+		{4F8C4C09-431C-45C4-830B-32006E783C3A}.Debug|x64.ActiveCfg = Debug|x64
+		{4F8C4C09-431C-45C4-830B-32006E783C3A}.Debug|x64.Build.0 = Debug|x64
 		{4F8C4C09-431C-45C4-830B-32006E783C3A}.Release|Win32.ActiveCfg = Release|Win32
 		{4F8C4C09-431C-45C4-830B-32006E783C3A}.Release|Win32.Build.0 = Release|Win32
 		{4F8C4C09-431C-45C4-830B-32006E783C3A}.Release|x64.ActiveCfg = Release|x64
@@ -276,7 +291,8 @@ Global
 		{4F8C4C09-431C-45C4-830B-32006E783C3A}.Release64|x64.Build.0 = Release64|x64
 		{A2DD3CBE-B140-4892-A875-24107FA52518}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A2DD3CBE-B140-4892-A875-24107FA52518}.Debug|Win32.Build.0 = Debug|Win32
-		{A2DD3CBE-B140-4892-A875-24107FA52518}.Debug|x64.ActiveCfg = Debug|Win32
+		{A2DD3CBE-B140-4892-A875-24107FA52518}.Debug|x64.ActiveCfg = Debug|x64
+		{A2DD3CBE-B140-4892-A875-24107FA52518}.Debug|x64.Build.0 = Debug|x64
 		{A2DD3CBE-B140-4892-A875-24107FA52518}.Release|Win32.ActiveCfg = Release|Win32
 		{A2DD3CBE-B140-4892-A875-24107FA52518}.Release|Win32.Build.0 = Release|Win32
 		{A2DD3CBE-B140-4892-A875-24107FA52518}.Release|x64.ActiveCfg = Release|x64
@@ -286,7 +302,8 @@ Global
 		{A2DD3CBE-B140-4892-A875-24107FA52518}.Release64|x64.Build.0 = Release64|x64
 		{45A34285-56DD-4521-912B-3F884D36FA35}.Debug|Win32.ActiveCfg = Debug|Win32
 		{45A34285-56DD-4521-912B-3F884D36FA35}.Debug|Win32.Build.0 = Debug|Win32
-		{45A34285-56DD-4521-912B-3F884D36FA35}.Debug|x64.ActiveCfg = Debug|Win32
+		{45A34285-56DD-4521-912B-3F884D36FA35}.Debug|x64.ActiveCfg = Debug|x64
+		{45A34285-56DD-4521-912B-3F884D36FA35}.Debug|x64.Build.0 = Debug|x64
 		{45A34285-56DD-4521-912B-3F884D36FA35}.Release|Win32.ActiveCfg = Release|Win32
 		{45A34285-56DD-4521-912B-3F884D36FA35}.Release|Win32.Build.0 = Release|Win32
 		{45A34285-56DD-4521-912B-3F884D36FA35}.Release|x64.ActiveCfg = Release|x64