39 files changed, 51 insertions, 220 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 48ba31445a..3bd0401e77 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -102,7 +102,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlashAvatars", "..\plugins\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FltContacts", "..\plugins\FloatingContacts\FltCont_10.vcxproj", "{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folders", "..\plugins\Folders\folders\folders.vcxproj", "{019FAEBD-BD7B-4470-A15B-A7DB1787E6BD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folders", "..\plugins\Folders\folders.vcxproj", "{019FAEBD-BD7B-4470-A15B-A7DB1787E6BD}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Gender", "..\plugins\Gender\gender_10.vcxproj", "{9DF8913A-99A3-40D2-86FE-585EBDDCABB2}"
 EndProject
diff --git a/plugins/ExtraIcons/ZIP/doit.bat b/plugins/ExtraIcons/ZIP/doit.bat
deleted file mode 100644
index 2f5615d126..0000000000
--- a/plugins/ExtraIcons/ZIP/doit.bat
+++ /dev/null
@@ -1,97 +0,0 @@
-@echo off
-
-rem Batch file to build and upload files
-rem 
-rem TODO: Integration with FL
-
-set name=extraicons
-
-rem To upload, this var must be set here or in other batch
-rem set ftp=ftp://<user>:<password>@<ftp>/<path>
-
-echo Building %name% ...
-
-msdev ..\%name%.dsp /MAKE "%name% - Win32 Release" /REBUILD
-
-echo Generating files for %name% ...
-
-del *.zip
-del *.dll
-copy ..\Docs\%name%_changelog.txt
-copy ..\Docs\%name%_version.txt
-copy ..\Docs\%name%_readme.txt
-copy ..\Docs\%name%.png
-mkdir Docs
-cd Docs
-del /Q *.*
-copy ..\..\Docs\langpack_%name%.txt
-copy ..\..\m_%name%.h
-cd ..
-mkdir Plugins
-cd Plugins
-cd ..
-mkdir src
-cd src
-del /Q *.*
-copy ..\..\*.h
-copy ..\..\*.cpp
-copy ..\..\*.
-copy ..\..\*.rc
-copy ..\..\*.dsp
-copy ..\..\*.dsw
-mkdir Docs
-cd Docs
-del /Q *.*
-copy ..\..\..\Docs\*.*
-cd ..
-mkdir sdk
-cd sdk
-del /Q *.*
-copy ..\..\..\sdk\*.*
-cd ..
-cd ..
-
-cd Plugins
-copy "..\..\..\..\bin\release\Plugins\%name%.dll"
-cd ..
-
-"C:\Program Files\Filzip\Filzip.exe" -a -rp %name%.zip %name%.dll Docs Plugins
-
-"C:\Program Files\Filzip\Filzip.exe" -a -rp %name%_src.zip src
-
-del *.dll
-cd Docs
-del /Q *.*
-cd ..
-rmdir Docs
-cd Plugins
-del /Q *.*
-cd ..
-rmdir Plugins
-cd src
-del /Q *.*
-cd Docs
-del /Q *.*
-cd ..
-rmdir Docs
-cd sdk
-del /Q *.*
-cd ..
-rmdir sdk
-cd ..
-rmdir src
-
-if "%ftp%"=="" GOTO END
-
-echo Going to upload files...
-pause
-
-"C:\Program Files\FileZilla\FileZilla.exe" -u .\%name%.zip %ftp% -overwrite -close 
-"C:\Program Files\FileZilla\FileZilla.exe" -u .\%name%_changelog.txt %ftp% -overwrite -close 
-"C:\Program Files\FileZilla\FileZilla.exe" -u .\%name%_version.txt %ftp% -overwrite -close 
-"C:\Program Files\FileZilla\FileZilla.exe" -u .\%name%_readme.txt %ftp% -overwrite -close 
-"C:\Program Files\FileZilla\FileZilla.exe" -u .\%name%.png %ftp% -overwrite -close 
-
-:END
-
-echo Done.
diff --git a/plugins/Folders/Folders.html b/plugins/Folders/Folders.html
deleted file mode 100644
index 5eb72d9d5e..0000000000
--- a/plugins/Folders/Folders.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-	<head></head>
-	<body>
-		<center>
-			<h1>Custom profile folders Test Page</h1>
-	
-			<p>Custom profile folders version 0.1.6.0</p>
-			<p><a href="Folders.zip">Folders.zip</a></p>
-		</center>
-	</body>
-</html>
diff --git a/plugins/Folders/folders/commonheaders.h b/plugins/Folders/commonheaders.h
index 3cab4024b1..3cab4024b1 100644
--- a/plugins/Folders/folders/commonheaders.h
+++ b/plugins/Folders/commonheaders.h
diff --git a/plugins/Folders/folders/dlg_handlers.cpp b/plugins/Folders/dlg_handlers.cpp
index 74d3715835..74d3715835 100644
--- a/plugins/Folders/folders/dlg_handlers.cpp
+++ b/plugins/Folders/dlg_handlers.cpp
diff --git a/plugins/Folders/folders/dlg_handlers.h b/plugins/Folders/dlg_handlers.h
index 4f3a4f15ca..4f3a4f15ca 100644
--- a/plugins/Folders/folders/dlg_handlers.h
+++ b/plugins/Folders/dlg_handlers.h
diff --git a/plugins/Folders/rtf convert.bat b/plugins/Folders/docs/rtf convert.bat
index 6a301622ab..6a301622ab 100644
--- a/plugins/Folders/rtf convert.bat
+++ b/plugins/Folders/docs/rtf convert.bat
diff --git a/plugins/Folders/rtf converter.exe b/plugins/Folders/docs/rtf converter.exe
index f932bbca43..f932bbca43 100644
--- a/plugins/Folders/rtf converter.exe
+++ b/plugins/Folders/docs/rtf converter.exe
diff --git a/plugins/Folders/rtf converter/rtf converter.cpp b/plugins/Folders/docs/rtf converter/rtf converter.cpp
index 8d51c0d79a..8d51c0d79a 100644
--- a/plugins/Folders/rtf converter/rtf converter.cpp
+++ b/plugins/Folders/docs/rtf converter/rtf converter.cpp
diff --git a/plugins/Folders/variables help.doc b/plugins/Folders/docs/variables help.doc
index 5b9ba27a62..5b9ba27a62 100644
--- a/plugins/Folders/variables help.doc
+++ b/plugins/Folders/docs/variables help.doc
diff --git a/plugins/Folders/folders/events.cpp b/plugins/Folders/events.cpp
index 359ac81bf4..359ac81bf4 100644
--- a/plugins/Folders/folders/events.cpp
+++ b/plugins/Folders/events.cpp
diff --git a/plugins/Folders/folders/events.h b/plugins/Folders/events.h
index 8f73ee7cfe..8f73ee7cfe 100644
--- a/plugins/Folders/folders/events.h
+++ b/plugins/Folders/events.h
diff --git a/plugins/Folders/files_release.txt b/plugins/Folders/files_release.txt
deleted file mode 100644
index abc660e6b1..0000000000
--- a/plugins/Folders/files_release.txt
+++ /dev/null
@@ -1 +0,0 @@
-folders\win32\Release\folders.dll
-\ No newline at end of file
diff --git a/plugins/Folders/files_releasex64.txt b/plugins/Folders/files_releasex64.txt
deleted file mode 100644
index 579757b872..0000000000
--- a/plugins/Folders/files_releasex64.txt
+++ /dev/null
@@ -1 +0,0 @@
-folders\x64\Release\folders.dll
-\ No newline at end of file
diff --git a/plugins/Folders/files_source.txt b/plugins/Folders/files_source.txt
deleted file mode 100644
index 35cc4863ef..0000000000
--- a/plugins/Folders/files_source.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-"rtf converter\*.*"
-folders\*.*
-folders\sdk\*.*
-docs\*.*
-*.*
diff --git a/plugins/Folders/folders/folderItem.cpp b/plugins/Folders/folderItem.cpp
index cf58e5feac..cf58e5feac 100644
--- a/plugins/Folders/folders/folderItem.cpp
+++ b/plugins/Folders/folderItem.cpp
diff --git a/plugins/Folders/folders/folderItem.h b/plugins/Folders/folderItem.h
index b60891c2ff..b60891c2ff 100644
--- a/plugins/Folders/folders/folderItem.h
+++ b/plugins/Folders/folderItem.h
diff --git a/plugins/Folders/folders/folders.cpp b/plugins/Folders/folders.cpp
index 4628f2ffbc..4628f2ffbc 100644
--- a/plugins/Folders/folders/folders.cpp
+++ b/plugins/Folders/folders.cpp
diff --git a/plugins/Folders/folders/folders.rc b/plugins/Folders/folders.rc
index b87bcd9447..b87bcd9447 100644
--- a/plugins/Folders/folders/folders.rc
+++ b/plugins/Folders/folders.rc
diff --git a/plugins/Folders/folders.sln b/plugins/Folders/folders.sln
index dc314bc490..38248608a4 100644
--- a/plugins/Folders/folders.sln
+++ b/plugins/Folders/folders.sln
@@ -1,9 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "folders", "folders\folders.vcxproj", "{019FAEBD-BD7B-4470-A15B-A7DB1787E6BD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folders", "folders.vcxproj", "{019FAEBD-BD7B-4470-A15B-A7DB1787E6BD}"
 EndProject
 Global
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
diff --git a/plugins/Folders/folders/folders.vcxproj b/plugins/Folders/folders.vcxproj
index 74871aec39..e94650eee8 100644
--- a/plugins/Folders/folders/folders.vcxproj
+++ b/plugins/Folders/folders.vcxproj
@@ -20,14 +20,12 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{019FAEBD-BD7B-4470-A15B-A7DB1787E6BD}</ProjectGuid>
-    <RootNamespace>folders</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
     <ProjectName>Folders</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -36,7 +34,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -61,115 +59,99 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <BrowseInformation>
-      </BrowseInformation>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsCpp</CompileAs>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>unicows.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>false</GenerateMapFile>
       <SubSystem>Windows</SubSystem>
       <BaseAddress>0x2F000000</BaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN64;_DEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <BrowseInformation>
-      </BrowseInformation>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>false</GenerateMapFile>
       <SubSystem>Windows</SubSystem>
       <BaseAddress>0x2F000000</BaseAddress>
-      <TargetMachine>MachineX64</TargetMachine>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>Full</Optimization>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <BrowseInformation>
-      </BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>unicows.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <BaseAddress>0x2F000000</BaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
     <ClCompile>
       <Optimization>Full</Optimization>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN64;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <BrowseInformation>
-      </BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     </ClCompile>
     <Link>
@@ -178,9 +160,14 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <BaseAddress>0x2F000000</BaseAddress>
-      <TargetMachine>MachineX64</TargetMachine>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="dlg_handlers.cpp" />
@@ -210,7 +197,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="variablesHelp.inc" />
-    <None Include="..\docs\folders_readme.txt" />
+    <None Include="docs\folders_readme.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Folders/folders/folders.vcxproj.filters b/plugins/Folders/folders.vcxproj.filters
index 2590b3f380..2590b3f380 100644
--- a/plugins/Folders/folders/folders.vcxproj.filters
+++ b/plugins/Folders/folders.vcxproj.filters
diff --git a/plugins/Folders/folders/foldersList.cpp b/plugins/Folders/foldersList.cpp
index b13620fe71..b13620fe71 100644
--- a/plugins/Folders/folders/foldersList.cpp
+++ b/plugins/Folders/foldersList.cpp
diff --git a/plugins/Folders/folders/foldersList.h b/plugins/Folders/foldersList.h
index 854249b3a3..854249b3a3 100644
--- a/plugins/Folders/folders/foldersList.h
+++ b/plugins/Folders/foldersList.h
diff --git a/plugins/Folders/folders/hooked_events.cpp b/plugins/Folders/hooked_events.cpp
index 78439bb3da..78439bb3da 100644
--- a/plugins/Folders/folders/hooked_events.cpp
+++ b/plugins/Folders/hooked_events.cpp
diff --git a/plugins/Folders/folders/hooked_events.h b/plugins/Folders/hooked_events.h
index 92401e9850..92401e9850 100644
--- a/plugins/Folders/folders/hooked_events.h
+++ b/plugins/Folders/hooked_events.h
diff --git a/plugins/Folders/pack source.bat b/plugins/Folders/pack source.bat
deleted file mode 100644
index 3c501be7dc..0000000000
--- a/plugins/Folders/pack source.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-for /F "tokens=5-9* delims=. " %%i in (docs\folders_readme.txt) do (call :Pack %%i %%j %%k %%l; exit)
-
-:Pack
-d:\usr\7z\7za.exe a -i@files_source.txt -xr!*.zip -xr!*.ncb -xr!*.user -xr!*.sdf "Folders src %1.%2.%3.%4.zip" @files_source.txt 
-exit
-
-error:
-echo "Error packing Folders"
diff --git a/plugins/Folders/pack symbols.bat b/plugins/Folders/pack symbols.bat
deleted file mode 100644
index 49cdec46c7..0000000000
--- a/plugins/Folders/pack symbols.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-if NOT EXIST "symbols\%1 - %3" ( 
-	mkdir "symbols\%1 - %3"
-)
-xcopy "%2\win32\Release\*.pdb" "symbols\%1 - %3\win32\*" /EXCLUDE:symbols_exclude.txt /Y
-xcopy "%2\x64\Release\*.pdb" "symbols\%1 - %3\x64\*" /EXCLUDE:symbols_exclude.txt /Y
-
-d:\usr\7z\7za.exe u -i!symbols\*.* "symbols - %1.zip"
-rmdir "symbols\" /Q /S
-\ No newline at end of file
diff --git a/plugins/Folders/pack x64.bat b/plugins/Folders/pack x64.bat
deleted file mode 100644
index befc247b4b..0000000000
--- a/plugins/Folders/pack x64.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-copy folders\m_folders.h docs /y
-for /F "tokens=5-9* delims=. " %%i in (docs\folders_readme.txt) do (call :Pack %%i %%j %%k %%l; exit)
-
-:Pack
-xcopy folders\x64\release\folders.dll . /y
-xcopy folders\m_folders.h docs\m_folders.h /y
-d:\usr\7z\7za.exe a -i!docs\*.* -i!Folders.dll "Folders %1.%2.%3.%4 x64.zip"
-del folders.dll
-call "pack symbols.bat" Folders Folders %1.%2.%3.%4
-exit
-
-error:
-echo "Error packing Folders"
-\ No newline at end of file
diff --git a/plugins/Folders/pack.bat b/plugins/Folders/pack.bat
deleted file mode 100644
index a0bb14ed37..0000000000
--- a/plugins/Folders/pack.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-copy folders\m_folders.h docs /y
-for /F "tokens=5-9* delims=. " %%i in (docs\folders_readme.txt) do (call :Pack %%i %%j %%k %%l; exit)
-
-:Pack
-xcopy folders\win32\release\folders.dll . /y
-xcopy folders\m_folders.h docs\m_folders.h /y
-d:\usr\7z\7za.exe a -i!docs\*.* -i!Folders.dll "Folders %1.%2.%3.%4 x32.zip"
-del folders.dll
-call "pack symbols.bat" Folders Folders %1.%2.%3.%4
-exit
-
-error:
-echo "Error packing Folders"
-\ No newline at end of file
diff --git a/plugins/Folders/folders/resource.h b/plugins/Folders/resource.h
index e8ff0247cf..e8ff0247cf 100644
--- a/plugins/Folders/folders/resource.h
+++ b/plugins/Folders/resource.h
diff --git a/plugins/Folders/folders/services.cpp b/plugins/Folders/services.cpp
index f811bf2246..f811bf2246 100644
--- a/plugins/Folders/folders/services.cpp
+++ b/plugins/Folders/services.cpp
diff --git a/plugins/Folders/folders/services.h b/plugins/Folders/services.h
index 3a2ee1aa9f..3a2ee1aa9f 100644
--- a/plugins/Folders/folders/services.h
+++ b/plugins/Folders/services.h
diff --git a/plugins/Folders/symbols_exclude.txt b/plugins/Folders/symbols_exclude.txt
deleted file mode 100644
index 361cf2448b..0000000000
--- a/plugins/Folders/symbols_exclude.txt
+++ /dev/null
@@ -1 +0,0 @@
-vc80.pdb
-\ No newline at end of file
diff --git a/plugins/Folders/folders/utils.cpp b/plugins/Folders/utils.cpp
index 64623b63f1..64623b63f1 100644
--- a/plugins/Folders/folders/utils.cpp
+++ b/plugins/Folders/utils.cpp
diff --git a/plugins/Folders/folders/utils.h b/plugins/Folders/utils.h
index 066c822900..066c822900 100644
--- a/plugins/Folders/folders/utils.h
+++ b/plugins/Folders/utils.h
diff --git a/plugins/Folders/folders/variablesHelp.inc b/plugins/Folders/variablesHelp.inc
index bdc79692e6..bdc79692e6 100644
--- a/plugins/Folders/folders/variablesHelp.inc
+++ b/plugins/Folders/variablesHelp.inc
diff --git a/plugins/Folders/folders/version.h b/plugins/Folders/version.h
index 77f4d886fa..77f4d886fa 100644
--- a/plugins/Folders/folders/version.h
+++ b/plugins/Folders/version.h
diff --git a/plugins/Folders/folders/version.rc b/plugins/Folders/version.rc
index 0f8fea03fc..0f8fea03fc 100644
--- a/plugins/Folders/folders/version.rc
+++ b/plugins/Folders/version.rc