diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj
index bc3254ac..cfdf9bab 100644
--- a/Library/Library.vcxproj
+++ b/Library/Library.vcxproj
@@ -18,7 +18,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>lua/include;lua/lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_USRDLL;HAVE_CONFIG_H;SUPPORT_UTF8;LIBRARY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_USRDLL;LIBRARY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;d2d1.lib;dwrite.lib;windowscodecs.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -160,26 +160,6 @@
     <ClCompile Include="Mouse.cpp">
       <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_chartables.c" />
-    <ClCompile Include="pcre-8.10\pcre_compile.c" />
-    <ClCompile Include="pcre-8.10\pcre_config.c" />
-    <ClCompile Include="pcre-8.10\pcre_dfa_exec.c" />
-    <ClCompile Include="pcre-8.10\pcre_exec.c" />
-    <ClCompile Include="pcre-8.10\pcre_fullinfo.c" />
-    <ClCompile Include="pcre-8.10\pcre_get.c" />
-    <ClCompile Include="pcre-8.10\pcre_globals.c" />
-    <ClCompile Include="pcre-8.10\pcre_info.c" />
-    <ClCompile Include="pcre-8.10\pcre_maketables.c" />
-    <ClCompile Include="pcre-8.10\pcre_newline.c" />
-    <ClCompile Include="pcre-8.10\pcre_ord2utf8.c" />
-    <ClCompile Include="pcre-8.10\pcre_refcount.c" />
-    <ClCompile Include="pcre-8.10\pcre_study.c" />
-    <ClCompile Include="pcre-8.10\pcre_tables.c" />
-    <ClCompile Include="pcre-8.10\pcre_try_flipped.c" />
-    <ClCompile Include="pcre-8.10\pcre_ucd.c" />
-    <ClCompile Include="pcre-8.10\pcre_valid_utf8.c" />
-    <ClCompile Include="pcre-8.10\pcre_version.c" />
-    <ClCompile Include="pcre-8.10\pcre_xclass.c" />
     <ClCompile Include="Rainmeter.cpp">
       <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
@@ -293,10 +273,6 @@
     <ClInclude Include="MeterString.h" />
     <ClInclude Include="MeterWindow.h" />
     <ClInclude Include="Mouse.h" />
-    <ClInclude Include="pcre-8.10\config.h" />
-    <ClInclude Include="pcre-8.10\pcre.h" />
-    <ClInclude Include="pcre-8.10\pcre_internal.h" />
-    <ClInclude Include="pcre-8.10\ucp.h" />
     <ClInclude Include="Rainmeter.h" />
     <ClInclude Include="Export.h" />
     <ClInclude Include="RainmeterQuery.h" />
@@ -324,6 +300,11 @@
       <Project>{BC25C5DC-AEFB-49F9-8188-3C1B8C8929E6}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="Library_PCRE.vcxproj">
+      <Project>{6D61FBE9-6913-4885-A95D-1A8C0C223D82}</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 56b08115..8fc2d1ba 100644
--- a/Library/Library.vcxproj.filters
+++ b/Library/Library.vcxproj.filters
@@ -19,12 +19,6 @@
     <Filter Include="Lua\glue">
       <UniqueIdentifier>{941dce28-a314-4492-befb-5770432c98bf}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Lua\Lua">
-      <UniqueIdentifier>{c8550e7b-009b-4e12-a55a-ed458d05bdad}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="pcre">
-      <UniqueIdentifier>{5866a61e-ec27-469c-a8f0-2a45ce141f60}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Common">
       <UniqueIdentifier>{3fcdd272-ad7a-4e06-a1bc-ff114498ccee}</UniqueIdentifier>
     </Filter>
@@ -165,66 +159,6 @@
     <ClCompile Include="lua\glue\LuaGlobal.cpp">
       <Filter>Lua\glue</Filter>
     </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_chartables.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_compile.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_config.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_dfa_exec.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_exec.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_fullinfo.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_get.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_globals.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_info.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_maketables.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_newline.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_ord2utf8.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_refcount.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_study.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_tables.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_try_flipped.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_ucd.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_valid_utf8.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_version.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
-    <ClCompile Include="pcre-8.10\pcre_xclass.c">
-      <Filter>pcre</Filter>
-    </ClCompile>
     <ClCompile Include="DialogAbout.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -434,18 +368,6 @@
     <ClInclude Include="lua\LuaScript.h">
       <Filter>Lua</Filter>
     </ClInclude>
-    <ClInclude Include="pcre-8.10\config.h">
-      <Filter>pcre</Filter>
-    </ClInclude>
-    <ClInclude Include="pcre-8.10\pcre.h">
-      <Filter>pcre</Filter>
-    </ClInclude>
-    <ClInclude Include="pcre-8.10\pcre_internal.h">
-      <Filter>pcre</Filter>
-    </ClInclude>
-    <ClInclude Include="pcre-8.10\ucp.h">
-      <Filter>pcre</Filter>
-    </ClInclude>
     <ClInclude Include="DialogAbout.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/Library/Library_PCRE.vcxproj b/Library/Library_PCRE.vcxproj
new file mode 100644
index 00000000..c37f4e90
--- /dev/null
+++ b/Library/Library_PCRE.vcxproj
@@ -0,0 +1,57 @@
+<?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>{6D61FBE9-6913-4885-A95D-1A8C0C223D82}</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;HAVE_CONFIG_H;SUPPORT_UTF8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4334;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Lib>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">true</LinkTimeCodeGeneration>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="pcre-8.10\pcre_chartables.c" />
+    <ClCompile Include="pcre-8.10\pcre_compile.c" />
+    <ClCompile Include="pcre-8.10\pcre_config.c" />
+    <ClCompile Include="pcre-8.10\pcre_dfa_exec.c" />
+    <ClCompile Include="pcre-8.10\pcre_exec.c" />
+    <ClCompile Include="pcre-8.10\pcre_fullinfo.c" />
+    <ClCompile Include="pcre-8.10\pcre_get.c" />
+    <ClCompile Include="pcre-8.10\pcre_globals.c" />
+    <ClCompile Include="pcre-8.10\pcre_info.c" />
+    <ClCompile Include="pcre-8.10\pcre_maketables.c" />
+    <ClCompile Include="pcre-8.10\pcre_newline.c" />
+    <ClCompile Include="pcre-8.10\pcre_ord2utf8.c" />
+    <ClCompile Include="pcre-8.10\pcre_refcount.c" />
+    <ClCompile Include="pcre-8.10\pcre_study.c" />
+    <ClCompile Include="pcre-8.10\pcre_tables.c" />
+    <ClCompile Include="pcre-8.10\pcre_try_flipped.c" />
+    <ClCompile Include="pcre-8.10\pcre_ucd.c" />
+    <ClCompile Include="pcre-8.10\pcre_valid_utf8.c" />
+    <ClCompile Include="pcre-8.10\pcre_version.c" />
+    <ClCompile Include="pcre-8.10\pcre_xclass.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pcre-8.10\config.h" />
+    <ClInclude Include="pcre-8.10\pcre.h" />
+    <ClInclude Include="pcre-8.10\pcre_internal.h" />
+    <ClInclude Include="pcre-8.10\ucp.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 dd2b9c78..a8b9e74b 100644
--- a/Rainmeter.sln
+++ b/Rainmeter.sln
@@ -18,10 +18,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library", "Library\Library.
 		{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}
+		{6D61FBE9-6913-4885-A95D-1A8C0C223D82} = {6D61FBE9-6913-4885-A95D-1A8C0C223D82}
 	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}") = "Library_PCRE", "Library\Library_PCRE.vcxproj", "{6D61FBE9-6913-4885-A95D-1A8C0C223D82}"
+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}"
@@ -127,6 +130,14 @@ Global
 		{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
+		{6D61FBE9-6913-4885-A95D-1A8C0C223D82}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6D61FBE9-6913-4885-A95D-1A8C0C223D82}.Debug|Win32.Build.0 = Debug|Win32
+		{6D61FBE9-6913-4885-A95D-1A8C0C223D82}.Debug|x64.ActiveCfg = Debug|x64
+		{6D61FBE9-6913-4885-A95D-1A8C0C223D82}.Debug|x64.Build.0 = Debug|x64
+		{6D61FBE9-6913-4885-A95D-1A8C0C223D82}.Release|Win32.ActiveCfg = Release|Win32
+		{6D61FBE9-6913-4885-A95D-1A8C0C223D82}.Release|Win32.Build.0 = Release|Win32
+		{6D61FBE9-6913-4885-A95D-1A8C0C223D82}.Release|x64.ActiveCfg = Release|x64
+		{6D61FBE9-6913-4885-A95D-1A8C0C223D82}.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