diff --git a/3rdparty-extra/win32/ocidl.d b/3rdparty/win32/ocidl.d
similarity index 100%
rename from 3rdparty-extra/win32/ocidl.d
rename to 3rdparty/win32/ocidl.d
diff --git a/dlangui.sln b/dlangui.sln
index e4a8a006..d1718255 100644
--- a/dlangui.sln
+++ b/dlangui.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dlangui", "dlanguilib.visualdproj", "{5FF17402-9997-4D0E-8068-6D84B8769D98}"
 EndProject
@@ -27,34 +27,128 @@ Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "libdparse", "..\dlangide\li
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug COFF32|Win32 = Debug COFF32|Win32
+		Debug COFF32|x64 = Debug COFF32|x64
+		Debug GDC|Win32 = Debug GDC|Win32
+		Debug GDC|x64 = Debug GDC|x64
+		Debug LDC|Win32 = Debug LDC|Win32
+		Debug LDC|x64 = Debug LDC|x64
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		TestDebug|Win32 = TestDebug|Win32
+		TestDebug|x64 = TestDebug|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug COFF32|Win32.ActiveCfg = Debug|Win32
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug COFF32|Win32.Build.0 = Debug|Win32
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug COFF32|x64.ActiveCfg = Debug|Win32
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug GDC|Win32.ActiveCfg = Debug|Win32
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug GDC|Win32.Build.0 = Debug|Win32
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug GDC|x64.ActiveCfg = Debug|Win32
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug LDC|Win32.ActiveCfg = Debug|Win32
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug LDC|Win32.Build.0 = Debug|Win32
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug LDC|x64.ActiveCfg = Debug|Win32
 		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug|Win32.Build.0 = Debug|Win32
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Debug|x64.ActiveCfg = Debug|Win32
 		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Release|Win32.ActiveCfg = Release|Win32
 		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Release|Win32.Build.0 = Release|Win32
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.Release|x64.ActiveCfg = Release|Win32
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.TestDebug|Win32.ActiveCfg = Debug|Win32
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.TestDebug|Win32.Build.0 = Debug|Win32
+		{5FF17402-9997-4D0E-8068-6D84B8769D98}.TestDebug|x64.ActiveCfg = Debug|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug COFF32|Win32.ActiveCfg = Debug|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug COFF32|Win32.Build.0 = Debug|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug COFF32|x64.ActiveCfg = Debug|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug GDC|Win32.ActiveCfg = Debug|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug GDC|Win32.Build.0 = Debug|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug GDC|x64.ActiveCfg = Debug|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug LDC|Win32.ActiveCfg = Debug|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug LDC|Win32.Build.0 = Debug|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug LDC|x64.ActiveCfg = Debug|Win32
 		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug|Win32.ActiveCfg = Debug|Win32
 		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug|Win32.Build.0 = Debug|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Debug|x64.ActiveCfg = Debug|Win32
 		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Release|Win32.ActiveCfg = Release|Win32
 		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Release|Win32.Build.0 = Release|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.Release|x64.ActiveCfg = Release|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.TestDebug|Win32.ActiveCfg = Debug|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.TestDebug|Win32.Build.0 = Debug|Win32
+		{68C78CC1-6176-4C60-B4B6-520475C26D23}.TestDebug|x64.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug COFF32|Win32.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug COFF32|Win32.Build.0 = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug COFF32|x64.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug GDC|Win32.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug GDC|Win32.Build.0 = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug GDC|x64.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug LDC|Win32.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug LDC|Win32.Build.0 = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug LDC|x64.ActiveCfg = Debug|Win32
 		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug|Win32.ActiveCfg = Debug|Win32
 		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug|Win32.Build.0 = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Debug|x64.ActiveCfg = Debug|Win32
 		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Release|Win32.ActiveCfg = Release|Win32
 		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Release|Win32.Build.0 = Release|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.Release|x64.ActiveCfg = Release|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.TestDebug|Win32.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.TestDebug|Win32.Build.0 = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB1611FB977}.TestDebug|x64.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug COFF32|Win32.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug COFF32|Win32.Build.0 = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug COFF32|x64.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug GDC|Win32.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug GDC|Win32.Build.0 = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug GDC|x64.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug LDC|Win32.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug LDC|Win32.Build.0 = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug LDC|x64.ActiveCfg = Debug|Win32
 		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug|Win32.ActiveCfg = Debug|Win32
 		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug|Win32.Build.0 = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Debug|x64.ActiveCfg = Debug|Win32
 		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Release|Win32.ActiveCfg = Release|Win32
 		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Release|Win32.Build.0 = Release|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.Release|x64.ActiveCfg = Release|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.TestDebug|Win32.ActiveCfg = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.TestDebug|Win32.Build.0 = Debug|Win32
+		{66B1B701-6AC9-41F5-8DB4-5CB161321977}.TestDebug|x64.ActiveCfg = Debug|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug COFF32|Win32.ActiveCfg = Debug|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug COFF32|Win32.Build.0 = Debug|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug COFF32|x64.ActiveCfg = Debug|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug GDC|Win32.ActiveCfg = Debug|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug GDC|Win32.Build.0 = Debug|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug GDC|x64.ActiveCfg = Debug|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug LDC|Win32.ActiveCfg = Debug|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug LDC|Win32.Build.0 = Debug|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug LDC|x64.ActiveCfg = Debug|Win32
 		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug|Win32.ActiveCfg = Debug|Win32
 		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug|Win32.Build.0 = Debug|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Debug|x64.ActiveCfg = Debug|Win32
 		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Release|Win32.ActiveCfg = Release|Win32
 		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Release|Win32.Build.0 = Release|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.Release|x64.ActiveCfg = Release|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.TestDebug|Win32.ActiveCfg = Debug|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.TestDebug|Win32.Build.0 = Debug|Win32
+		{68C78CAD-6176-4C60-B4A5-520475C26D56}.TestDebug|x64.ActiveCfg = Debug|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug COFF32|Win32.ActiveCfg = Debug|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug COFF32|Win32.Build.0 = Debug|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug COFF32|x64.ActiveCfg = Debug|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug GDC|Win32.ActiveCfg = Debug|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug GDC|Win32.Build.0 = Debug|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug GDC|x64.ActiveCfg = Debug|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug LDC|Win32.ActiveCfg = Debug|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug LDC|Win32.Build.0 = Debug|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug LDC|x64.ActiveCfg = Debug|Win32
 		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug|Win32.Build.0 = Debug|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Debug|x64.ActiveCfg = Debug|Win32
 		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Release|Win32.ActiveCfg = Release|Win32
 		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Release|Win32.Build.0 = Release|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.Release|x64.ActiveCfg = Release|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.TestDebug|Win32.ActiveCfg = Debug|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.TestDebug|Win32.Build.0 = Debug|Win32
+		{C4F86459-686F-4841-A6BE-7FCC38DC47FE}.TestDebug|x64.ActiveCfg = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/dlanguilib.visualdproj b/dlanguilib.visualdproj
index c0e17faf..87da0094 100644
--- a/dlanguilib.visualdproj
+++ b/dlanguilib.visualdproj
@@ -8,10 +8,12 @@
   <multiobj>0</multiobj>
   <singleFileCompilation>0</singleFileCompilation>
   <oneobj>0</oneobj>
+  <mscoff>0</mscoff>
   <trace>0</trace>
   <quiet>0</quiet>
   <verbose>0</verbose>
   <vtls>0</vtls>
+  <vgc>0</vgc>
   <symdebug>1</symdebug>
   <optimize>0</optimize>
   <cpu>0</cpu>
@@ -44,8 +46,12 @@
   <nofloat>0</nofloat>
   <Dversion>2</Dversion>
   <ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
+  <allinst>0</allinst>
+  <stackStomp>0</stackStomp>
   <compiler>0</compiler>
   <otherDMD>0</otherDMD>
+  <cccmd>$(CC) -c</cccmd>
+  <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
   <imppath>3rdparty ../DerelictGL3/source  ../DerelictUtil/source  ../DerelictFT/source ../de_image/source/interfaces ../de_image/source/png $(SolutionDir)/../dlib</imppath>
   <fileImppath>$(SolutionDir)/views $(SolutionDir)/views/res $(SolutionDir)/views/res/i18n $(SolutionDir)/views/res/mdpi</fileImppath>
@@ -89,6 +95,7 @@
   <resfile />
   <exefile>$(OutDir)\$(ProjectName).lib</exefile>
   <useStdLibPath>1</useStdLibPath>
+  <cRuntime>2</cRuntime>
   <additionalOptions />
   <preBuildCommand />
   <postBuildCommand />
@@ -102,10 +109,12 @@
   <multiobj>0</multiobj>
   <singleFileCompilation>0</singleFileCompilation>
   <oneobj>0</oneobj>
+  <mscoff>0</mscoff>
   <trace>0</trace>
   <quiet>0</quiet>
   <verbose>0</verbose>
   <vtls>0</vtls>
+  <vgc>0</vgc>
   <symdebug>0</symdebug>
   <optimize>1</optimize>
   <cpu>0</cpu>
@@ -138,8 +147,12 @@
   <nofloat>0</nofloat>
   <Dversion>2</Dversion>
   <ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
+  <allinst>0</allinst>
+  <stackStomp>0</stackStomp>
   <compiler>0</compiler>
   <otherDMD>0</otherDMD>
+  <cccmd>$(CC) -c</cccmd>
+  <ccTransOpt>1</ccTransOpt>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
   <imppath>3rdparty ../DerelictGL3/source  ../DerelictUtil/source  ../DerelictFT/source ../de_image/source/interfaces ../de_image/source/png $(SolutionDir)/../dlib</imppath>
   <fileImppath>$(SolutionDir)/views $(SolutionDir)/views/res $(SolutionDir)/views/res/i18n $(SolutionDir)/views/res/mdpi</fileImppath>
@@ -183,6 +196,7 @@
   <resfile />
   <exefile>$(OutDir)\$(ProjectName).lib</exefile>
   <useStdLibPath>1</useStdLibPath>
+  <cRuntime>1</cRuntime>
   <additionalOptions />
   <preBuildCommand />
   <postBuildCommand />
@@ -294,6 +308,7 @@
     <File path="3rdparty\win32\objbase.d" />
     <File path="3rdparty\win32\objfwd.d" />
     <File path="3rdparty\win32\objidl.d" />
+    <File path="3rdparty\win32\ocidl.d" />
     <File path="3rdparty\win32\ole.d" />
     <File path="3rdparty\win32\ole2.d" />
     <File path="3rdparty\win32\oleauto.d" />