- Removed support for using Rainmeter.dll as Litestep module

- Merged Rainmeter.dll and Rainmeter.exe - Language resource file now located in \Language\<LanguageName>.dll - Build.bat now automatically builds and packages all languages
2024-02-24 04:33:31 +00:00 · 2011-09-28 18:28:35 +00:00
parent 573c96d4fe
commit 13c17b9d1a
46 changed files with 420 additions and 2438 deletions
--- a/Application/Application.rc
+++ b/Application/Application.rc
@@ -1,115 +0,0 @@
 // Microsoft Developer Studio generated resource script.
 // Caution! Do not modify this file without changing \install\UpdateApplicationRC.au3
 //
 #include "resource.h"
 #include "../Version.h"
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "windows.h"
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 // Finnish resources
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
 #ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 #pragma code_page(1252)
 #endif //_WIN32
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION FILEVER
 PRODUCTVERSION PRODUCTVER
 FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
 FILEFLAGS 0x1L
 #else
 FILEFLAGS 0x0L
 #endif
 FILEOS 0x4L
 FILETYPE 0x1L
 FILESUBTYPE 0x0L
 BEGIN
    BLOCK "StringFileInfo"
    BEGIN
        BLOCK "040904E4"
        BEGIN
            VALUE "FileDescription", "Rainmeter"
            VALUE "FileVersion", STRFILEVER
            VALUE "InternalName", "Rainmeter"
            VALUE "LegalCopyright", "Copyright (C) 2011 - All authors"
            VALUE "OriginalFilename", "Rainmeter.exe"
            VALUE "ProductName", "Rainmeter"
 #ifdef _WIN64
            VALUE "ProductVersion", STRPRODUCTVER " (64-bit)"
 #else
            VALUE "ProductVersion", STRPRODUCTVER " (32-bit)"
 #endif //_WIN64
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
        VALUE "Translation", 0x409, 1252
    END
 END
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
 //
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_RAINMETER           ICON    DISCARDABLE     "Rainmeter.ico"
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // TEXTINCLUDE
 //
 1 TEXTINCLUDE DISCARDABLE 
 BEGIN
    "resource.h\0"
 END
 2 TEXTINCLUDE DISCARDABLE 
 BEGIN
    "#include ""afxres.h""\r\n"
    "\0"
 END
 3 TEXTINCLUDE DISCARDABLE 
 BEGIN
    "\r\n"
    "\0"
 END
 #endif    // APSTUDIO_INVOKED
 #endif    // Finnish resources
 /////////////////////////////////////////////////////////////////////////////
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
--- a/Application/Application.vcxproj
+++ b/Application/Application.vcxproj
@@ -1,331 +0,0 @@
 <?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|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|x64">
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|x64">
      <Configuration>Release</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{D2A0903C-E760-4134-AE61-3D55BF8F760C}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(SolutionDir)\Rainmeter.props" />
  <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|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
    <PlatformToolset>$(COMPILER64)</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
    <PlatformToolset>$(COMPILER64)</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <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|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|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|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.30319.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)TestBench\x32\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\x32\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)TestBench\x64\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)TestBench\x32\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\x32\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)TestBench\x64\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Rainmeter</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Rainmeter</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Rainmeter</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Rainmeter</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Midl>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
      <TypeLibraryName>.\x32/Debug/Application.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <PrecompiledHeaderOutputFile>.\x32/Debug/Application.pch</PrecompiledHeaderOutputFile>
      <AssemblerListingLocation>.\x32/Debug/</AssemblerListingLocation>
      <ObjectFileName>.\x32/Debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\x32/Debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
      <DisableSpecificWarnings>4018;4090;4114;4267;4351;4786;4800;4996</DisableSpecificWarnings>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
      <OutputFile>../TestBench/x32/Debug/Rainmeter.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Debug/Rainmeter.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
    <PostBuildEvent>
      <Command>if exist ..\testbench\x32\release\skins goto skip
 mkdir ..\testbench\x32\release\skins
 if not exist ..\testbench\x32\release\themes (mkdir ..\testbench\x32\release\themes)
 echo "Copying skins..."
 xcopy /Q /S /Y ..\Install\Skins ..\testbench\x32\release\skins
 xcopy /Q /S /Y ..\Install\Themes ..\testbench\x32\release\themes
 xcopy /Q /S /Y ..\Install\Default.ini ..\testbench\x32\release\
 :skip</Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Midl>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
      <TypeLibraryName>.\x64/Debug/Application.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <PrecompiledHeaderOutputFile>.\x64/Debug/Application.pch</PrecompiledHeaderOutputFile>
      <AssemblerListingLocation>.\x64/Debug/</AssemblerListingLocation>
      <ObjectFileName>.\x64/Debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\x64/Debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <DisableSpecificWarnings>4018;4090;4114;4267;4351;4786;4800;4996</DisableSpecificWarnings>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
      <OutputFile>../TestBench/x64/Debug/Rainmeter.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Debug/Rainmeter.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
    <PostBuildEvent>
      <Command>if exist ..\testbench\x32\release\skins goto skip
 mkdir ..\testbench\x32\release\skins
 if not exist ..\testbench\x32\release\themes (mkdir ..\testbench\x32\release\themes)
 echo "Copying skins..."
 xcopy /Q /S /Y ..\Install\Skins ..\testbench\x32\release\skins
 xcopy /Q /S /Y ..\Install\Themes ..\testbench\x32\release\themes
 xcopy /Q /S /Y ..\Install\Default.ini ..\testbench\x32\release\
 :skip</Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Midl>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
      <TypeLibraryName>.\x32/Release/Application.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <PrecompiledHeaderOutputFile>.\x32/Release/Application.pch</PrecompiledHeaderOutputFile>
      <AssemblerListingLocation>.\x32/Release/</AssemblerListingLocation>
      <ObjectFileName>.\x32/Release/</ObjectFileName>
      <ProgramDataBaseFileName>.\x32/Release/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <DisableSpecificWarnings>4018;4090;4114;4267;4351;4786;4800;4996</DisableSpecificWarnings>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../TestBench/x32/Release/Rainmeter.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/Rainmeter.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
      <TargetMachine>MachineX86</TargetMachine>
      <MergeSections>.rdata=.text</MergeSections>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    </Link>
    <PostBuildEvent>
      <Command>if exist ..\testbench\x32\release\skins goto skip
 mkdir ..\testbench\x32\release\skins
 if not exist ..\testbench\x32\release\themes (mkdir ..\testbench\x32\release\themes)
 echo "Copying skins..."
 xcopy /Q /S /Y ..\Install\Skins ..\testbench\x32\release\skins
 xcopy /Q /S /Y ..\Install\Themes ..\testbench\x32\release\themes
 xcopy /Q /S /Y ..\Install\Default.ini ..\testbench\x32\release\
 :skip</Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Midl>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
      <TypeLibraryName>.\x64/Release/Application.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>/GL /GA  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <PrecompiledHeaderOutputFile>.\x64/Release/Application.pch</PrecompiledHeaderOutputFile>
      <AssemblerListingLocation>.\x64/Release/</AssemblerListingLocation>
      <ObjectFileName>.\x64/Release/</ObjectFileName>
      <ProgramDataBaseFileName>.\x64/Release/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <DisableSpecificWarnings>4018;4090;4114;4267;4351;4786;4800;4996</DisableSpecificWarnings>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
      <AdditionalOptions>/LTCG  %(AdditionalOptions)</AdditionalOptions>
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../TestBench/x64/Release/Rainmeter.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/Rainmeter.pdb</ProgramDatabaseFile>
      <SubSystem>Windows</SubSystem>
      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
      <TargetMachine>MachineX64</TargetMachine>
      <MergeSections>.rdata=.text</MergeSections>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    </Link>
    <PostBuildEvent>
      <Command>if exist ..\testbench\x32\release\skins goto skip
 mkdir ..\testbench\x32\release\skins
 if not exist ..\testbench\x32\release\themes (mkdir ..\testbench\x32\release\themes)
 echo "Copying skins..."
 xcopy /Q /S /Y ..\Install\Skins ..\testbench\x32\release\skins
 xcopy /Q /S /Y ..\Install\Themes ..\testbench\x32\release\themes
 xcopy /Q /S /Y ..\Install\Default.ini ..\testbench\x32\release\
 :skip</Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="Application.cpp">
      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="Application.rc">
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="resource.h" />
  </ItemGroup>
  <ItemGroup>
    <None Include="Rainmeter.ico" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Library\Library.vcxproj">
      <Project>{be9d2400-7f1c-49d6-8498-5ce495491ad6}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/Application/Application.vcxproj.filters
+++ b/Application/Application.vcxproj.filters
@@ -1,37 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Source Files">
      <UniqueIdentifier>{22670730-eb79-4df9-bed9-27fff1350132}</UniqueIdentifier>
      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
    </Filter>
    <Filter Include="Header Files">
      <UniqueIdentifier>{774a1827-ac91-40b9-ad18-8a3d68983c64}</UniqueIdentifier>
      <Extensions>h;hpp;hxx;hm;inl</Extensions>
    </Filter>
    <Filter Include="Resource Files">
      <UniqueIdentifier>{a4963a10-e359-400f-86fa-bdce98dd5dc2}</UniqueIdentifier>
      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="Application.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="resource.h">
      <Filter>Header Files</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="Rainmeter.ico">
      <Filter>Resource Files</Filter>
    </None>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="Application.rc">
      <Filter>Resource Files</Filter>
    </ResourceCompile>
  </ItemGroup>
 </Project>
--- a/Application/Rainmeter.ico
+++ b/Application/Rainmeter.ico
--- a/Application/resource.h
+++ b/Application/resource.h
@@ -1,21 +0,0 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
 // Used by Host.rc
 //
 #define IDI_RAINMETER                   103
 #define IDR_TRAYMENU                    104
 #define ID_TRAYMENU_REFRESH             40001
 #define ID_TRAYMENU_QUIT                40002
 #define ID_TRAYMENU_SHOW                40003
 #define ID_TRAYMENU_HIDE                40010
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        105
 #define _APS_NEXT_COMMAND_VALUE         40011
 #define _APS_NEXT_CONTROL_VALUE         1000
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
--- a/Application/Application.cpp
+++ b/Application/Application.cpp
@@ -17,12 +17,10 @@
 */
 #define _CRTDBG_MAP_ALLOC
-#include <stdlib.h>
+#include "StdAfx.h"
 #include <crtdbg.h>
 #include <string>
 #include <algorithm>
 #include "resource.h"
-#include "../Library/Rainmeter.h"
+#include "Rainmeter.h"
 #include "TrayWindow.h"
 #if defined _M_IX86
 #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
@@ -34,24 +32,14 @@
 #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
 #endif
-/*
+extern CRainmeter* Rainmeter;
-** Protos
+
-*/
+void Bang(const WCHAR* command);
 BOOL InitApplication(HINSTANCE hInstance, const WCHAR* WinClass);
 HWND InitInstance(HINSTANCE hInstance, const WCHAR* WinClass, const WCHAR* WinName);
-LRESULT CALLBACK MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 void Bang(const WCHAR* command);
 HMODULE RmLoadSystemLibrary(LPCWSTR lpLibFileName);
 BOOL IsRunning(HANDLE* hMutex);
 /*
 ** Stuff from the DLL
 */
 extern "C" EXPORT_PLUGIN int initModuleEx(HWND ParentWnd, HINSTANCE dllInst, LPCSTR);
 extern "C" EXPORT_PLUGIN void quitModule(HINSTANCE dllInst);
 extern "C" EXPORT_PLUGIN void Initialize(bool DummyLS, LPCTSTR CmdLine);
 extern "C" EXPORT_PLUGIN void ExecuteBang(LPCTSTR szBang);
 const WCHAR* WinClass = L"DummyRainWClass";
 const WCHAR* WinName = L"Rainmeter control window";
@@ -99,7 +87,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd
 		if (!InitApplication(hInstance, WinClass)) return RetError;
 	}
-	hWnd=InitInstance(hInstance, WinClass, WinName);
+	hWnd = InitInstance(hInstance, WinClass, WinName);
 	if (!hWnd) return RetError;
 	// Remove quotes from the commandline
@@ -113,38 +101,40 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd
 		}
 	}
-	// Initialize from exe
+	int result = 1;
-	Initialize(true, Path);
+	try
 	// Check that the DLL is available
 	HMODULE module = GetModuleHandle(L"Rainmeter.dll");
 	if (module == NULL)
 	{
-		MessageBox(NULL, L"Unable to load Rainmeter.dll", L"Rainmeter", MB_OK | MB_TOPMOST | MB_ICONERROR);
+		Rainmeter = new CRainmeter;
 		DestroyWindow(hWnd);
 		return RetError;
 	}
-	// Initialize the DLL
+		if (Rainmeter)
 	if (initModuleEx(hWnd, module, NULL) == 1)
 	{
 		MessageBox(NULL, L"Unable to initialize Rainmeter.dll", L"Rainmeter", MB_OK | MB_TOPMOST | MB_ICONERROR);
 		DestroyWindow(hWnd);
 		return RetError;
 	}
 	// Run the standard window message loop
 	while ((bRet = GetMessage(&msg, NULL, 0, 0)) != 0)
 	{
 		if (bRet == -1)  // error
 		{
-			quitModule(NULL);
+			result = Rainmeter->Initialize(hWnd, hInstance, lpCmdLine);
 			break;
 		}
-		else
+	}
 	catch (CError& error)
 	{
 		MessageBox(hWnd, error.GetString().c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);
 	}
 	if (result == 1)
 	{
 		DestroyWindow(hWnd);
 	}
 	else
 	{
 		// Run the standard window message loop
 		while ((bRet = GetMessage(&msg, NULL, 0, 0)) != 0)
 		{
-			TranslateMessage(&msg);
+			if (bRet == -1)  // error
-			DispatchMessage(&msg);
+			{
 				CRainmeter::Quit();
 				break;
 			}
 			else
 			{
 				TranslateMessage(&msg);
 				DispatchMessage(&msg);
 			}
 		}
 	}
@@ -163,11 +153,11 @@ BOOL InitApplication(HINSTANCE hInstance, const WCHAR* WinClass)
 	WNDCLASS  wc;
 	wc.style = 0;
-	wc.lpfnWndProc = (WNDPROC) MainWndProc;
+	wc.lpfnWndProc = (WNDPROC)WndProc;
 	wc.cbClsExtra = 0;
 	wc.cbWndExtra = 0;
 	wc.hInstance = hInstance;
-	wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_RAINMETER));
+	wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_WINDOW));
 	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
 	wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
 	wc.lpszMenuName =  NULL;
@@ -332,34 +322,34 @@ BOOL IsRunning(HANDLE* hMutex)
 }
 /*
-** MainWndProc
+** WndProc
 **
 ** The main window procedure
 **
 */
-LRESULT CALLBACK MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-	switch(message) {
+	switch (uMsg)
-
+	{
 	case WM_DESTROY:
 		{
-			quitModule(NULL);
+			CRainmeter::Quit();
 			PostQuitMessage(0);
 		}
 		break;
 	case WM_COPYDATA:
 		{
-			COPYDATASTRUCT* pCopyDataStruct = (COPYDATASTRUCT*) lParam;
+			COPYDATASTRUCT* cds = (COPYDATASTRUCT*)lParam;
-			if (pCopyDataStruct && (pCopyDataStruct->dwData == 1) && (pCopyDataStruct->cbData > 0))
+			if (Rainmeter && cds && (cds->dwData == 1) && (cds->cbData > 0) && cds->lpData)
 			{
-				ExecuteBang((const WCHAR*)pCopyDataStruct->lpData);
+				ExecuteBang((LPCWSTR)cds->lpData);
 			}
 		}
 		break;
 	default:
-		return DefWindowProc(hWnd, message, wParam, lParam);
+		return DefWindowProc(hWnd, uMsg, wParam, lParam);
 	}
 	return 0;
--- a/Library/ConfigParser.cpp
+++ b/Library/ConfigParser.cpp
@@ -645,19 +645,6 @@ const std::wstring& CConfigParser::ReadString(LPCTSTR section, LPCTSTR key, LPCT
 		}
 	}
 	// Check Litestep vars
 	if (Rainmeter && !Rainmeter->GetDummyLitestep())
 	{
 		std::string ansi = ConvertToAscii(result.c_str());
 		if (ansi.size() < 4096)
 		{
 			char* buffer = new char[4096];	// lets hope the buffer is large enough...
 			VarExpansion(buffer, ansi.c_str());
 			result = ConvertToWide(buffer);
 			delete [] buffer;
 		}
 	}
 	SetBuiltInVariable(L"CURRENTSECTION", section);  // Set temporarily
 	if (ReplaceVariables(result))
@@ -1051,11 +1038,11 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
 	if (temporary)
 	{
-		if (CRainmeter::GetDebug()) LogWithArgs(LOG_DEBUG, L"Reading file: %s (Temp: %s)", iniFile.c_str(), iniRead.c_str());
+		if (Rainmeter->GetDebug()) LogWithArgs(LOG_DEBUG, L"Reading file: %s (Temp: %s)", iniFile.c_str(), iniRead.c_str());
 	}
 	else
 	{
-		if (CRainmeter::GetDebug()) LogWithArgs(LOG_DEBUG, L"Reading file: %s", iniFile.c_str());
+		if (Rainmeter->GetDebug()) LogWithArgs(LOG_DEBUG, L"Reading file: %s", iniFile.c_str());
 		iniRead = iniFile;
 	}
--- a/Library/DialogAbout.cpp
+++ b/Library/DialogAbout.cpp
@@ -1064,7 +1064,7 @@ INT_PTR CDialogAbout::CTabVersion::OnNotify(WPARAM wParam, LPARAM lParam)
 	switch (nm->code)
 	{
 	case NM_CLICK:
-		LSExecute(NULL, ((PNMLINK)lParam)->item.szUrl, SW_SHOWNORMAL);
+		RunCommand(NULL, ((PNMLINK)lParam)->item.szUrl, SW_SHOWNORMAL);
 		break;
 	default:
--- a/Library/DialogManage.cpp
+++ b/Library/DialogManage.cpp
@@ -254,12 +254,12 @@ INT_PTR CDialogManage::OnCommand(WPARAM wParam, LPARAM lParam)
 			std::wstring command = Rainmeter->GetConfigEditor() + L" \"";
 			command += Rainmeter->GetIniFile();
 			command += L"\"";
-			LSExecute(Rainmeter->GetTrayWindow()->GetWindow(), command.c_str(), SW_SHOWNORMAL);
+			RunCommand(Rainmeter->GetTrayWindow()->GetWindow(), command.c_str(), SW_SHOWNORMAL);
 		}
 		break;
 	case IDC_OPENLOG_BUTTON:
-		RainmeterAboutWide();
+		RainmeterAbout();
 		break;
 	case IDCLOSE:
@@ -925,7 +925,7 @@ INT_PTR CDialogManage::CTabSkins::OnCommand(WPARAM wParam, LPARAM lParam)
 			std::wstring command = Rainmeter->GetSkinPath() + m_SkinName;
 			command += L"\\";
 			command += m_FileName;
-			HANDLE file = CreateFile(command.c_str(), GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+			HANDLE file = CreateFile(command.c_str(), GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
 			command.insert(0, L" \"");
 			command.insert(0, Rainmeter->GetConfigEditor());
@@ -934,12 +934,12 @@ INT_PTR CDialogManage::CTabSkins::OnCommand(WPARAM wParam, LPARAM lParam)
 			if (file == INVALID_HANDLE_VALUE)
 			{
 				// File is in protected location, so execute as admin
-				ExecuteCommand(NULL, command.c_str(), SW_SHOWNORMAL, L"runas");
+				RunCommand(NULL, command.c_str(), SW_SHOWNORMAL, L"runas");
 			}
 			else
 			{
 				CloseHandle(file);
-				LSExecute(NULL, command.c_str(), SW_SHOWNORMAL);
+				RunCommand(NULL, command.c_str(), SW_SHOWNORMAL);
 			}
 		}
 		break;
@@ -1117,7 +1117,7 @@ INT_PTR CDialogManage::CTabSkins::OnCommand(WPARAM wParam, LPARAM lParam)
 			std::wstring command = L"\"" + Rainmeter->GetSkinPath();
 			command += GetTreeSelectionPath(tree);
 			command += L"\"";
-			LSExecute(NULL, command.c_str(), SW_SHOWNORMAL);
+			RunCommand(NULL, command.c_str(), SW_SHOWNORMAL);
 		}
 		break;
@@ -1540,7 +1540,7 @@ INT_PTR CDialogManage::CTabThemes::OnCommand(WPARAM wParam, LPARAM lParam)
 			command += L"Themes\\";
 			command += themes[sel];
 			command += L"\\Rainmeter.thm\"";
-			LSExecute(NULL, command.c_str(), SW_SHOWNORMAL);
+			RunCommand(NULL, command.c_str(), SW_SHOWNORMAL);
 		}
 		break;
@@ -1586,7 +1586,7 @@ INT_PTR CDialogManage::CTabThemes::OnCommand(WPARAM wParam, LPARAM lParam)
 		{
 			std::wstring command = L"\"" + Rainmeter->GetAddonPath();
 			command += L"RainBackup\\RainBackup.exe\"";
-			LSExecute(NULL, command.c_str(), SW_SHOWNORMAL);
+			RunCommand(NULL, command.c_str(), SW_SHOWNORMAL);
 		}
 		break;
@@ -1669,7 +1669,7 @@ INT_PTR CDialogManage::CTabSettings::OnCommand(WPARAM wParam, LPARAM lParam)
 	case IDC_MANAGESETTINGS_SHOWLOGFILE_BUTTON:
 		{
 			std::wstring command = Rainmeter->GetLogViewer() + Rainmeter->GetLogFile();
-			LSExecute(NULL, command.c_str(), SW_SHOWNORMAL);
+			RunCommand(NULL, command.c_str(), SW_SHOWNORMAL);
 		}
 		break;
--- a/Library/Library.rc
+++ b/Library/Library.rc
@@ -31,11 +31,11 @@ BEGIN
    BEGIN
        BLOCK "040904E4"
        BEGIN
-            VALUE "FileDescription", "Rainmeter Core Library"
+            VALUE "FileDescription", "Rainmeter"
            VALUE "FileVersion", STRFILEVER
            VALUE "InternalName", "Rainmeter"
            VALUE "LegalCopyright", "Copyright (C) 2011 - All authors"
-            VALUE "OriginalFilename", "Rainmeter.dll"
+            VALUE "OriginalFilename", "Rainmeter.exe"
            VALUE "ProductName", "Rainmeter"
 #ifdef _WIN64
            VALUE "ProductVersion", STRPRODUCTVER " (64-bit)"
--- a/Library/Library.vcxproj
+++ b/Library/Library.vcxproj
@@ -20,29 +20,30 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{BE9D2400-7F1C-49D6-8498-5CE495491AD6}</ProjectGuid>
    <ProjectName>Application</ProjectName>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(SolutionDir)\Rainmeter.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
    <PlatformToolset>$(COMPILER64)</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
    <PlatformToolset>$(COMPILER64)</PlatformToolset>
@@ -95,7 +96,7 @@
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>lua/include;lua/lua;lua/tolua++;lua/glue;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;SUPPORT_UTF8;LIBRARY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;HAVE_CONFIG_H;SUPPORT_UTF8;LIBRARY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -116,12 +117,14 @@
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../TestBench/x32/Debug/Rainmeter.dll</OutputFile>
+      <OutputFile>../TestBench/x32/Debug/Rainmeter.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Debug/Rainmeter.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/Rainmeter.lib</ImportLibrary>
      <SubSystem>Windows</SubSystem>
      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
@@ -138,7 +141,7 @@
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>lua/include;lua/lua;lua/tolua++;lua/glue;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;SUPPORT_UTF8;LIBRARY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;HAVE_CONFIG_H;SUPPORT_UTF8;LIBRARY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -159,12 +162,14 @@
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../TestBench/x64/Debug/Rainmeter.dll</OutputFile>
+      <OutputFile>../TestBench/x64/Debug/Rainmeter.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x64/Debug/Rainmeter.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/Rainmeter.lib</ImportLibrary>
      <SubSystem>Windows</SubSystem>
      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
@@ -182,7 +187,7 @@
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
      <AdditionalIncludeDirectories>lua/include;lua/lua;lua/tolua++;lua/glue;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRARY_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBRARY_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -198,6 +203,7 @@
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <DisableSpecificWarnings>4018;4090;4114;4267;4334;4351;4786;4800;4996</DisableSpecificWarnings>
      <AdditionalOptions>/GL /GA %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -205,12 +211,14 @@
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../TestBench/x32/Release/Rainmeter.dll</OutputFile>
+      <OutputFile>../TestBench/x32/Release/Rainmeter.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>lua/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/Rainmeter.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/Rainmeter.lib</ImportLibrary>
      <SubSystem>Windows</SubSystem>
      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
      <TargetMachine>MachineX86</TargetMachine>
      <MergeSections>.rdata=.text</MergeSections>
      <OptimizeReferences>true</OptimizeReferences>
@@ -228,11 +236,11 @@
      </HeaderFileName>
    </Midl>
    <ClCompile>
-      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/GL /GA %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
      <AdditionalIncludeDirectories>lua/include;lua/lua;lua/tolua++;lua/glue;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRARY_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBRARY_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -253,11 +261,13 @@
    <Link>
      <AdditionalOptions>/LTCG  %(AdditionalOptions)</AdditionalOptions>
      <AdditionalDependencies>comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../TestBench/x64/Release/Rainmeter.dll</OutputFile>
+      <OutputFile>../TestBench/x64/Release/Rainmeter.exe</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/Rainmeter.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/Rainmeter.lib</ImportLibrary>
      <SubSystem>Windows</SubSystem>
      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
      <TargetMachine>MachineX64</TargetMachine>
      <MergeSections>.rdata=.text</MergeSections>
      <OptimizeReferences>true</OptimizeReferences>
@@ -265,6 +275,7 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="Application.cpp" />
    <ClCompile Include="ConfigParser.cpp">
      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
--- a/Library/Library.vcxproj.filters
+++ b/Library/Library.vcxproj.filters
@@ -357,6 +357,9 @@
    <ClCompile Include="DialogManage.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="Application.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="ConfigParser.h">
--- a/Library/Litestep.cpp
+++ b/Library/Litestep.cpp
@@ -24,36 +24,6 @@
 extern CRainmeter* Rainmeter;
 typedef BOOL (*FPADDBANGCOMMAND)(LPCSTR command, BangCommand f);
 FPADDBANGCOMMAND fpAddBangCommand = NULL;
 typedef HRGN (*FPBITMAPTOREGION)(HBITMAP hBmp, COLORREF cTransparentColor, COLORREF cTolerance, int xoffset, int yoffset);
 FPBITMAPTOREGION fpBitmapToRegion = NULL;
 typedef HWND (*FPGETLITESTEPWND)(void);
 FPGETLITESTEPWND fpGetLitestepWnd = NULL;
 typedef BOOL (*FPGETRCSTRING)(LPCSTR lpKeyName, LPSTR value, LPCSTR defStr, int maxLen);
 FPGETRCSTRING fpGetRCString = NULL;
 //typedef int (*FPGETRCINT)(LPCSTR lpKeyName, int nDefault);
 //FPGETRCINT fpGetRCInt = NULL;
 typedef HINSTANCE (*FPLSEXECUTE)(HWND Owner, LPCSTR szCommand, int nShowCmd);
 FPLSEXECUTE fpLSExecute = NULL;
 typedef BOOL (*FPREMOVEBANGCOMMAND)(LPCSTR command);
 FPREMOVEBANGCOMMAND fpRemoveBangCommand = NULL;
 //typedef void (*FPTRANSPARENTBLTLS)(HDC dc, int nXDest, int nYDest, int nWidth, int nHeight, HDC tempDC, int nXSrc, int nYSrc, COLORREF colorTransparent);
 //FPTRANSPARENTBLTLS fpTransparentBltLS = NULL;
 typedef void (*FPVAREXPANSION)(LPSTR buffer, LPCSTR value);
 FPVAREXPANSION fpVarExpansion = NULL;
 typedef BOOL (WINAPI *FPLSLOG)(int nLevel, LPCSTR pszModule, LPCSTR pszMessage);
 FPLSLOG fpLSLog = NULL;
 static CRITICAL_SECTION g_CsLog = {0};
 static CRITICAL_SECTION g_CsLogDelay = {0};
@@ -68,25 +38,6 @@ void InitalizeLitestep()
 {
 	InitializeCriticalSection(&g_CsLog);
 	InitializeCriticalSection(&g_CsLogDelay);
 	if (!CRainmeter::GetDummyLitestep())
 	{
 		// Use lsapi's methods instead of the stubs
 		HINSTANCE h = CSystem::RmLoadLibrary(L"lsapi.dll");
 		if (h != NULL)
 		{
 			fpAddBangCommand = (FPADDBANGCOMMAND)GetProcAddress(h, "AddBangCommand");
 			fpBitmapToRegion = (FPBITMAPTOREGION)GetProcAddress(h, "BitmapToRegion");
 			fpGetLitestepWnd = (FPGETLITESTEPWND)GetProcAddress(h, "GetLitestepWnd");
 			fpGetRCString = (FPGETRCSTRING)GetProcAddress(h, "GetRCString");
 			//fpGetRCInt = (FPGETRCINT)GetProcAddress(h, "GetRCInt");
 			fpLSExecute = (FPLSEXECUTE)GetProcAddress(h, "LSExecute");
 			fpRemoveBangCommand = (FPREMOVEBANGCOMMAND)GetProcAddress(h, "RemoveBangCommand");
 			//fpTransparentBltLS = (FPTRANSPARENTBLTLS)GetProcAddress(h, "TransparentBltLS");
 			fpVarExpansion = (FPVAREXPANSION)GetProcAddress(h, "VarExpansion");
 			fpLSLog = (FPLSLOG)GetProcAddress(h, "_LSLog@12");
 		}
 	}
 }
 void FinalizeLitestep()
@@ -95,73 +46,8 @@ void FinalizeLitestep()
 	DeleteCriticalSection(&g_CsLogDelay);
 }
 BOOL AddBangCommand(LPCSTR command, BangCommand f)
 {
 	// Use the lsapi.dll version of the method if possible
 	if (fpAddBangCommand) return fpAddBangCommand(command, f);
 	// The stub implementation
 	return true;
 }
 HWND GetLitestepWnd(void)
 {
 	// Use the lsapi.dll version of the method if possible
 	if (fpGetLitestepWnd) return fpGetLitestepWnd();
 	// The stub implementation
 	return NULL;
 }
 BOOL RemoveBangCommand(LPCSTR command)
 {
 	// Use the lsapi.dll version of the method if possible
 	if (fpRemoveBangCommand) return fpRemoveBangCommand(command);
 	// The stub implementation
 	return true;
 }
 BOOL GetRCString(LPCSTR lpKeyName, LPSTR value, LPCSTR defStr, int maxLen)
 {
 	// Use the lsapi.dll version of the method if possible
 	if (fpGetRCString) return fpGetRCString(lpKeyName, value, defStr, maxLen);
 	// The stub implementation
 	return false;
 }
 //int GetRCInt(LPCSTR lpKeyName, int nDefault)
 //{
 //	// Use the lsapi.dll version of the method if possible
 //	if (fpGetRCInt) return fpGetRCInt(lpKeyName, nDefault);
 //
 //	// The stub implementation
 //	return nDefault;
 //}
 void VarExpansion(LPSTR buffer, LPCSTR value)
 {
 	// Use the lsapi.dll version of the method if possible
 	if (fpVarExpansion)
 	{
 		fpVarExpansion(buffer, value);
 	}
 	else
 	{
 		// The stub implementation
 		if (buffer != value)
 		{
 			strcpy(buffer, value);
 		}
 	}
 }
 HRGN BitmapToRegion(HBITMAP hbm, COLORREF clrTransp, COLORREF clrTolerance, int xoffset, int yoffset)
 {
 	// Use the lsapi.dll version of the method if possible
 	if (fpBitmapToRegion) return fpBitmapToRegion(hbm, clrTransp, clrTolerance, xoffset, yoffset);
 	// start with a completely transparent rgn
 	// this is more correct as no bmp, should render a transparent background
 	HRGN hRgn = CreateRectRgn(0, 0, 0, 0);
@@ -289,70 +175,17 @@ HRGN BitmapToRegion(HBITMAP hbm, COLORREF clrTransp, COLORREF clrTolerance, int
 	return hRgn;
 }
-//HINSTANCE LSExecuteAsAdmin(HWND Owner, LPCTSTR szCommand, int nShowCmd)
+void RunCommand(HWND Owner, LPCTSTR szCommand, int nShowCmd, bool asAdmin)
 //{
 //	BOOL IsInAdminGroup = FALSE;
 //
 //	SID_IDENTIFIER_AUTHORITY NtAuthority = SECURITY_NT_AUTHORITY;
 //	PSID AdministratorsGroup;
 //	// Initialize SID.
 //	if (!AllocateAndInitializeSid( &NtAuthority,
 //		2,
 //		SECURITY_BUILTIN_DOMAIN_RID,
 //		DOMAIN_ALIAS_RID_ADMINS,
 //		0, 0, 0, 0, 0, 0,
 //		&AdministratorsGroup))
 //	{
 //		// Initializing SID Failed.
 //		IsInAdminGroup = FALSE;
 //	}
 //	else
 //	{
 //		// Check whether the token is present in admin group.
 //		if (!CheckTokenMembership( NULL,
 //			AdministratorsGroup,
 //			&IsInAdminGroup ))
 //		{
 //			// Error occurred.
 //			IsInAdminGroup = FALSE;
 //		}
 //		// Free SID and return.
 //		FreeSid(AdministratorsGroup);
 //	}
 //
 //	if (IsInAdminGroup)
 //	{
 //		return ExecuteCommand(Owner, szCommand, nShowCmd, L"open");
 //	}
 //	else
 //	{
 //		return ExecuteCommand(Owner, szCommand, nShowCmd, L"runas");
 //	}
 //}
 HINSTANCE LSExecute(HWND Owner, LPCTSTR szCommand, int nShowCmd)
 {
 	// Use the lsapi.dll version of the method if possible
 	if (fpLSExecute)
 	{
 		std::string asc = ConvertToAscii(szCommand);
 		return fpLSExecute(Owner, asc.c_str(), nShowCmd);
 	}
 	return ExecuteCommand(Owner, szCommand, nShowCmd, L"open");
 }
 HINSTANCE ExecuteCommand(HWND Owner, LPCTSTR szCommand, int nShowCmd, LPCTSTR szVerb)
 {
 	// The stub implementation (some of this code is taken from lsapi.cpp)
-	if (szCommand == NULL || *szCommand == 0) return NULL;
+	if (szCommand == NULL || *szCommand == 0) return;
 	std::wstring args;
 	std::wstring command = szCommand;
 	size_t notwhite = command.find_first_not_of(L" \t\r\n");
 	command.erase(0, notwhite);
-	if (command.empty()) return NULL;
+	if (command.empty()) return;
 	size_t quotePos = command.find(L'"');
 	if (quotePos == 0)
@@ -380,11 +213,12 @@ HINSTANCE ExecuteCommand(HWND Owner, LPCTSTR szCommand, int nShowCmd, LPCTSTR sz
 	if (!command.empty())
 	{
 		LPCWSTR szVerb = asAdmin ? L"runas" : L"open";
 		DWORD type = GetFileAttributes(command.c_str());
 		if (type & FILE_ATTRIBUTE_DIRECTORY && type != 0xFFFFFFFF)
 		{
-			HINSTANCE instance = ShellExecute(Owner, szVerb, command.c_str(), NULL, NULL, nShowCmd ? nShowCmd : SW_SHOWNORMAL);
+			ShellExecute(Owner, szVerb, command.c_str(), NULL, NULL, nShowCmd ? nShowCmd : SW_SHOWNORMAL);
-			return instance;
+			return;
 		}
 		std::wstring dir = CRainmeter::ExtractPath(command);
@@ -398,11 +232,6 @@ HINSTANCE ExecuteCommand(HWND Owner, LPCTSTR szCommand, int nShowCmd, LPCTSTR sz
 		si.nShow = nShowCmd ? nShowCmd : SW_SHOWNORMAL;
 		si.fMask = SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI;
 		ShellExecuteEx(&si);
 		return si.hInstApp;
 	}
 	else
 	{
 		return (HINSTANCE)SE_ERR_FNF;
 	}
 }
@@ -556,10 +385,7 @@ BOOL LogInternal(int nLevel, LPCTSTR pszModule, ULONGLONG elapsed, LPCTSTR pszMe
 	WCHAR buffer[128];
 	_snwprintf_s(buffer, _TRUNCATE, L"%02llu:%02llu:%02llu.%03llu", elapsed / (1000 * 60 * 60), (elapsed / (1000 * 60)) % 60, (elapsed / 1000) % 60, elapsed % 1000);
-	if (Rainmeter)
+	Rainmeter->AddAboutLogInfo(nLevel, buffer, pszMessage);
 	{
 		Rainmeter->AddAboutLogInfo(nLevel, buffer, pszMessage);
 	}
 	std::wstring message = L"(";
 	message += buffer;
@@ -571,16 +397,8 @@ BOOL LogInternal(int nLevel, LPCTSTR pszModule, ULONGLONG elapsed, LPCTSTR pszMe
 	_RPT0(_CRT_WARN, "\n");
 #endif
 	// Use the lsapi.dll version of the method if possible
 	if (fpLSLog)
 	{
 		std::string asc = ConvertToAscii(message.c_str());
 		std::string mod = ConvertToAscii(pszModule);
 		return fpLSLog(nLevel, mod.c_str(), asc.c_str());
 	}
 	// The stub implementation
-	if (Rainmeter && Rainmeter->GetLogging())
+	if (Rainmeter->GetLogging())
 	{
 		std::wstring logfile = Rainmeter->GetLogFile();
 		if (logFound == 0)
--- a/Library/Litestep.h
+++ b/Library/Litestep.h
@@ -25,31 +25,13 @@
 #include "Error.h"
 #include "Export.h"
 #define magicDWord             0x49474541
 #define LM_GETREVID            9265
 #define LM_REGISTERMESSAGE     9263
 #define LM_UNREGISTERMESSAGE   9264
 typedef void (BangCommand)(HWND sender, LPCSTR args);
 // Call this if you want to use lsapi.dll's functions instead of stubs
 void InitalizeLitestep();
 void FinalizeLitestep();
 // The stubs
 BOOL AddBangCommand(LPCSTR command, BangCommand f);
 HRGN BitmapToRegion(HBITMAP hBmp, COLORREF cTransparentColor, COLORREF cTolerance, int xoffset, int yoffset);
 HWND GetLitestepWnd(void);
 BOOL GetRCString(LPCSTR lpKeyName, LPSTR value, LPCSTR defStr, int maxLen);
 //int GetRCInt(LPCSTR lpKeyName, int nDefault);
 BOOL RemoveBangCommand(LPCSTR command);
 //void TransparentBltLS (HDC dc, int nXDest, int nYDest, int nWidth, int nHeight, HDC tempDC, int nXSrc, int nYSrc, COLORREF colorTransparent);
 void VarExpansion(LPSTR buffer, LPCSTR value);
 //void LSSetVariable(const BSTR name, const BSTR value);
 void ResetLoggingFlag();
 HRGN BitmapToRegion(HBITMAP hBmp, COLORREF cTransparentColor, COLORREF cTolerance, int xoffset, int yoffset);
 std::string ConvertToAscii(LPCTSTR str);
 std::wstring ConvertToWide(LPCSTR str);
 std::string ConvertToUTF8(LPCWSTR str);
@@ -59,9 +41,7 @@ void Log(int nLevel, const WCHAR* message, const WCHAR* module = L"Rainmeter");
 void LogWithArgs(int nLevel, const WCHAR* format, ... );	// Replacement for DebugLog(), has the same functionality but has the option to set teh Log Level.
 void LogError(CError& error);
-HINSTANCE LSExecute(HWND Owner, LPCTSTR szCommand, int nShowCmd);
+void RunCommand(HWND Owner, LPCTSTR szCommand, int nShowCmd, bool asAdmin = false);
 //HINSTANCE LSExecuteAsAdmin(HWND Owner, LPCTSTR szCommand, int nShowCmd);
 HINSTANCE ExecuteCommand(HWND Owner, LPCTSTR szCommand, int nShowCmd, LPCTSTR szVerb);
 WCHAR* GetString(UINT id);
 std::wstring GetFormattedString(UINT id, ...);
--- a/Library/Measure.cpp
+++ b/Library/Measure.cpp
@@ -433,7 +433,6 @@ std::wstring CMeasure::ExtractWord(std::wstring& buffer)
 	return ret;
 }
 /*
 ** PreUpdate
 **
--- a/Library/MeasureNet.cpp
+++ b/Library/MeasureNet.cpp
@@ -110,7 +110,7 @@ void CMeasureNet::UpdateIFTable()
 				logging = true;
 			}
-			if (CRainmeter::GetDebug() && logging)
+			if (Rainmeter->GetDebug() && logging)
 			{
 				Log(LOG_DEBUG, L"------------------------------");
 				LogWithArgs(LOG_DEBUG, L"* NETWORK-INTERFACE: Count=%i", c_NumOfTables);
@@ -206,7 +206,7 @@ void CMeasureNet::UpdateIFTable()
 					logging = true;
 				}
-				if (CRainmeter::GetDebug() && logging)
+				if (Rainmeter->GetDebug() && logging)
 				{
 					Log(LOG_DEBUG, L"------------------------------");
 					LogWithArgs(LOG_DEBUG, L"* NETWORK-INTERFACE: Count=%i", c_NumOfTables);
@@ -467,17 +467,17 @@ void CMeasureNet::ReadConfig(CConfigParser& parser, const WCHAR* section, NET ne
 	if (net == NET_IN)
 	{
 		netName = L"NetInSpeed";
-		value = CRainmeter::GetGlobalConfig().netInSpeed;
+		value = Rainmeter->GetGlobalConfig().netInSpeed;
 	}
 	else if (net == NET_OUT)
 	{
 		netName = L"NetOutSpeed";
-		value = CRainmeter::GetGlobalConfig().netOutSpeed;
+		value = Rainmeter->GetGlobalConfig().netOutSpeed;
 	}
 	else
 	{
 		netName = L"NetTotalSpeed";
-		value = CRainmeter::GetGlobalConfig().netInSpeed + CRainmeter::GetGlobalConfig().netOutSpeed;
+		value = Rainmeter->GetGlobalConfig().netInSpeed + Rainmeter->GetGlobalConfig().netOutSpeed;
 	}
 	double maxValue = parser.ReadFloat(section, L"MaxValue", -1);
@@ -716,7 +716,7 @@ void CMeasureNet::InitializeNewApi()
 		}
 	}
-	if (CRainmeter::GetDebug())
+	if (Rainmeter->GetDebug())
 	{
 		UpdateIFTable();
 	}
--- a/Library/MeasurePlugin.cpp
+++ b/Library/MeasurePlugin.cpp
@@ -123,7 +123,7 @@ void CMeasurePlugin::ReadConfig(CConfigParser& parser, const WCHAR* section)
 	if (m_Plugin == NULL)
 	{
-		if (CRainmeter::GetDebug())
+		if (Rainmeter->GetDebug())
 		{
 			LogWithArgs(LOG_ERROR, L"Plugin: Unable to load \"%s\" (%u)", m_PluginName.c_str(), err);
 		}
@@ -140,7 +140,7 @@ void CMeasurePlugin::ReadConfig(CConfigParser& parser, const WCHAR* section)
 			if (m_Plugin == NULL)
 			{
-				if (CRainmeter::GetDebug())
+				if (Rainmeter->GetDebug())
 				{
 					LogWithArgs(LOG_ERROR, L"Plugin: Unable to load \"%s\" (%u)", pluginName.c_str(), err);
 				}
@@ -175,14 +175,9 @@ void CMeasurePlugin::ReadConfig(CConfigParser& parser, const WCHAR* section)
 	m_ID = id++;
 	if (InitializeFunc)
 	{
 		// Remove current directory from DLL search path
 		SetDllDirectory(L"");
 		double maxValue;
 		maxValue = InitializeFunc(m_Plugin, parser.GetFilename().c_str(), section, m_ID);
 		// Reset to default
 		SetDllDirectory(L"");
 		CSystem::ResetWorkingDirectory();
 		const std::wstring& szMaxValue = parser.ReadString(section, L"MaxValue", L"");
--- a/Library/MeterWindow.cpp
+++ b/Library/MeterWindow.cpp
@@ -269,10 +269,6 @@ int CMeterWindow::Initialize(CRainmeter& Rainmeter)
 		throw CError(L"Unable to register window!", __LINE__, __FILE__);
 	}
 #ifndef _WIN64
 	SetWindowLong(m_Window, GWL_USERDATA, magicDWord);
 #endif
 	setlocale(LC_NUMERIC, "C");
 	// Mark the window to ignore the Aero peek
@@ -879,33 +875,6 @@ void CMeterWindow::RunBang(BANGCOMMAND bang, const WCHAR* arg)
 		}
 		break;
 	case BANG_LSHOOK:
 		{
 			pos = wcsrchr(arg, L' ');
 			if (pos != NULL)
 			{
 #ifdef _WIN64
 				HWND hWnd = (HWND)_wtoi64(pos);
 #else
 				HWND hWnd = (HWND)_wtoi(pos);
 #endif
 				if (hWnd)
 				{
 					// Disable native transparency
 					m_NativeTransparency = false;
 					UpdateTransparency(m_AlphaValue, true);
 					SetWindowLong(m_Window, GWL_STYLE, (GetWindowLong(m_Window, GWL_STYLE) &~ WS_POPUP) | WS_CHILD);
 					SetParent(m_Window, hWnd);
 					m_ChildWindow = true;
 				}
 			}
 			else
 			{
 				LogWithArgs(LOG_ERROR, L"!LsBoxHook: Invalid parameters (%s)", arg);
 			}
 		}
 		break;
 	case BANG_MOVEMETER:
 		pos = wcschr(arg, L' ');
 		if (pos != NULL)
@@ -1920,21 +1889,6 @@ void CMeterWindow::ReadConfig()
 		m_AnchorX = parser.ReadString(section, L"AnchorX", m_AnchorX.c_str());
 		m_AnchorY = parser.ReadString(section, L"AnchorY", m_AnchorY.c_str());
 		if (!m_Rainmeter->GetDummyLitestep())
 		{
 			char* tmpSz = new char[MAX_LINE_LENGTH];
 			// Check if step.rc has overrides these values
 			if (GetRCString("RainmeterWindowX", tmpSz, ConvertToAscii(m_WindowX.c_str()).c_str(), MAX_LINE_LENGTH - 1))
 			{
 				m_WindowX = ConvertToWide(tmpSz);
 			}
 			if (GetRCString("RainmeterWindowY", tmpSz, ConvertToAscii(m_WindowY.c_str()).c_str(), MAX_LINE_LENGTH - 1))
 			{
 				m_WindowY = ConvertToWide(tmpSz);
 			}
 			delete [] tmpSz;
 		}
 		// Check if the window position should be read as a formula
 		double value;
 		if (!m_WindowX.empty() && m_WindowX[0] == L'(' && m_WindowX[m_WindowX.size() - 1] == L')')
@@ -3624,7 +3578,7 @@ LRESULT CMeterWindow::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			std::wstring command = m_SkinPath + m_SkinName;
 			command += L"\\";
 			command += m_SkinIniFile;
-			HANDLE file = CreateFile(command.c_str(), GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+			HANDLE file = CreateFile(command.c_str(), GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
 			command.insert(0, L" \"");
 			command.insert(0, m_Rainmeter->GetConfigEditor());
@@ -3633,12 +3587,12 @@ LRESULT CMeterWindow::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			if (file == INVALID_HANDLE_VALUE)
 			{
 				// File is in protected location, so execute as admin
-				ExecuteCommand(NULL, command.c_str(), SW_SHOWNORMAL, L"runas");
+				RunCommand(NULL, command.c_str(), SW_SHOWNORMAL, true);
 			}
 			else
 			{
 				CloseHandle(file);
-				LSExecute(NULL, command.c_str(), SW_SHOWNORMAL);
+				RunCommand(NULL, command.c_str(), SW_SHOWNORMAL);
 			}
 		}
 		else if (wParam == ID_CONTEXT_SKINMENU_REFRESH)
@@ -3650,7 +3604,7 @@ LRESULT CMeterWindow::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			std::wstring command = L"\"" + m_SkinPath;
 			command += m_SkinName;
 			command += L"\"";
-			LSExecute(NULL, command.c_str(), SW_SHOWNORMAL);
+			RunCommand(NULL, command.c_str(), SW_SHOWNORMAL);
 		}
 		else if (wParam == ID_CONTEXT_SKINMENU_MANAGESKIN)
 		{
--- a/Library/MeterWindow.h
+++ b/Library/MeterWindow.h
@@ -148,7 +148,6 @@ enum BANGCOMMAND
 	BANG_DISABLEMEASUREGROUP,
 	BANG_UPDATEMEASUREGROUP,
 	BANG_LSHOOK,
 	BANG_PLUGIN,
 	BANG_SETVARIABLE,
 	BANG_SETOPTION,
--- a/Library/Rainmeter.cpp
+++ b/Library/Rainmeter.cpp
--- a/Library/Rainmeter.h
+++ b/Library/Rainmeter.h
@@ -39,95 +39,19 @@
 #define WIDEN(x) WIDEN2(x)
 #define APPDATE WIDEN(__DATE__)
-// Callbacks for Litestep
+// Callbacks
-void RainmeterRefresh(HWND, const char* arg);
+void RainmeterActivateConfig(const WCHAR* arg);
-void RainmeterRefreshApp(HWND, const char* arg);
+void RainmeterDeactivateConfig(const WCHAR* arg);
-void RainmeterRedraw(HWND, const char* arg);
+void RainmeterToggleConfig(const WCHAR* arg);
-void RainmeterUpdate(HWND, const char* arg);
+void RainmeterDeactivateConfigGroup(const WCHAR* arg);
-void RainmeterShow(HWND, const char* arg);
+void RainmeterRefreshApp();
-void RainmeterHide(HWND, const char* arg);
+void RainmeterAbout(const WCHAR* arg = NULL);
-void RainmeterToggle(HWND, const char* arg);
+void RainmeterManage(const WCHAR* arg = NULL);
-void RainmeterShowFade(HWND, const char* arg);
+void RainmeterSkinMenu(const WCHAR* arg);
 void RainmeterHideFade(HWND, const char* arg);
 void RainmeterToggleFade(HWND, const char* arg);
 void RainmeterShowBlur(HWND, const char* arg);
 void RainmeterHideBlur(HWND, const char* arg);
 void RainmeterToggleBlur(HWND, const char* arg);
 void RainmeterAddBlur(HWND, const char* arg);
 void RainmeterRemoveBlur(HWND, const char* arg);
 void RainmeterShowMeter(HWND, const char* arg);
 void RainmeterHideMeter(HWND, const char* arg);
 void RainmeterToggleMeter(HWND, const char* arg);
 void RainmeterMoveMeter(HWND, const char* arg);
 void RainmeterUpdateMeter(HWND, const char* arg);
 void RainmeterEnableMeasure(HWND, const char* arg);
 void RainmeterDisableMeasure(HWND, const char* arg);
 void RainmeterToggleMeasure(HWND, const char* arg);
 void RainmeterUpdateMeasure(HWND, const char* arg);
 void RainmeterCommandMeasure(HWND, const char* arg);
 void RainmeterActivateConfig(HWND, const char* arg);
 void RainmeterDeactivateConfig(HWND, const char* arg);
 void RainmeterToggleConfig(HWND, const char* arg);
 void RainmeterMove(HWND, const char* arg);
 void RainmeterZPos(HWND, const char* arg);
 void RainmeterClickThrough(HWND, const char* arg);
 void RainmeterDraggable(HWND, const char* arg);
 void RainmeterSnapEdges(HWND, const char* arg);
 void RainmeterKeepOnScreen(HWND, const char* arg);
 void RainmeterSetTransparency(HWND, const char* arg);
 void RainmeterSetVariable(HWND, const char* arg);
 void RainmeterSetOption(HWND, const char* arg);
 void RainmeterRefreshGroup(HWND, const char* arg);
 void RainmeterRedrawGroup(HWND, const char* arg);
 void RainmeterUpdateGroup(HWND, const char* arg);
 void RainmeterShowGroup(HWND, const char* arg);
 void RainmeterHideGroup(HWND, const char* arg);
 void RainmeterToggleGroup(HWND, const char* arg);
 void RainmeterShowFadeGroup(HWND, const char* arg);
 void RainmeterHideFadeGroup(HWND, const char* arg);
 void RainmeterToggleFadeGroup(HWND, const char* arg);
 void RainmeterShowMeterGroup(HWND, const char* arg);
 void RainmeterHideMeterGroup(HWND, const char* arg);
 void RainmeterToggleMeterGroup(HWND, const char* arg);
 void RainmeterUpdateMeterGroup(HWND, const char* arg);
 void RainmeterEnableMeasureGroup(HWND, const char* arg);
 void RainmeterDisableMeasureGroup(HWND, const char* arg);
 void RainmeterToggleMeasureGroup(HWND, const char* arg);
 void RainmeterUpdateMeasureGroup(HWND, const char* arg);
 void RainmeterDeactivateConfigGroup(HWND, const char* arg);
 void RainmeterZPosGroup(HWND, const char* arg);
 void RainmeterClickThroughGroup(HWND, const char* arg);
 void RainmeterDraggableGroup(HWND, const char* arg);
 void RainmeterSnapEdgesGroup(HWND, const char* arg);
 void RainmeterKeepOnScreenGroup(HWND, const char* arg);
 void RainmeterSetTransparencyGroup(HWND, const char* arg);
 void RainmeterSetVariableGroup(HWND, const char* arg);
 void RainmeterSetOptionGroup(HWND, const char* arg);
 void RainmeterLsHook(HWND, const char* arg);
 void RainmeterAbout(HWND, const char* arg);
 void RainmeterManage(HWND, const char* arg);
 void RainmeterSkinMenu(HWND, const char* arg);
 void RainmeterTrayMenu(HWND, const char* arg);
 void RainmeterResetStats(HWND, const char* arg);
 void RainmeterWriteKeyValue(HWND, const char* arg);
 void RainmeterPluginBang(HWND, const char* arg);
 void RainmeterQuit(HWND, const char* arg);
 // Callbacks for Unicode support
 void RainmeterActivateConfigWide(const WCHAR* arg);
 void RainmeterDeactivateConfigWide(const WCHAR* arg);
 void RainmeterToggleConfigWide(const WCHAR* arg);
 void RainmeterDeactivateConfigGroupWide(const WCHAR* arg);
 void RainmeterRefreshAppWide();
 void RainmeterAboutWide(const WCHAR* arg = NULL);
 void RainmeterManageWide(const WCHAR* arg = NULL);
 void RainmeterSkinMenuWide(const WCHAR* arg);
 void RainmeterTrayMenuWide();
-void RainmeterResetStatsWide();
+void RainmeterResetStats();
-void RainmeterWriteKeyValueWide(const WCHAR* arg);
+void RainmeterWriteKeyValue(const WCHAR* arg);
-void RainmeterQuitWide();
+void RainmeterQuit();
 void BangWithArgs(BANGCOMMAND bang, const WCHAR* arg, size_t numOfArgs);
 void BangGroupWithArgs(BANGCOMMAND bang, const WCHAR* arg, size_t numOfArgs);
@@ -169,8 +93,8 @@ public:
 	CRainmeter();
 	~CRainmeter();
-	int Initialize(HWND Parent, HINSTANCE Instance, LPCSTR szPath);
+	int Initialize(HWND hParent, HINSTANCE hInstance, LPCWSTR szPath);
-	void Quit(HINSTANCE dllInst);
+	static void Quit();
 	CConfigParser* GetCurrentParser() { return m_CurrentParser; }
 	void SetCurrentParser(CConfigParser* parser) { m_CurrentParser = parser; }
@@ -208,13 +132,9 @@ public:
 	HINSTANCE GetInstance() { return m_Instance; }
 	HINSTANCE GetResourceInstance() { return m_ResourceInstance; }
-	static void SetDummyLitestep(bool Dummy) { c_DummyLitestep = Dummy; }
+	bool GetDebug() { return m_Debug; }
 	static bool GetDummyLitestep() { return c_DummyLitestep; }
 	static void SetCommandLine(LPCTSTR CmdLine) { c_CmdLine = CmdLine;}
 	static LPCTSTR GetCommandLine() { return c_CmdLine.c_str(); }
 	static GlobalConfig& GetGlobalConfig() { return c_GlobalConfig; }
-	static bool GetDebug() { return c_Debug; }
+	GlobalConfig& GetGlobalConfig() { return m_GlobalConfig; }
 	void ReloadSettings();
@@ -319,6 +239,8 @@ private:
 	std::wstring m_TrayExecuteDR;
 	std::wstring m_TrayExecuteDM;
 	bool m_Debug;
 	bool m_DisableVersionCheck;
 	bool m_NewVersion;
@@ -349,24 +271,9 @@ private:
 	std::list<CMeterWindow*> m_DelayDeleteList;
-	static bool c_DummyLitestep;	// true, if not a Litestep plugin
+	GlobalConfig m_GlobalConfig;
 	static std::wstring c_CmdLine;	// The command line arguments
 	static GlobalConfig c_GlobalConfig;
 	static bool c_Debug;
 };
-#ifdef LIBRARY_EXPORTS
+void ExecuteBang(LPCTSTR szBang);
 #define EXPORT_PLUGIN __declspec(dllexport)
 #else
 #define EXPORT_PLUGIN __declspec(dllimport)
 #endif
 extern "C"
 {
 	EXPORT_PLUGIN int initModuleEx(HWND ParentWnd, HINSTANCE dllInst, LPCSTR szPath);
 	EXPORT_PLUGIN void quitModule(HINSTANCE dllInst);
 	EXPORT_PLUGIN void Initialize(bool DummyLS, LPCTSTR CmdLine);
 	EXPORT_PLUGIN void ExecuteBang(LPCTSTR szBang);
 }
 #endif
--- a/Library/Res/window.ico
+++ b/Library/Res/window.ico
--- a/Library/System.cpp
+++ b/Library/System.cpp
@@ -99,11 +99,6 @@ void CSystem::Initialize(HINSTANCE instance)
 		instance,
 		NULL);
 #ifndef _WIN64
 	SetWindowLong(c_Window, GWL_USERDATA, magicDWord);
 	SetWindowLong(c_HelperWindow, GWL_USERDATA, magicDWord);
 #endif
 	SetWindowPos(c_Window, HWND_BOTTOM, 0, 0, 0, 0, ZPOS_FLAGS);
 	SetWindowPos(c_HelperWindow, HWND_BOTTOM, 0, 0, 0, 0, ZPOS_FLAGS);
@@ -172,7 +167,7 @@ BOOL CALLBACK MyInfoEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonit
 	info.cbSize = sizeof(MONITORINFOEX);
 	GetMonitorInfo(hMonitor, &info);
-	if (CRainmeter::GetDebug())
+	if (Rainmeter->GetDebug())
 	{
 		Log(LOG_DEBUG, info.szDevice);
 		LogWithArgs(LOG_DEBUG, L"  Flags    : %s(0x%08X)", (info.dwFlags & MONITORINFOF_PRIMARY) ? L"PRIMARY " : L"", info.dwFlags);
@@ -256,7 +251,7 @@ size_t CSystem::GetMonitorCount()
 void CSystem::SetMultiMonitorInfo()
 {
 	std::vector<MONITOR_INFO>& monitors = c_Monitors.monitors;
-	bool logging = CRainmeter::GetDebug();
+	bool logging = Rainmeter->GetDebug();
 	c_Monitors.vsT = GetSystemMetrics(SM_YVIRTUALSCREEN);
 	c_Monitors.vsL = GetSystemMetrics(SM_XVIRTUALSCREEN);
@@ -532,7 +527,7 @@ void CSystem::UpdateWorkareaInfo()
 			monitors[i].work = info.rcWork;
-			if (CRainmeter::GetDebug())
+			if (Rainmeter->GetDebug())
 			{
 				LogWithArgs(LOG_DEBUG, L"WorkArea@%i : L=%i, T=%i, R=%i, B=%i (W=%i, H=%i)",
 					(int)i + 1,
@@ -651,7 +646,7 @@ bool CSystem::BelongToSameProcess(HWND hwndA, HWND hwndB)
 */
 BOOL CALLBACK MyEnumWindowsProc(HWND hwnd, LPARAM lParam)
 {
-	bool logging = CRainmeter::GetDebug() && DEBUG_VERBOSE;
+	bool logging = Rainmeter->GetDebug() && DEBUG_VERBOSE;
 	WCHAR className[64];
 	CMeterWindow* Window;
 	WCHAR flag;
@@ -703,7 +698,7 @@ void CSystem::ChangeZPosInOrder()
 {
 	if (Rainmeter)
 	{
-		bool logging = CRainmeter::GetDebug() && DEBUG_VERBOSE;
+		bool logging = Rainmeter->GetDebug() && DEBUG_VERBOSE;
 		std::vector<CMeterWindow*> windowsInZOrder;
 		if (logging) Log(LOG_DEBUG, L"1: ----- BEFORE -----");
@@ -752,7 +747,7 @@ void CSystem::ChangeZPosInOrder()
 */
 void CSystem::PrepareHelperWindow(HWND WorkerW)
 {
-	bool logging = CRainmeter::GetDebug() && DEBUG_VERBOSE;
+	bool logging = Rainmeter->GetDebug() && DEBUG_VERBOSE;
 	SetWindowPos(c_Window, HWND_BOTTOM, 0, 0, 0, 0, ZPOS_FLAGS);  // always on bottom
@@ -837,7 +832,7 @@ bool CSystem::CheckDesktopState(HWND WorkerW)
 	{
 		c_ShowDesktop = !c_ShowDesktop;
-		if (CRainmeter::GetDebug())
+		if (Rainmeter->GetDebug())
 		{
 			LogWithArgs(LOG_DEBUG, L"System: \"Show %s\" has been detected.",
 				c_ShowDesktop ? L"desktop" : L"open windows");
@@ -1049,38 +1044,30 @@ ULONGLONG CSystem::GetTickCount64()
 **
 ** This function is a wrapper function for LoadLibrary().
 **
 ** Avoids loading a DLL from current directory.
 **
 */
 HMODULE CSystem::RmLoadLibrary(LPCWSTR lpLibFileName, DWORD* dwError, bool ignoreErrors)
 {
 	HMODULE hLib = NULL;
 	DWORD err;
 	UINT oldMode;
 	if (ignoreErrors)
 	{
 		oldMode = SetErrorMode(0);
 		SetErrorMode(oldMode | SEM_FAILCRITICALERRORS);  // Prevent the system from displaying message box
 	}
 	// Remove current directory from DLL search path
 	SetDllDirectory(L"");
 	SetLastError(ERROR_SUCCESS);
-	hLib = LoadLibrary(lpLibFileName);
+	HMODULE hLib = LoadLibrary(lpLibFileName);
-	err = GetLastError();
+
 	if (dwError)
 	{
 		*dwError = GetLastError();
 	}
 	if (ignoreErrors)
 	{
 		SetErrorMode(oldMode);  // Reset
 	}
 	if (dwError)
 	{
 		*dwError = err;
 	}
 	return hLib;
 }
--- a/Library/TrayWindow.cpp
+++ b/Library/TrayWindow.cpp
@@ -82,10 +82,6 @@ CTrayWindow::CTrayWindow(HINSTANCE instance) : m_Instance(instance),
 		instance,
 		this);
 #ifndef _WIN64
 	SetWindowLong(m_Window, GWL_USERDATA, magicDWord);
 #endif
 	SetWindowPos(m_Window, HWND_BOTTOM, 0, 0, 0, 0, ZPOS_FLAGS);
 }
@@ -428,11 +424,11 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			}
 			else if (wParam == ID_CONTEXT_SHOW_HELP)
 			{
-				LSExecute(NULL, revision_beta ? RAINMETER_MANUALBETA : RAINMETER_MANUAL, SW_SHOWNORMAL);
+				RunCommand(NULL, revision_beta ? RAINMETER_MANUALBETA : RAINMETER_MANUAL, SW_SHOWNORMAL);
 			}
 			else if (wParam == ID_CONTEXT_NEW_VERSION)
 			{
-				LSExecute(NULL, RAINMETER_OFFICIAL, SW_SHOWNORMAL);
+				RunCommand(NULL, RAINMETER_OFFICIAL, SW_SHOWNORMAL);
 			}
 			else if (wParam == ID_CONTEXT_REFRESH)
 			{
@@ -445,7 +441,7 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				if (_waccess(log.c_str(), 0) != -1)
 				{
 					std::wstring command = Rainmeter->GetLogViewer() + log;
-					LSExecute(tray->GetWindow(), command.c_str(), SW_SHOWNORMAL);
+					RunCommand(tray->GetWindow(), command.c_str(), SW_SHOWNORMAL);
 				}
 			}
 			else if (wParam == ID_CONTEXT_STARTLOG)
@@ -462,7 +458,7 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			}
 			else if (wParam == ID_CONTEXT_DEBUGLOG)
 			{
-				Rainmeter->SetDebug(!CRainmeter::GetDebug());
+				Rainmeter->SetDebug(!Rainmeter->GetDebug());
 			}
 			else if (wParam == ID_CONTEXT_DISABLEDRAG)
 			{
@@ -473,18 +469,18 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				std::wstring command = Rainmeter->GetConfigEditor() + L" \"";
 				command += Rainmeter->GetIniFile();
 				command += L"\"";
-				LSExecute(tray->GetWindow(), command.c_str(), SW_SHOWNORMAL);
+				RunCommand(tray->GetWindow(), command.c_str(), SW_SHOWNORMAL);
 			}
 			else if (wParam == ID_CONTEXT_QUIT)
 			{
-				if (Rainmeter->GetDummyLitestep()) PostQuitMessage(0);
+				PostQuitMessage(0);
-				quitModule(Rainmeter->GetInstance());
+				CRainmeter::Quit();
 			}
 			else if (wParam == ID_CONTEXT_OPENSKINSFOLDER)
 			{
 				std::wstring command = L"\"" + Rainmeter->GetSkinPath();
 				command += L"\"";
-				LSExecute(tray->GetWindow(), command.c_str(), SW_SHOWNORMAL);
+				RunCommand(tray->GetWindow(), command.c_str(), SW_SHOWNORMAL);
 			}
 			else if ((wParam & 0x0ffff) >= ID_THEME_FIRST && (wParam & 0x0ffff) <= ID_THEME_LAST)
 			{
@@ -590,7 +586,7 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				GetCursorPos(&point);
 				Rainmeter->ShowContextMenu(point, NULL);
 			}
-			else if (uMouseMsg == WM_LBUTTONDOWN || uMouseMsg == WM_LBUTTONDBLCLK)
+			else if (uMouseMsg == WM_LBUTTONDOWN)
 			{
 				CDialogManage::Open();
 			}
@@ -674,18 +670,6 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				return 0;
 			}
 			else if (wParam == RAINMETER_QUERY_ID_COMMAND_LINE)
 			{
 				std::wstring commandline = Rainmeter->GetCommandLine();
 				cds.dwData = RAINMETER_QUERY_ID_COMMAND_LINE;
 				cds.cbData = (DWORD)((commandline.size() + 1) * sizeof(wchar_t));
 				cds.lpData = (LPVOID) commandline.c_str();
 				SendMessage((HWND)lParam, WM_COPYDATA, (WPARAM)hWnd, (LPARAM)&cds);
 				return 0;
 			}
 			else if (wParam == RAINMETER_QUERY_ID_VERSION_CHECK)
 			{
 				UINT versioncheck = ((int)Rainmeter->GetDisableVersionCheck() * ((int)Rainmeter->GetDisableVersionCheck() + (int)Rainmeter->GetNewVersion()));
@@ -788,9 +772,7 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			}
 			else if (wParam == RAINMETER_QUERY_ID_IS_LITESTEP)
 			{
-				BOOL islitestep = !Rainmeter->GetDummyLitestep();
+				SendMessage((HWND)lParam, WM_QUERY_RAINMETER_RETURN, (WPARAM)hWnd, (LPARAM)0);
 				SendMessage((HWND)lParam, WM_QUERY_RAINMETER_RETURN, (WPARAM)hWnd, (LPARAM)islitestep);
 				return 0;
 			}
@@ -842,29 +824,8 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 		return 0;
 	case WM_DESTROY:
-		if (Rainmeter->GetDummyLitestep()) PostQuitMessage(0);
+		PostQuitMessage(0);
 		break;
 	case LM_GETREVID:
 		if (lParam != NULL)
 		{
 			char* Buffer = (char*)lParam;
 			if (wParam == 0)
 			{
 				sprintf(Buffer, "Rainmeter.dll: %s", APPVERSION);
 			}
 			else if (wParam == 1)
 			{
 				sprintf(Buffer, "Rainmeter.dll: %s %s, Rainy", APPVERSION, __DATE__);
 			}
 			else
 			{
 				Buffer[0] = 0;
 			}
 			return strlen(Buffer);
 		}
 		return 0;
 	}
 	return DefWindowProc(hWnd, uMsg, wParam, lParam);
--- a/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj
+++ b/Plugins/PluginAdvancedCPU/PluginAdvancedCPU.vcxproj
@@ -95,7 +95,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginAdvancedCPU_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginAdvancedCPU_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -118,7 +118,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/AdvancedCPU.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/AdvancedCPU.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/AdvancedCPU.lib</ImportLibrary>
@@ -142,7 +142,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginAdvancedCPU_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginAdvancedCPU_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -164,7 +164,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/AdvancedCPU.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/AdvancedCPU.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/AdvancedCPU.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
@@ -210,6 +210,7 @@
      <ProgramDatabaseFile>.\x32/Debug/AdvancedCPU.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/AdvancedCPU.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -249,6 +250,7 @@
      <ProgramDatabaseFile>.\x64/Debug/AdvancedCPU.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/AdvancedCPU.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj
+++ b/Plugins/PluginCoreTemp/PluginCoreTemp.vcxproj
@@ -116,7 +116,7 @@
    <Link>
      <OutputFile>../../TestBench/x32/Debug/Plugins/CoreTemp.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Debug/CoreTemp.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/CoreTemp.lib</ImportLibrary>
@@ -160,6 +160,7 @@
      <ProgramDatabaseFile>.\x64/Debug/CoreTemp.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/CoreTemp.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -175,7 +176,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginCoreTemp_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginCoreTemp_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -198,7 +199,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/CoreTemp.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/CoreTemp.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/CoreTemp.lib</ImportLibrary>
@@ -222,7 +223,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginCoreTemp_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginCoreTemp_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -244,7 +245,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/CoreTemp.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x64/Release/CoreTemp.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/CoreTemp.lib</ImportLibrary>
--- a/Plugins/PluginExample/PluginExample.vcxproj
+++ b/Plugins/PluginExample/PluginExample.vcxproj
@@ -95,7 +95,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGINEXAMPLE_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGINEXAMPLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -118,7 +118,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/ExamplePlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/ExamplePlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/ExamplePlugin.lib</ImportLibrary>
@@ -142,7 +142,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGINEXAMPLE_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGINEXAMPLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -164,7 +164,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/ExamplePlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/ExamplePlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/ExamplePlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
@@ -210,6 +210,7 @@
      <ProgramDatabaseFile>.\x32/Debug/ExamplePlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/ExamplePlugin.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -249,6 +250,7 @@
      <ProgramDatabaseFile>.\x64/Debug/ExamplePlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/ExamplePlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp
+++ b/Plugins/PluginFolderInfo/FolderInfoPlugin.cpp
@@ -65,7 +65,6 @@ typedef std::map<UINT, MeasureInfo*> MeasureIdMap; // measure ID -> MeasureInfo
 static MeasureIdMap sMeasures;
 typedef std::map<FolderInfo*, UINT> FolderInfoMap; // FolderInfo -> ref count
 static FolderInfoMap sFolderRefCount;
 static bool sInitialized = false;
 static MeasureInfo* GetMeasureInfo(UINT aId)
 {
@@ -109,10 +108,6 @@ static FolderInfo* GetFolderInfo(const wchar_t* aPath, const wchar_t* aIniPath)
 */
 UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id)
 {
 	if (!sInitialized) {
 		sInitialized = true;
 	}
 	MeasureInfo* measureInfo = new MeasureInfo(section);
 	const wchar_t* strFolder = ReadConfigString(section, L"Folder", L"");
@@ -136,17 +131,17 @@ UINT Initialize(HMODULE instance, LPCTSTR iniFile, LPCTSTR section, UINT id)
 		}
 		const wchar_t* strIncludeSubFolders = ReadConfigString(section, L"IncludeSubFolders", L"");
-		if (_wcsicmp(strIncludeSubFolders, L"1") == 0) {
+		if (wcscmp(strIncludeSubFolders, L"1") == 0) {
 			measureInfo->Folder->IncludeSubFolders(true);
 		}
 		const wchar_t* strShowHiddenFiles = ReadConfigString(section, L"IncludeHiddenFiles", L"");
-		if (_wcsicmp(strShowHiddenFiles, L"1") == 0) {
+		if (wcscmp(strShowHiddenFiles, L"1") == 0) {
 			measureInfo->Folder->IncludeHiddenFiles(true);
 		}
 		const wchar_t* strShowSystemFiles = ReadConfigString(section, L"IncludeSystemFiles", L"");
-		if (_wcsicmp(strShowSystemFiles, L"1") == 0) {
+		if (wcscmp(strShowSystemFiles, L"1") == 0) {
 			measureInfo->Folder->IncludeSystemFiles(true);
 		}
@@ -176,15 +171,17 @@ double Update2(UINT id)
 	switch (measureInfo->Type)
 	{
-		case INFOTYPE_FOLDERSIZE:
+	case INFOTYPE_FOLDERSIZE:
-			return (double)measureInfo->Folder->GetSize();
+		return (double)measureInfo->Folder->GetSize();
-			break;
+		break;
-		case INFOTYPE_FILECOUNT:
+
-			return measureInfo->Folder->GetFileCount();
+	case INFOTYPE_FILECOUNT:
-			break;
+		return measureInfo->Folder->GetFileCount();
-		case INFOTYPE_FOLDERCOUNT:
+		break;
-			return measureInfo->Folder->GetFolderCount();
+
-			break;
+	case INFOTYPE_FOLDERCOUNT:
 		return measureInfo->Folder->GetFolderCount();
 		break;
 	}
 	return 0;
 }
--- a/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj
+++ b/Plugins/PluginFolderInfo/PluginFolderInfo.vcxproj
@@ -119,6 +119,7 @@
      <ProgramDatabaseFile>.\x32/Debug/FolderInfo.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/FolderInfo.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -158,6 +159,7 @@
      <ProgramDatabaseFile>.\x64/Debug/FolderInfo.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/FolderInfo.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -173,7 +175,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -196,7 +198,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/FolderInfo.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/FolderInfo.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/FolderInfo.lib</ImportLibrary>
@@ -220,7 +222,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginFolderInfo_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -242,7 +244,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/FolderInfo.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/FolderInfo.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/FolderInfo.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
--- a/Plugins/PluginMediaKey/PluginMediaKey.vcxproj
+++ b/Plugins/PluginMediaKey/PluginMediaKey.vcxproj
@@ -116,7 +116,7 @@
    <Link>
      <OutputFile>../../TestBench/x32/Debug/Plugins/MediaKey.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Debug/MediaKey.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/MediaKey.lib</ImportLibrary>
@@ -160,6 +160,7 @@
      <ProgramDatabaseFile>.\x64/Debug/MediaKey.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/MediaKey.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -175,7 +176,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginMediaKey_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginMediaKey_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -198,7 +199,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/MediaKey.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/MediaKey.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/MediaKey.lib</ImportLibrary>
@@ -222,7 +223,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginMediaKey_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginMediaKey_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -244,7 +245,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/MediaKey.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x64/Release/MediaKey.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/MediaKey.lib</ImportLibrary>
--- a/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj
+++ b/Plugins/PluginNowPlaying/PluginNowPlaying.vcxproj
@@ -117,12 +117,12 @@
    <Link>
      <OutputFile>../../TestBench/x32/Debug/Plugins/NowPlaying.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Debug/NowPlaying.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/NowPlaying.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>Psapi.lib;WinInet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Rainmeter.lib;Psapi.lib;WinInet.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -163,7 +163,8 @@
      <ProgramDatabaseFile>.\x64/Debug/NowPlaying.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/NowPlaying.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
-      <AdditionalDependencies>Psapi.lib;WinInet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Rainmeter.lib;Psapi.lib;WinInet.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -179,7 +180,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;PluginNowPlaying_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;PluginNowPlaying_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -204,7 +205,7 @@
      <AdditionalDependencies>Rainmeter.lib;Psapi.lib;WinInet.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/NowPlaying.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/NowPlaying.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/NowPlaying.lib</ImportLibrary>
@@ -228,7 +229,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;PluginNowPlaying_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;PluginNowPlaying_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -252,7 +253,7 @@
      <AdditionalDependencies>Rainmeter.lib;Psapi.lib;WinInet.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/NowPlaying.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x64/Release/NowPlaying.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/NowPlaying.lib</ImportLibrary>
--- a/Plugins/PluginPerfMon/PluginPerfMon.vcxproj
+++ b/Plugins/PluginPerfMon/PluginPerfMon.vcxproj
@@ -95,7 +95,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginPerfMon_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginPerfMon_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -118,7 +118,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/PerfMon.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/PerfMon.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/PerfMon.lib</ImportLibrary>
@@ -142,7 +142,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginPerfMon_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginPerfMon_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -164,7 +164,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/PerfMon.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/PerfMon.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/PerfMon.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
@@ -210,6 +210,7 @@
      <ProgramDatabaseFile>.\x32/Debug/PerfMon.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/PerfMon.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -249,6 +250,7 @@
      <ProgramDatabaseFile>.\x64/Debug/PerfMon.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/PerfMon.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Plugins/PluginPing/PluginPing.vcxproj
+++ b/Plugins/PluginPing/PluginPing.vcxproj
@@ -95,7 +95,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginPing_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginPing_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -118,7 +118,7 @@
      <AdditionalDependencies>Rainmeter.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/PingPlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/PingPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/PingPlugin.lib</ImportLibrary>
@@ -142,7 +142,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginPing_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginPing_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -164,7 +164,7 @@
      <AdditionalDependencies>Rainmeter.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/PingPlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/PingPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/PingPlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
@@ -204,13 +204,14 @@
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Rainmeter.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Debug/Plugins/PingPlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Debug/PingPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/PingPlugin.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -244,13 +245,14 @@
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Rainmeter.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Debug/Plugins/PingPlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x64/Debug/PingPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/PingPlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Plugins/PluginPower/PluginPower.vcxproj
+++ b/Plugins/PluginPower/PluginPower.vcxproj
@@ -119,6 +119,7 @@
      <ProgramDatabaseFile>.\x32/Debug/PowerPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/PowerPlugin.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -158,6 +159,7 @@
      <ProgramDatabaseFile>.\x64/Debug/PowerPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/PowerPlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -173,7 +175,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginPower_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginPower_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -196,7 +198,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/PowerPlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/PowerPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/PowerPlugin.lib</ImportLibrary>
@@ -220,7 +222,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginPower_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginPower_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -242,7 +244,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/PowerPlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/PowerPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/PowerPlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
--- a/Plugins/PluginQuote/PluginQuote.vcxproj
+++ b/Plugins/PluginQuote/PluginQuote.vcxproj
@@ -95,7 +95,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginQuote_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginQuote_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -118,7 +118,7 @@
      <AdditionalDependencies>Rainmeter.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/QuotePlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/QuotePlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/QuotePlugin.lib</ImportLibrary>
@@ -142,7 +142,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginQuote_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginQuote_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -164,7 +164,7 @@
      <AdditionalDependencies>Rainmeter.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/QuotePlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/QuotePlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/QuotePlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
@@ -204,13 +204,14 @@
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Rainmeter.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Debug/Plugins/QuotePlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Debug/QuotePlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/QuotePlugin.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -244,13 +245,14 @@
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Rainmeter.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Debug/Plugins/QuotePlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x64/Debug/QuotePlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/QuotePlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj
+++ b/Plugins/PluginRecycleManager/PluginRecycleManager.vcxproj
@@ -95,7 +95,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginRecycleManager_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginRecycleManager_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -118,7 +118,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/RecycleManager.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/RecycleManager.pdb</ProgramDatabaseFile>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -145,7 +145,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginRecycleManager_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginRecycleManager_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -167,7 +167,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/RecycleManager.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/RecycleManager.pdb</ProgramDatabaseFile>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
@@ -219,6 +219,7 @@
      </DataExecutionPrevention>
      <ImportLibrary>.\x32/Debug/RecycleManager.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -261,6 +262,7 @@
      </DataExecutionPrevention>
      <ImportLibrary>.\x64/Debug/RecycleManager.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Plugins/PluginResMon/PluginResMon.vcxproj
+++ b/Plugins/PluginResMon/PluginResMon.vcxproj
@@ -95,7 +95,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginResMon_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginResMon_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -118,7 +118,7 @@
      <AdditionalDependencies>Rainmeter.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/ResMon.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/ResMon.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/ResMon.lib</ImportLibrary>
@@ -142,7 +142,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginResMon_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginResMon_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -164,7 +164,7 @@
      <AdditionalDependencies>Rainmeter.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/ResMon.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/ResMon.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/ResMon.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
@@ -204,13 +204,14 @@
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Rainmeter.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Debug/Plugins/ResMon.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Debug/ResMon.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/ResMon.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -244,13 +245,14 @@
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Rainmeter.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Debug/Plugins/ResMon.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x64/Debug/ResMon.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/ResMon.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj
+++ b/Plugins/PluginSpeedFan/PluginSpeedFan.vcxproj
@@ -95,7 +95,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginSpeedFan_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginSpeedFan_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -118,7 +118,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/SpeedFanPlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/SpeedFanPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/SpeedFanPlugin.lib</ImportLibrary>
@@ -142,7 +142,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginSpeedFan_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginSpeedFan_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -164,7 +164,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/SpeedFanPlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/SpeedFanPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/SpeedFanPlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
@@ -210,6 +210,7 @@
      <ProgramDatabaseFile>.\x32/Debug/SpeedFanPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/SpeedFanPlugin.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -249,6 +250,7 @@
      <ProgramDatabaseFile>.\x64/Debug/SpeedFanPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/SpeedFanPlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Plugins/PluginSysInfo/PluginSysInfo.vcxproj
+++ b/Plugins/PluginSysInfo/PluginSysInfo.vcxproj
@@ -95,7 +95,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginSysInfo_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginSysInfo_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -118,7 +118,7 @@
      <AdditionalDependencies>Rainmeter.lib;Rasapi32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/SysInfo.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/SysInfo.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/SysInfo.lib</ImportLibrary>
@@ -142,7 +142,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginSysInfo_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginSysInfo_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -164,7 +164,7 @@
      <AdditionalDependencies>Rainmeter.lib;Rasapi32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/SysInfo.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/SysInfo.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/SysInfo.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
@@ -204,13 +204,14 @@
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>Rasapi32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Rainmeter.lib;Rasapi32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Debug/Plugins/SysInfo.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Debug/SysInfo.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/SysInfo.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -244,13 +245,14 @@
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>Rasapi32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Rainmeter.lib;Rasapi32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Debug/Plugins/SysInfo.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x64/Debug/SysInfo.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/SysInfo.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj
+++ b/Plugins/PluginVirtualDesktops/PluginVirtualDesktops.vcxproj
@@ -95,7 +95,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginVirtualDesktops_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginVirtualDesktops_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -118,7 +118,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/VirtualDesktops.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/VirtualDesktops.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/VirtualDesktops.lib</ImportLibrary>
@@ -142,7 +142,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginVirtualDesktops_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginVirtualDesktops_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -164,7 +164,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/VirtualDesktops.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/VirtualDesktops.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/VirtualDesktops.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
@@ -210,6 +210,7 @@
      <ProgramDatabaseFile>.\x32/Debug/VirtualDesktops.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/VirtualDesktops.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -249,6 +250,7 @@
      <ProgramDatabaseFile>.\x64/Debug/VirtualDesktops.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/VirtualDesktops.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Plugins/PluginWebParser/PluginWebParser.vcxproj
+++ b/Plugins/PluginWebParser/PluginWebParser.vcxproj
@@ -113,13 +113,14 @@
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>Urlmon.lib;Wininet.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Rainmeter.lib;Urlmon.lib;Wininet.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Debug/Plugins/WebParser.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Debug/WebParser.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/WebParser.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -153,13 +154,14 @@
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>Urlmon.lib;Wininet.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Rainmeter.lib;Urlmon.lib;Wininet.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Debug/Plugins/WebParser.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x64/Debug/WebParser.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/WebParser.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -175,7 +177,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginWebParser_EXPORTS;_SECURE_SCL=0;HAVE_CONFIG_H;SUPPORT_UTF8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -198,7 +200,7 @@
      <AdditionalDependencies>Rainmeter.lib;Urlmon.lib;Wininet.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/WebParser.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/WebParser.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/WebParser.lib</ImportLibrary>
@@ -222,7 +224,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginWebParser_EXPORTS;_SECURE_SCL=0;HAVE_CONFIG_H;SUPPORT_UTF8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginWebParser_EXPORTS;HAVE_CONFIG_H;SUPPORT_UTF8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -244,7 +246,7 @@
      <AdditionalDependencies>Rainmeter.lib;Urlmon.lib;Wininet.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/WebParser.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/WebParser.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/WebParser.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
--- a/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj
+++ b/Plugins/PluginWifiStatus/PluginWifiStatus.vcxproj
@@ -109,6 +109,7 @@
      </DataExecutionPrevention>
      <ImportLibrary>.\x32/Debug/WifiStatus.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -145,6 +146,7 @@
      </DataExecutionPrevention>
      <ImportLibrary>.\x64/Debug/WifiStatus.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -160,7 +162,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WifiStatus_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WifiStatus_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -183,7 +185,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/WifiStatus.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/WifiStatus.pdb</ProgramDatabaseFile>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -210,7 +212,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WifiStatus_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WifiStatus_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -234,7 +236,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/WifiStatus.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/WifiStatus.pdb</ProgramDatabaseFile>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
--- a/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj
+++ b/Plugins/PluginWin7Audio/PluginWin7Audio.vcxproj
@@ -116,7 +116,7 @@
    <Link>
      <OutputFile>../../TestBench/x32/Debug/Plugins/Win7AudioPlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../Library/x32/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Debug/Win7AudioPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/Win7AudioPlugin.lib</ImportLibrary>
@@ -160,6 +160,7 @@
      <ProgramDatabaseFile>.\x64/Debug/Win7AudioPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/Win7AudioPlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -175,7 +176,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginWin7Audio_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginWin7Audio_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -198,7 +199,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/Win7AudioPlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/Win7AudioPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/Win7AudioPlugin.lib</ImportLibrary>
@@ -222,7 +223,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginWin7Audio_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginWin7Audio_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -244,7 +245,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/Win7AudioPlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x64/Release/Win7AudioPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/Win7AudioPlugin.lib</ImportLibrary>
--- a/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj
+++ b/Plugins/PluginWindowMessage/PluginWindowMessage.vcxproj
@@ -119,6 +119,7 @@
      <ProgramDatabaseFile>.\x32/Debug/WindowMessagePlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/WindowMessagePlugin.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -158,6 +159,7 @@
      <ProgramDatabaseFile>.\x64/Debug/WindowMessagePlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/WindowMessagePlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -173,7 +175,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginWindowMessage_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginWindowMessage_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -196,7 +198,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/WindowMessagePlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/WindowMessagePlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/WindowMessagePlugin.lib</ImportLibrary>
@@ -220,7 +222,7 @@
      <AdditionalOptions>/GL  %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginWindowMessage_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginWindowMessage_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -242,7 +244,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/WindowMessagePlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64/Release/WindowMessagePlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/WindowMessagePlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
--- a/Plugins/PluginiTunes/PluginiTunes.vcxproj
+++ b/Plugins/PluginiTunes/PluginiTunes.vcxproj
@@ -121,6 +121,7 @@
      <ProgramDatabaseFile>.\x32/Debug/iTunesPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Debug/iTunesPlugin.lib</ImportLibrary>
      <TargetMachine>MachineX86</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -161,6 +162,7 @@
      <ProgramDatabaseFile>.\x64/Debug/iTunesPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Debug/iTunesPlugin.lib</ImportLibrary>
      <TargetMachine>MachineX64</TargetMachine>
      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -177,7 +179,7 @@
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
      <AdditionalIncludeDirectories>iTunesCOMWindowsSDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginiTunes_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginiTunes_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -200,7 +202,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x32/Release/Plugins/iTunesPlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x32/Release/iTunesPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x32/Release/iTunesPlugin.lib</ImportLibrary>
@@ -225,7 +227,7 @@
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
      <AdditionalIncludeDirectories>iTunesCOMWindowsSDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginiTunes_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PluginiTunes_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -247,7 +249,7 @@
      <AdditionalDependencies>Rainmeter.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>../../TestBench/x64/Release/Plugins/iTunesPlugin.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Library\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\Library\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x64/Release/iTunesPlugin.pdb</ProgramDatabaseFile>
      <ImportLibrary>.\x64/Release/iTunesPlugin.lib</ImportLibrary>
--- a/Rainmeter.sln
+++ b/Rainmeter.sln
@@ -1,11 +1,12 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Application", "Application\Application.vcxproj", "{D2A0903C-E760-4134-AE61-3D55BF8F760C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Application", "Library\Library.vcxproj", "{BE9D2400-7F1C-49D6-8498-5CE495491AD6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A} = {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Language", "Language\Language.vcxproj", "{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library", "Library\Library.vcxproj", "{BE9D2400-7F1C-49D6-8498-5CE495491AD6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginAdvancedCPU", "Plugins\PluginAdvancedCPU\PluginAdvancedCPU.vcxproj", "{EE8EC522-8430-4B46-86A3-D943D77F9E4B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginExample", "Plugins\PluginExample\PluginExample.vcxproj", "{761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}"
@@ -54,22 +55,6 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	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|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
 		{D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release|x64.Build.0 = Release|x64
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Debug|Win32.Build.0 = Debug|Win32
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Debug|x64.ActiveCfg = Release|x64
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Debug|x64.Build.0 = Release|x64
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|Win32.ActiveCfg = Release|Win32
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|Win32.Build.0 = Release|Win32
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|x64.ActiveCfg = Release|x64
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|x64.Build.0 = Release|x64
 		{BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Debug|Win32.Build.0 = Debug|Win32
 		{BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Debug|x64.ActiveCfg = Debug|x64
@@ -78,6 +63,14 @@ Global
 		{BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release|Win32.Build.0 = Release|Win32
 		{BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release|x64.ActiveCfg = Release|x64
 		{BE9D2400-7F1C-49D6-8498-5CE495491AD6}.Release|x64.Build.0 = Release|x64
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Debug|Win32.Build.0 = Debug|Win32
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Debug|x64.ActiveCfg = Release|x64
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Debug|x64.Build.0 = Release|x64
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|Win32.ActiveCfg = Release|Win32
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|Win32.Build.0 = Release|Win32
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|x64.ActiveCfg = Release|x64
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}.Release|x64.Build.0 = Release|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|x64