diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj
index fa408595..bc3254ac 100644
--- a/Library/Library.vcxproj
+++ b/Library/Library.vcxproj
@@ -234,36 +234,6 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>../../StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="lua\lua\lapi.c" />
-    <ClCompile Include="lua\lua\lauxlib.c" />
-    <ClCompile Include="lua\lua\lbaselib.c" />
-    <ClCompile Include="lua\lua\lcode.c" />
-    <ClCompile Include="lua\lua\ldebug.c" />
-    <ClCompile Include="lua\lua\ldo.c" />
-    <ClCompile Include="lua\lua\ldump.c" />
-    <ClCompile Include="lua\lua\lfunc.c" />
-    <ClCompile Include="lua\lua\lgc.c" />
-    <ClCompile Include="lua\lua\linit.c" />
-    <ClCompile Include="lua\lua\liolib.c" />
-    <ClCompile Include="lua\lua\llex.c" />
-    <ClCompile Include="lua\lua\lmathlib.c" />
-    <ClCompile Include="lua\lua\lmem.c" />
-    <ClCompile Include="lua\lua\loadlib.c" />
-    <ClCompile Include="lua\lua\lobject.c" />
-    <ClCompile Include="lua\lua\lopcodes.c" />
-    <ClCompile Include="lua\lua\loslib.c" />
-    <ClCompile Include="lua\lua\lparser.c" />
-    <ClCompile Include="lua\lua\lstate.c" />
-    <ClCompile Include="lua\lua\lstring.c" />
-    <ClCompile Include="lua\lua\lstrlib.c" />
-    <ClCompile Include="lua\lua\ltable.c" />
-    <ClCompile Include="lua\lua\ltablib.c" />
-    <ClCompile Include="lua\lua\ltm.c" />
-    <ClCompile Include="lua\lua\luac.c" />
-    <ClCompile Include="lua\lua\lundump.c" />
-    <ClCompile Include="lua\lua\lvm.c" />
-    <ClCompile Include="lua\lua\lzio.c" />
-    <ClCompile Include="lua\lua\print.c" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Library.rc" />
@@ -340,29 +310,6 @@
     <ClInclude Include="UpdateCheck.h" />
     <ClInclude Include="lua\LuaManager.h" />
     <ClInclude Include="lua\LuaScript.h" />
-    <ClInclude Include="lua\lua\luaconf.h" />
-    <ClInclude Include="lua\lua\lapi.h" />
-    <ClInclude Include="lua\lua\lauxlib.h" />
-    <ClInclude Include="lua\lua\lcode.h" />
-    <ClInclude Include="lua\lua\ldebug.h" />
-    <ClInclude Include="lua\lua\ldo.h" />
-    <ClInclude Include="lua\lua\lfunc.h" />
-    <ClInclude Include="lua\lua\lgc.h" />
-    <ClInclude Include="lua\lua\llex.h" />
-    <ClInclude Include="lua\lua\llimits.h" />
-    <ClInclude Include="lua\lua\lmem.h" />
-    <ClInclude Include="lua\lua\lobject.h" />
-    <ClInclude Include="lua\lua\lopcodes.h" />
-    <ClInclude Include="lua\lua\lparser.h" />
-    <ClInclude Include="lua\lua\lstate.h" />
-    <ClInclude Include="lua\lua\lstring.h" />
-    <ClInclude Include="lua\lua\ltable.h" />
-    <ClInclude Include="lua\lua\ltm.h" />
-    <ClInclude Include="lua\lua\lua.h" />
-    <ClInclude Include="lua\lua\lualib.h" />
-    <ClInclude Include="lua\lua\lundump.h" />
-    <ClInclude Include="lua\lua\lvm.h" />
-    <ClInclude Include="lua\lua\lzio.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Exports.def" />
@@ -372,6 +319,11 @@
       <Project>{19312085-aa51-4bd6-be92-4b6098cca539}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="Library_Lua.vcxproj">
+      <Project>{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Library/Library.vcxproj.filters b/Library/Library.vcxproj.filters
index 05dbb45e..56b08115 100644
--- a/Library/Library.vcxproj.filters
+++ b/Library/Library.vcxproj.filters
@@ -165,96 +165,6 @@
     <ClCompile Include="lua\glue\LuaGlobal.cpp">
       <Filter>Lua\glue</Filter>
     </ClCompile>
-    <ClCompile Include="lua\lua\lapi.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lauxlib.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lbaselib.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lcode.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\ldebug.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\ldo.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\ldump.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lfunc.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lgc.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\linit.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\liolib.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\llex.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lmathlib.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lmem.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\loadlib.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lobject.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lopcodes.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\loslib.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lparser.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lstate.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lstring.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lstrlib.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\ltable.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\ltablib.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\ltm.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\luac.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lundump.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lvm.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\lzio.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
-    <ClCompile Include="lua\lua\print.c">
-      <Filter>Lua\Lua</Filter>
-    </ClCompile>
     <ClCompile Include="pcre-8.10\pcre_chartables.c">
       <Filter>pcre</Filter>
     </ClCompile>
@@ -524,72 +434,6 @@
     <ClInclude Include="lua\LuaScript.h">
       <Filter>Lua</Filter>
     </ClInclude>
-    <ClInclude Include="lua\lua\lapi.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lauxlib.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lcode.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\ldebug.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\ldo.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lfunc.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lgc.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\llex.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\llimits.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lmem.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lobject.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lopcodes.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lparser.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lstate.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lstring.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\ltable.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\ltm.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lua.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lualib.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lundump.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lvm.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
-    <ClInclude Include="lua\lua\lzio.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
     <ClInclude Include="pcre-8.10\config.h">
       <Filter>pcre</Filter>
     </ClInclude>
@@ -611,9 +455,6 @@
     <ClInclude Include="Export.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="lua\lua\luaconf.h">
-      <Filter>Lua\Lua</Filter>
-    </ClInclude>
     <ClInclude Include="Mouse.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/Library/Library_Lua.vcxproj b/Library/Library_Lua.vcxproj
new file mode 100644
index 00000000..ed68009d
--- /dev/null
+++ b/Library/Library_Lua.vcxproj
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(SolutionDir)Build\VS\Rainmeter.Cpp.Default.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}</ProjectGuid>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(SolutionDir)Build\VS\Rainmeter.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4334;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>lua/include;lua/lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Lib>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">true</LinkTimeCodeGeneration>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="lua\lua\lapi.c" />
+    <ClCompile Include="lua\lua\lauxlib.c" />
+    <ClCompile Include="lua\lua\lbaselib.c" />
+    <ClCompile Include="lua\lua\lcode.c" />
+    <ClCompile Include="lua\lua\ldebug.c" />
+    <ClCompile Include="lua\lua\ldo.c" />
+    <ClCompile Include="lua\lua\ldump.c" />
+    <ClCompile Include="lua\lua\lfunc.c" />
+    <ClCompile Include="lua\lua\lgc.c" />
+    <ClCompile Include="lua\lua\linit.c" />
+    <ClCompile Include="lua\lua\liolib.c" />
+    <ClCompile Include="lua\lua\llex.c" />
+    <ClCompile Include="lua\lua\lmathlib.c" />
+    <ClCompile Include="lua\lua\lmem.c" />
+    <ClCompile Include="lua\lua\loadlib.c" />
+    <ClCompile Include="lua\lua\lobject.c" />
+    <ClCompile Include="lua\lua\lopcodes.c" />
+    <ClCompile Include="lua\lua\loslib.c" />
+    <ClCompile Include="lua\lua\lparser.c" />
+    <ClCompile Include="lua\lua\lstate.c" />
+    <ClCompile Include="lua\lua\lstring.c" />
+    <ClCompile Include="lua\lua\lstrlib.c" />
+    <ClCompile Include="lua\lua\ltable.c" />
+    <ClCompile Include="lua\lua\ltablib.c" />
+    <ClCompile Include="lua\lua\ltm.c" />
+    <ClCompile Include="lua\lua\luac.c" />
+    <ClCompile Include="lua\lua\lundump.c" />
+    <ClCompile Include="lua\lua\lvm.c" />
+    <ClCompile Include="lua\lua\lzio.c" />
+    <ClCompile Include="lua\lua\print.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="lua\lua\lapi.h" />
+    <ClInclude Include="lua\lua\lauxlib.h" />
+    <ClInclude Include="lua\lua\lcode.h" />
+    <ClInclude Include="lua\lua\ldebug.h" />
+    <ClInclude Include="lua\lua\ldo.h" />
+    <ClInclude Include="lua\lua\lfunc.h" />
+    <ClInclude Include="lua\lua\lgc.h" />
+    <ClInclude Include="lua\lua\llex.h" />
+    <ClInclude Include="lua\lua\llimits.h" />
+    <ClInclude Include="lua\lua\lmem.h" />
+    <ClInclude Include="lua\lua\lobject.h" />
+    <ClInclude Include="lua\lua\lopcodes.h" />
+    <ClInclude Include="lua\lua\lparser.h" />
+    <ClInclude Include="lua\lua\lstate.h" />
+    <ClInclude Include="lua\lua\lstring.h" />
+    <ClInclude Include="lua\lua\ltable.h" />
+    <ClInclude Include="lua\lua\ltm.h" />
+    <ClInclude Include="lua\lua\lua.h" />
+    <ClInclude Include="lua\lua\luaconf.h" />
+    <ClInclude Include="lua\lua\lualib.h" />
+    <ClInclude Include="lua\lua\lundump.h" />
+    <ClInclude Include="lua\lua\lvm.h" />
+    <ClInclude Include="lua\lua\lzio.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Rainmeter.sln b/Rainmeter.sln
index 4e561b0d..dd2b9c78 100644
--- a/Rainmeter.sln
+++ b/Rainmeter.sln
@@ -1,10 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Application", "Application\Application.vcxproj", "{D2A0903C-E760-4134-AE61-3D55BF8F760C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{19312085-AA51-4BD6-BE92-4B6098CCA539}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common_Test", "Common\Common_Test.vcxproj", "{442084A6-2069-4927-B0C9-51525A720CB2}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer", "Installer\Installer.vcxproj", "{2FCFBFD2-2720-4BDD-B620-4BDD3DBB8D3D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Language", "Language\Language.vcxproj", "{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}"
@@ -13,8 +17,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library", "Library\Library.
 	ProjectSection(ProjectDependencies) = postProject
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A} = {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}
 		{19312085-AA51-4BD6-BE92-4B6098CCA539} = {19312085-AA51-4BD6-BE92-4B6098CCA539}
+		{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6} = {BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library_Lua", "Library\Library_Lua.vcxproj", "{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkinInstaller", "SkinInstaller\SkinInstaller.vcxproj", "{6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkinInstallerLauncher", "SkinInstaller\SkinInstallerLauncher.vcxproj", "{2D8F1DDB-6470-45A1-B95A-3E2960641314}"
@@ -68,8 +75,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginWin7Audio", "Plugins\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginWindowMessage", "Plugins\PluginWindowMessage\PluginWindowMessage.vcxproj", "{B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common_Test", "Common\Common_Test.vcxproj", "{442084A6-2069-4927-B0C9-51525A720CB2}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -114,6 +119,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
+		{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Debug|Win32.Build.0 = Debug|Win32
+		{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Debug|x64.ActiveCfg = Debug|x64
+		{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Debug|x64.Build.0 = Debug|x64
+		{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Release|Win32.ActiveCfg = Release|Win32
+		{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Release|Win32.Build.0 = Release|Win32
+		{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Release|x64.ActiveCfg = Release|x64
+		{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}.Release|x64.Build.0 = Release|x64
 		{6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA}.Debug|Win32.Build.0 = Debug|Win32
 		{6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA}.Debug|x64.ActiveCfg = Debug|x64